summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:20:07 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:20:07 +0200
commit88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170 (patch)
treec6c5babb49b90293380106b81ae5c446959ac70f /BUILD
parent5.3 (diff)
downloadFreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.tar.gz
FreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.tar.bz2
FreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.zip
5.4
Diffstat (limited to 'BUILD')
-rw-r--r--BUILD/Changelog.txt27
-rw-r--r--BUILD/FreeFileSync.chmbin663954 -> 667858 bytes
-rw-r--r--BUILD/Help/FreeFileSync.hhp27
-rw-r--r--BUILD/Help/Table of Contents.hhc28
-rw-r--r--BUILD/Help/html/Backup Strategies.html (renamed from BUILD/Help/html/BackupStrategy.html)27
-rw-r--r--BUILD/Help/html/Batch Scripting.html112
-rw-r--r--BUILD/Help/html/Compare by File Size.html (renamed from BUILD/Help/html/CompareFileSize.html)12
-rw-r--r--BUILD/Help/html/Comparison Settings.html (renamed from BUILD/Help/html/ComparisonSettings.html)25
-rw-r--r--BUILD/Help/html/Daylight Saving Time.html (renamed from BUILD/Help/html/DaylightSavingTime.html)26
-rw-r--r--BUILD/Help/html/Exclude Items.html (renamed from BUILD/Help/html/ExcludeSubfolder.html)115
-rw-r--r--BUILD/Help/html/External Applications.html (renamed from BUILD/Help/html/ExternalApp.html)14
-rw-r--r--BUILD/Help/html/FreeFileSync.html24
-rw-r--r--BUILD/Help/html/Links.html10
-rw-r--r--BUILD/Help/html/Macros.html12
-rw-r--r--BUILD/Help/html/RealtimeSync.html57
-rw-r--r--BUILD/Help/html/Run as Service.html (renamed from BUILD/Help/html/RunAsService.html)42
-rw-r--r--BUILD/Help/html/Schedule a Batch Job.html (renamed from BUILD/Help/html/ScheduleBatch.html)60
-rw-r--r--BUILD/Help/html/SendMail.html56
-rw-r--r--BUILD/Help/html/Synchronize with FTP.html (renamed from BUILD/Help/html/Ftp.html)12
-rw-r--r--BUILD/Help/html/Variable Drive Letters.html (renamed from BUILD/Help/html/VariableDrive.html)17
-rw-r--r--BUILD/Help/html/Volume Shadow Copy.html (renamed from BUILD/Help/html/ShadowCopy.html)26
-rw-r--r--BUILD/Help/img/MainDialog.pngbin75788 -> 75443 bytes
-rw-r--r--BUILD/Help/img/RealtimeSync.pngbin32699 -> 42122 bytes
-rw-r--r--BUILD/Help/img/SetupBatch.pngbin35821 -> 31640 bytes
-rw-r--r--BUILD/Help/img/SourceTarget.pngbin4857 -> 4736 bytes
-rw-r--r--BUILD/Help/img/WatchUsbInsert.pngbin34801 -> 35572 bytes
-rw-r--r--BUILD/HideConsole.vbs (renamed from BUILD/RunSilent.vbs)2
-rw-r--r--BUILD/Languages/chinese_simple.lng337
-rw-r--r--BUILD/Languages/chinese_traditional.lng287
-rw-r--r--BUILD/Languages/croatian.lng307
-rw-r--r--BUILD/Languages/czech.lng293
-rw-r--r--BUILD/Languages/danish.lng305
-rw-r--r--BUILD/Languages/dutch.lng303
-rw-r--r--BUILD/Languages/english_uk.lng302
-rw-r--r--BUILD/Languages/finnish.lng318
-rw-r--r--BUILD/Languages/french.lng305
-rw-r--r--BUILD/Languages/german.lng353
-rw-r--r--BUILD/Languages/greek.lng299
-rw-r--r--BUILD/Languages/hebrew.lng294
-rw-r--r--BUILD/Languages/hungarian.lng293
-rw-r--r--BUILD/Languages/italian.lng304
-rw-r--r--BUILD/Languages/japanese.lng303
-rw-r--r--BUILD/Languages/korean.lng297
-rw-r--r--BUILD/Languages/lithuanian.lng315
-rw-r--r--BUILD/Languages/norwegian.lng277
-rw-r--r--BUILD/Languages/polish.lng275
-rw-r--r--BUILD/Languages/portuguese.lng305
-rw-r--r--BUILD/Languages/portuguese_br.lng353
-rw-r--r--BUILD/Languages/romanian.lng300
-rw-r--r--BUILD/Languages/russian.lng307
-rw-r--r--BUILD/Languages/slovenian.lng307
-rw-r--r--BUILD/Languages/spanish.lng289
-rw-r--r--BUILD/Languages/swedish.lng357
-rw-r--r--BUILD/Languages/turkish.lng295
-rw-r--r--BUILD/Languages/ukrainian.lng308
-rw-r--r--BUILD/Resources.zipbin272579 -> 268638 bytes
-rw-r--r--BUILD/Sync_Complete.wavbin364076 -> 364076 bytes
57 files changed, 4072 insertions, 5247 deletions
diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt
index f300e42c..2591ad63 100644
--- a/BUILD/Changelog.txt
+++ b/BUILD/Changelog.txt
@@ -2,6 +2,33 @@
|FreeFileSync|
--------------
+Changelog v5.4
+--------------
+Copy all NTFS extended attributes
+Improved statistics panel
+Improved main grid
+Support context menu for files in overview tree
+Process double-clicks outside main grid
+Allow quoted paths ending with backslash in command line: "C:\"
+Fully localized number formatting (Windows)
+Fixed deletion dialog header being trimmed (Linux)
+Fixed exclusion via context menu (Linux)
+Preserve row label width after comparison (Linux)
+Updated help file
+New batch mode return codes, see help file
+Prefix custom deletion directory with job name
+Use the same time stamp for log file and versioning
+Handle folder drag and drop outside main grid
+Avoid name clash having multiple folder pairs delete into the same versioning folder
+Exit FreeFileSync automatically while upgrading to new version
+Accessibility: Support high contrast color schemes
+Yet another UI design overhaul
+Fixed "access denied" issue on OS X-hosted network shares
+Support Citrix folder shares
+Support Arch Linux (Chakra)
+Updated translation files
+
+
Changelog v5.3
--------------
Show which processes lock a file during synchronization (Windows Vista and later)
diff --git a/BUILD/FreeFileSync.chm b/BUILD/FreeFileSync.chm
index 497b848e..09d8adab 100644
--- a/BUILD/FreeFileSync.chm
+++ b/BUILD/FreeFileSync.chm
Binary files differ
diff --git a/BUILD/Help/FreeFileSync.hhp b/BUILD/Help/FreeFileSync.hhp
index 4f2effed..1604194a 100644
--- a/BUILD/Help/FreeFileSync.hhp
+++ b/BUILD/Help/FreeFileSync.hhp
@@ -10,23 +10,22 @@ Title=FreeFileSync - Help
[FILES]
-html\Links.html
-html\CompareFileSize.html
-html\ExcludeSubfolder.html
-html\ExternalApp.html
-html\Ftp.html
-html\ScheduleBatch.html
-html\SendMail.html
-html\BackupStrategy.html
-html\VariableDrive.html
html\FreeFileSync.html
-html\DaylightSavingTime.html
+html\Backup Strategies.html
+html\Batch Scripting.html
+html\Compare by File Size.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\Synchronize with FTP.html
+html\Variable Drive Letters.html
+html\Volume Shadow Copy.html
html\RealtimeSync.html
-html\ShadowCopy.html
-html\RunAsService.html
-html\Batch Scripting.html
-html\ComparisonSettings.html
+html\Run as Service.html
+html\Links.html
[INFOTYPES]
diff --git a/BUILD/Help/Table of Contents.hhc b/BUILD/Help/Table of Contents.hhc
index 3dad4ac0..acee8f36 100644
--- a/BUILD/Help/Table of Contents.hhc
+++ b/BUILD/Help/Table of Contents.hhc
@@ -21,7 +21,7 @@
</OBJECT>
<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Backup Strategies">
- <param name="Local" value="html\BackupStrategy.html">
+ <param name="Local" value="html\Backup Strategies.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Batch Scripting">
@@ -29,27 +29,23 @@
</OBJECT>
<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Compare by file size">
- <param name="Local" value="html\CompareFileSize.html">
+ <param name="Local" value="html\Compare by File Size.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Comparison Settings">
- <param name="Local" value="html\ComparisonSettings.html">
+ <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\DaylightSavingTime.html">
+ <param name="Local" value="html\Daylight Saving Time.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
- <param name="Name" value="Error notification">
- <param name="Local" value="html\SendMail.html">
- </OBJECT>
- <LI> <OBJECT type="text/sitemap">
- <param name="Name" value="Exclude files">
- <param name="Local" value="html\ExcludeSubfolder.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="External applications">
- <param name="Local" value="html\ExternalApp.html">
+ <param name="Local" value="html\External Applications.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Macros">
@@ -57,19 +53,19 @@
</OBJECT>
<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Schedule a Batch Job">
- <param name="Local" value="html\ScheduleBatch.html">
+ <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\Ftp.html">
+ <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\VariableDrive.html">
+ <param name="Local" value="html\Variable Drive Letters.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Volume Shadow Copy">
- <param name="Local" value="html\ShadowCopy.html">
+ <param name="Local" value="html\Volume Shadow Copy.html">
</OBJECT>
</UL>
<LI> <OBJECT type="text/sitemap">
@@ -84,7 +80,7 @@
</OBJECT>
<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Run as Service">
- <param name="Local" value="html\RunAsService.html">
+ <param name="Local" value="html\Run as Service.html">
</OBJECT>
</UL>
<LI> <OBJECT type="text/sitemap">
diff --git a/BUILD/Help/html/BackupStrategy.html b/BUILD/Help/html/Backup Strategies.html
index 9cec9364..95f33a47 100644
--- a/BUILD/Help/html/BackupStrategy.html
+++ b/BUILD/Help/html/Backup Strategies.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20110901;20151400">
+ <META NAME="CHANGED" CONTENT="20120511;23131500">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -14,27 +14,26 @@
<!--
@page { margin: 2cm }
P { margin-bottom: 0.21cm }
- H3 { margin-bottom: 0.21cm }
- H3.western { font-family: "Arial", sans-serif }
- H3.cjk { font-family: "MS Mincho" }
- H3.ctl { font-family: "Mangal" }
+ H2.cjk { font-family: "SimSun" }
+ H2.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Backup strategies</FONT></H3>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Backup
+Strategies</FONT></FONT></H2>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>1.
Full backup with versioning of old files</B></FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">In
-synchronization settings select and specify a &quot;User-defined
-directory&quot; for deletion handling. FreeFileSync will place files
-that have been deleted or overwritten with newer versions into
-corresponding time-stamped sub directories. This provides a
-space-optimized way to retain all older versions of files while the
-most recent ones are available in main source and target directories.</FONT></P>
+synchronization settings select and specify &quot;Versioning&quot;
+for deletion handling. FreeFileSync will place files that have been
+deleted or overwritten with newer versions into corresponding
+time-stamped sub directories. This provides a space-optimized way to
+save all older versions of files separately while the most recent
+ones are available in main source and target directories.</FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><BR>
@@ -62,7 +61,7 @@ Base directories are set up accordingly:</FONT></P>
will be interactively replaced with the current date during
synchronization. In order to further automate this process, you can
create a *.ffs_batch file with this configuration and choose &quot;<I>ignore
-errors</I>&quot; to avoid the warning that target directory is not
-(yet) existing.</FONT></P>
+errors</I>&quot; to avoid the popup message that target directory is
+not (yet) existing.</FONT></P>
</BODY>
</HTML> \ No newline at end of file
diff --git a/BUILD/Help/html/Batch Scripting.html b/BUILD/Help/html/Batch Scripting.html
index 5ecddba7..526d3d79 100644
--- a/BUILD/Help/html/Batch Scripting.html
+++ b/BUILD/Help/html/Batch Scripting.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20111019;20535600">
+ <META NAME="CHANGED" CONTENT="20120511;23115700">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -14,92 +14,74 @@
<!--
@page { margin: 2cm }
P { margin-bottom: 0.21cm }
- H3 { margin-bottom: 0.21cm }
- H3.western { font-family: "Arial", sans-serif }
- H3.cjk { font-family: "MS Mincho" }
- H3.ctl { font-family: "Mangal" }
+ H2.cjk { font-family: "SimSun" }
+ H2.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Batch Scripting
-<SPAN STYLE="font-weight: normal">(Windows)</SPAN></FONT></H3>
+<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"><BR>
</P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">In
-order to facilitate using FreeFileSync and RealtimeSync in advanced
-synchronization scenarios, creating batch files is a good way to
-provide additional functionality. The following section will give
-some general hints and examples for custom *.cmd and *.bat files.</FONT></P>
+<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 *.cmd and *.bat scripts.</FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
-<UL>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">When
- starting a batch file from RealtimeSync make synchronous calls to
- FreeFileSync only. This will prevent RealtimeSync continue detecting
- changes while synchronization is still in progress.<BR>&nbsp;</FONT></P>
- <LI><P STYLE="margin-bottom: 0cm"><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;RunSilent.vbs&quot; located in FreeFileSync's installation
- directory.</FONT></P>
-</UL>
-<OL>
- <P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Usage:</B></FONT></P>
-</OL>
-<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" 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-right: 0.98cm; margin-bottom: 0cm">
- <FONT FACE="Courier New, monospace">wscript C:\Program
- files\FreeFileSync\Invisible.vbs C:\MyBatchFile.cmd</FONT></P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">When
+FreeFileSync is started in batch mode (a *.ffs_batch file is passed
+as argument) it returns one of the following status codes:</FONT></P>
+<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
+ <UL>
+ <P ALIGN=LEFT STYLE="margin-right: 0.98cm; 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 errors<BR>2 - Synchronization was aborted</SPAN></FONT></P>
+ </UL>
</SPAN><BR CLEAR=LEFT><BR>
</P>
-<UL>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">FreeFileSync
- returns with an Errorlevel below zero if unresolved problems remain:</FONT></P>
-</UL>
-<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen2" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
+<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%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-right: 0.98cm; margin-bottom: 0cm">
<FONT FACE="Tahoma, sans-serif"><FONT FACE="Courier New, monospace">&quot;C:\Program
- Files\FreeFileSync\FreeFileSync.exe&quot;
- &quot;H:\Silent_Config.ffs_batch&quot;<BR>if not errorlevel 0
- (<BR>&nbsp;&nbsp;</FONT><FONT COLOR="#808080"><FONT FACE="Courier New, monospace"><I><B>::if
- 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
+ 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-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B>
-Shutdown PC after synchronization</FONT></P>
-<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen4" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
+<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><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-right: 0.98cm; margin-bottom: 0cm">
- &nbsp;&nbsp;<FONT COLOR="#808080"><FONT FACE="Courier New, monospace"><I><B>::start
- FreeFileSync Batch
- Job<BR></B></I></FONT></FONT><FONT FACE="Courier New, monospace">&quot;C:\Users\ZenJu\Desktop\SyncJob.ffs_batch&quot;<BR>&nbsp;&nbsp;</FONT><FONT COLOR="#808080"><FONT FACE="Courier New, monospace"><I><B>::schedule
- shutdown after 10 seconds<BR></B></I></FONT></FONT><FONT FACE="Courier New, monospace">shutdown
- /s /t 10</FONT></P>
+ <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>
+ <UL>
+ <LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Disable
+ checkbox &quot;<I>Show progress dialog</I>&quot; or have &quot;On
+ completion&quot; automatically close the results dialog after
+ synchronization.</FONT></P>
+ <LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Set
+ &quot;</SPAN></FONT><FONT FACE="Tahoma, sans-serif"><I><SPAN STYLE="font-weight: normal">Error
+ handling</SPAN></I></FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">&quot;
+ to &quot;</SPAN></FONT><FONT FACE="Tahoma, sans-serif"><I><SPAN STYLE="font-weight: normal">Exit
+ instantly</SPAN></I></FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">&quot;
+ or &quot;</SPAN></FONT><FONT FACE="Tahoma, sans-serif"><I><SPAN STYLE="font-weight: normal">Ignore
+ errors</SPAN></I></FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">&quot;.</SPAN></FONT></P>
+ </UL>
</SPAN><BR CLEAR=LEFT><BR>
</P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B>
-A simple locking facility &ndash; (<SPAN STYLE="font-style: normal"><B>Note:</B></SPAN>
-<I>FreeFileSync already has a more powerful directory locking
-mechanism implemented that allows multiple writers in parallel</I>)</FONT></P>
-<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen3" 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-right: 0.98cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif"><FONT FACE="Courier New, monospace">:tryAgain<BR>if
- not exist \\share\folder\lock (<BR>&nbsp;&nbsp;</FONT><FONT COLOR="#808080"><FONT FACE="Courier New, monospace"><I><B>::create
- the lock<BR>&nbsp;&nbsp;</B></I></FONT></FONT><FONT FACE="Courier New, monospace">echo
- This is a lock file &gt; \\share\folder\lock<BR>&nbsp;&nbsp;</FONT><FONT COLOR="#808080"><FONT FACE="Courier New, monospace"><I><B>::execute
- the synchronization batch job synchronously<BR>&nbsp;&nbsp;</B></I></FONT></FONT><FONT FACE="Courier New, monospace">&quot;C:\Program
- Files\FreeFileSync\FreeFileSync.exe&quot;
- &quot;C:\MySyncJob.ffs_batch&quot;<BR>&nbsp;&nbsp;del
- \\share\folder\lock<BR>) else (<BR>&nbsp;&nbsp;</FONT><FONT COLOR="#808080"><FONT FACE="Courier New, monospace"><I><B>::wait
- 5 seconds then try starting sync again:<BR>&nbsp;&nbsp;</B></I></FONT></FONT><FONT FACE="Courier New, monospace">choice
- /C:AB /T:5 /D:A &gt; NUL<BR>&nbsp;&nbsp;goto tryAgain<BR>)</FONT></FONT></P>
-</SPAN><BR CLEAR=LEFT><BR>
-</P>
</BODY>
</HTML> \ No newline at end of file
diff --git a/BUILD/Help/html/CompareFileSize.html b/BUILD/Help/html/Compare by File Size.html
index af184fd9..81e4ab62 100644
--- a/BUILD/Help/html/CompareFileSize.html
+++ b/BUILD/Help/html/Compare by File Size.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20100902;19144900">
+ <META NAME="CHANGED" CONTENT="20120511;23114500">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -14,17 +14,15 @@
<!--
@page { margin: 2cm }
P { margin-bottom: 0.21cm }
- H3 { margin-bottom: 0.21cm }
- H3.western { font-family: "Arial", sans-serif }
- H3.cjk { font-family: "MS Mincho" }
- H3.ctl { font-family: "Mangal" }
+ H2.cjk { font-family: "SimSun" }
+ H2.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Compare by file
-size</FONT></H3>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Compare
+by file size</FONT></FONT></H2>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Sometimes
diff --git a/BUILD/Help/html/ComparisonSettings.html b/BUILD/Help/html/Comparison Settings.html
index 7af12727..55b49830 100644
--- a/BUILD/Help/html/ComparisonSettings.html
+++ b/BUILD/Help/html/Comparison Settings.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20120227;12315700">
+ <META NAME="CHANGED" CONTENT="20120511;23113800">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -18,13 +18,15 @@
H3.western { font-family: "Arial", sans-serif }
H3.cjk { font-family: "MS Mincho" }
H3.ctl { font-family: "Mangal" }
+ H2.cjk { font-family: "SimSun" }
+ H2.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Comparison
-Settings</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 WIDTH=250 HEIGHT=257 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>
@@ -144,17 +146,16 @@ called symlinks or soft links):</FONT></P>
</OL>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
-<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" 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-right: 0.98cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif"><B>Note:</B></FONT></P>
+<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen3" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
<UL>
+ <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note</B></FONT></P>
<LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">In
- Windows the symbolic link options apply to </FONT><FONT FACE="Tahoma, sans-serif"><I>&quot;Reparse
- Points&quot;</I></FONT><FONT FACE="Tahoma, sans-serif">. Reparse
- Points are a more general concept including symbolic links,
- junctions and mount points.</FONT></P>
- <LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm; font-style: normal"><FONT FACE="Tahoma, sans-serif">Copying
- symbolic links requires administrator rights.</FONT></P>
+ Windows the symbolic link options apply to <I>&quot;Reparse
+ Points&quot;</I>. Reparse Points are a more general concept
+ including symbolic links, junctions and mount points.</FONT></P>
+ <LI><P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm; font-style: normal">
+ <FONT FACE="Tahoma, sans-serif">Copying symbolic links requires
+ administrator rights.</FONT></P>
</UL>
</SPAN><BR CLEAR=LEFT><BR>
</P>
diff --git a/BUILD/Help/html/DaylightSavingTime.html b/BUILD/Help/html/Daylight Saving Time.html
index a15ea521..d088d807 100644
--- a/BUILD/Help/html/DaylightSavingTime.html
+++ b/BUILD/Help/html/Daylight Saving Time.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091208;20054200">
- <META NAME="CHANGED" CONTENT="20110301;19000400">
+ <META NAME="CHANGED" CONTENT="20120511;23112900">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -14,17 +14,15 @@
<!--
@page { margin: 2cm }
P { margin-bottom: 0.21cm }
- H3 { margin-bottom: 0.21cm }
- H3.western { font-family: "Arial", sans-serif }
- H3.cjk { font-family: "MS Mincho" }
- H3.ctl { font-family: "Mangal" }
+ H2.cjk { font-family: "SimSun" }
+ H2.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal">Daylight
-saving time </SPAN><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal">(Windows)</SPAN></SPAN></FONT></H3>
+<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"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">A
@@ -62,19 +60,21 @@ only solves all DST issues but also time shifts that occur due to
travel between different time zones.</FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
-<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><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-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note:</B></FONT></P>
+<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
<UL>
+ <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note</B></FONT></P>
<LI><P ALIGN=LEFT STYLE="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>
- <LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">If
- a FAT volume is scanned the first time by FreeFileSync this will
- take longer than usual since additional meta data is written for
- each file.</FONT></P>
+ <LI><P ALIGN=LEFT STYLE="margin-right: 0.98cm; 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
+ additional meta data is written for each file.</FONT></P>
</UL>
</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/ExcludeSubfolder.html b/BUILD/Help/html/Exclude Items.html
index c3261463..239b639a 100644
--- a/BUILD/Help/html/ExcludeSubfolder.html
+++ b/BUILD/Help/html/Exclude Items.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20120323;22023000">
+ <META NAME="CHANGED" CONTENT="20120511;23112100">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -14,26 +14,62 @@
<!--
@page { margin: 2cm }
P { margin-bottom: 0.21cm }
- H3 { margin-bottom: 0.21cm }
- H3.western { font-family: "Arial", sans-serif }
- H3.cjk { font-family: "MS Mincho" }
- H3.ctl { font-family: "Mangal" }
+ H2.cjk { font-family: "SimSun" }
+ H2.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Exclude files</FONT></H3>
+<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 can be excluded from synchronization by specifying
-include and exclude filter lists. Only if they match at least one
-entry in the include list and none of the entries in the exclude list
-they pass filtering. Each list item is a file or directory path
-relative to synchronization base directories. Optionally wild cards
-like '*' or '?' may be used.</FONT></P>
+and directories are only considered for synchronization if they pass
+the filter. They have to match at least one entry in the include list
+and none of the entries in the exclude list:</FONT></P>
+<OL>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Each
+ list item must be a file or directory path </FONT><FONT FACE="Tahoma, sans-serif"><B>relative</B></FONT>
+ <FONT FACE="Tahoma, sans-serif">to synchronization base directories</FONT></P>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Multiple
+ items must be separated by ';' or a new line</FONT></P>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Wild
+ cards like '*' or '?' may be used</FONT></P>
+</OL>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B>
+Exclude items for m<SPAN STYLE="font-weight: normal">irror-sync from
+</SPAN><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">C:\Source</SPAN></FONT>
+<SPAN STYLE="font-weight: normal">to </SPAN><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">D:\Target</SPAN></FONT></FONT></P>
+<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
+ <P STYLE="margin-left: 0.82cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Single
+ file </SPAN></FONT><FONT FACE="Courier New, monospace">C:\Source\file.txt:<BR></FONT>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Exclude:
+ </SPAN></FONT><FONT FACE="Courier New, monospace">\file.txt</FONT></P>
+ <P STYLE="margin-left: 0.82cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Single
+ folder </SPAN></FONT><FONT FACE="Courier New, monospace">C:\Source\subfolder:<BR></FONT>&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Exclude:
+ </SPAN></FONT><FONT FACE="Courier New, monospace">\subfolder\</FONT></P>
+ <P STYLE="margin-left: 0.82cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">All
+ files (and folders) named </SPAN></FONT><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">thumbs.db</SPAN></FONT><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">:<BR></SPAN></FONT>&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Exclude:
+ </SPAN></FONT><FONT FACE="Courier New, monospace">*\thumbs.db</FONT></P>
+ <P STYLE="margin-left: 0.82cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">All
+ </SPAN></FONT><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">*.tmp</SPAN></FONT>
+ <FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">files
+ located in </SPAN></FONT><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">subfolder</SPAN></FONT>
+ <FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">only:<BR></SPAN></FONT>&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Exclude:
+ </SPAN></FONT><FONT FACE="Courier New, monospace">\subfolder\*.tmp</FONT></P>
+ <P STYLE="margin-left: 0.82cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Files
+ and folders containing </SPAN></FONT><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">temp</SPAN></FONT>
+ <FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">somewhere
+ in their path:<BR></SPAN></FONT>&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Exclude:
+ </SPAN></FONT><FONT FACE="Courier New, monospace">*temp*</FONT></P>
+ <P ALIGN=LEFT STYLE="margin-left: 0.82cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Multiple
+ entries separated by semicolon:<BR></SPAN>&nbsp;&nbsp;&nbsp;&nbsp;<SPAN STYLE="font-weight: normal">Exclude:
+ </SPAN><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">*.tmp;
+ *.doc; *.bak</SPAN></FONT></FONT></P>
+</SPAN><BR CLEAR=LEFT><BR>
+</P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B>
Exclude all files and folders located in subdirectories of base
directories</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">
@@ -49,54 +85,23 @@ located in subdirectories of base directories</SPAN></FONT></P>
<FONT FACE="Tahoma, sans-serif">Include: <FONT FACE="Courier New, monospace">*\*</FONT></FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B>
-<SPAN STYLE="font-weight: normal">Mirror-sync from </SPAN><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">C:\Source</SPAN></FONT>
-<SPAN STYLE="font-weight: normal">to </SPAN><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">D:\Target</SPAN></FONT></FONT></P>
-<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
- <P STYLE="margin-left: 0.82cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Exclude
- single file </SPAN></FONT><FONT FACE="Courier New, monospace">C:\Source\file.txt:<BR></FONT>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Filter:
- </SPAN></FONT><FONT FACE="Courier New, monospace">\file.txt</FONT></P>
- <P STYLE="margin-left: 0.82cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Exclude
- single folder </SPAN></FONT><FONT FACE="Courier New, monospace">C:\Source\sample\subfolder:<BR></FONT>&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Filter:
- </SPAN></FONT><FONT FACE="Courier New, monospace">\sample\subfolder\</FONT></P>
- <P STYLE="margin-left: 0.82cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Exclude
- all </SPAN></FONT><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">*.tmp</SPAN></FONT>
- <FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">files
- located in </SPAN></FONT><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">subfolder</SPAN></FONT>
- <FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">only:<BR></SPAN></FONT>&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Filter:
- </SPAN></FONT><FONT FACE="Courier New, monospace">\sample\subfolder\*.tmp</FONT></P>
- <P STYLE="margin-left: 0.82cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Exclude
- files (and folders) named </SPAN></FONT><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">thumbs.db</SPAN></FONT>
- <FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">in
- all directories:<BR></SPAN></FONT>&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Filter:
- </SPAN></FONT><FONT FACE="Courier New, monospace">*\thumbs.db</FONT></P>
- <P STYLE="margin-left: 0.82cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Exclude
- files and folders that have </SPAN></FONT><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">test</SPAN></FONT>
- <FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">as
- part of their name:<BR></SPAN></FONT>&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Filter:
- </SPAN></FONT><FONT FACE="Courier New, monospace">*test*</FONT></P>
- <P ALIGN=LEFT STYLE="margin-left: 0.82cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-weight: normal">Exclude
- multiple entries; separate by semicolon or newlines:<BR></SPAN>&nbsp;&nbsp;&nbsp;&nbsp;<SPAN STYLE="font-weight: normal">Filter:
- </SPAN><FONT FACE="Courier New, monospace"><SPAN STYLE="font-weight: normal">*.tmp;
- *.doc; *.bak</SPAN></FONT></FONT></P>
-</SPAN><BR CLEAR=LEFT><BR>
-</P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
-<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><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-right: 0.98cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif"><B>Note:</B></FONT></P>
+<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen4" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
<UL>
- <LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">A
- filter string is generally compared against both file and directory
- names. If you want to consider directories only, you can give a
- hint by appending a path separator: &quot;<FONT FACE="Courier New, monospace">string\</FONT>&quot;.</FONT></P>
- <LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">In
- most cases manually specifying a filter phrase is not necessary!
- You can exclude files, directories and even complete lists of both
- directly on main grid via context menu.</FONT></P>
+ <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note</B></FONT></P>
+ <LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">For
+ simple exclusions just right-click and exclude one or a list of
+ items directly on main grid via context menu.</FONT></P>
+ <LI><P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm; font-style: normal">
+ <FONT FACE="Tahoma, sans-serif">A filter string 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:
+ &quot;dirname<FONT FACE="Courier New, monospace">\</FONT>&quot;.</FONT></P>
</UL>
</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/ExternalApp.html b/BUILD/Help/html/External Applications.html
index 01d3269a..16a7134d 100644
--- a/BUILD/Help/html/ExternalApp.html
+++ b/BUILD/Help/html/External Applications.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20120118;19302500">
+ <META NAME="CHANGED" CONTENT="20120511;23111200">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -14,17 +14,15 @@
<!--
@page { margin: 2cm }
P { margin-bottom: 0.21cm }
- H3 { margin-bottom: 0.21cm }
- H3.western { font-family: "Arial", sans-serif }
- H3.cjk { font-family: "MS Mincho" }
- H3.ctl { font-family: "Mangal" }
+ H2.cjk { font-family: "SimSun" }
+ H2.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">External
-applications</FONT></H3>
+<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"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">By
@@ -68,7 +66,7 @@ used:</FONT></P>
</UL>
<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" 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-right: 0.98cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif"><B>Note:</B><BR>Don't forget to use
+ <FONT FACE="Tahoma, sans-serif"><B>Note</B><BR>Don't forget to use
quotation marks if file names contain spaces!</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
diff --git a/BUILD/Help/html/FreeFileSync.html b/BUILD/Help/html/FreeFileSync.html
index 446a5aa0..f08d1600 100644
--- a/BUILD/Help/html/FreeFileSync.html
+++ b/BUILD/Help/html/FreeFileSync.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20120408;21065300">
+ <META NAME="CHANGED" CONTENT="20120504;2110200">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -29,7 +29,7 @@ Folder 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=427 HEIGHT=52 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">&quot;</FONT><FONT FACE="Tahoma, sans-serif"><I>Compare</I></FONT><FONT FACE="Tahoma, sans-serif">&quot;
them.<BR></FONT><IMG SRC="../img/CompareButton.png" NAME="Grafik1" ALIGN=BOTTOM WIDTH=178 HEIGHT=40 BORDER=0></P>
@@ -95,15 +95,17 @@ Features</FONT></H3>
comparison</FONT></P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Full
support for Symbolic Links</FONT></P>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Run
- as a batch job</FONT></P>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Automate
+ sync as a batch job</FONT></P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Multiple
folder pairs</FONT></P>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Preserve
- NTFS sparse files</FONT></P>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Copy
+ NTFS extended attributes (compressed, encrypted, sparse)</FONT></P>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Copy
+ NTFS security permissions</FONT></P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Support
- very long path names &gt; 260 characters</FONT></P>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Transactional
+ long path names &gt; 260 characters</FONT></P>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Fail-safe
file copy</FONT></P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Cross-platform:
Windows/Linux</FONT></P>
@@ -113,8 +115,8 @@ Features</FONT></H3>
variable drive letters by volume name (USB sticks)</FONT></P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Native
32 and 64-bit builds</FONT></P>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Versioning
- of deleted files</FONT></P>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Keep
+ versions of deleted/updated files</FONT></P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Optimal
sync sequence prevents disc space bottlenecks</FONT></P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Full
@@ -124,7 +126,7 @@ Features</FONT></H3>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Include/exclude
files via filter</FONT></P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Local
- or portable installation</FONT></P>
+ and portable installation</FONT></P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Handle
daylight saving time changes on FAT/FAT32</FONT></P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Use
diff --git a/BUILD/Help/html/Links.html b/BUILD/Help/html/Links.html
index 527146d4..5fcafa9d 100644
--- a/BUILD/Help/html/Links.html
+++ b/BUILD/Help/html/Links.html
@@ -5,21 +5,19 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20110928;12294600">
+ <META NAME="CHANGED" CONTENT="20120511;23101500">
<STYLE TYPE="text/css">
<!--
@page { margin: 2cm }
P { margin-bottom: 0.21cm }
- H3 { margin-bottom: 0.21cm }
- H3.western { font-family: "Arial", sans-serif }
- H3.cjk { font-family: "MS Mincho" }
- H3.ctl { font-family: "Mangal" }
+ H2.cjk { font-family: "SimSun" }
+ H2.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
<BODY LANG="de-DE" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Links</FONT></H3>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Links</FONT></FONT></H2>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Homepage:<BR></FONT><A HREF="http://freefilesync.sourceforge.net/"><FONT COLOR="#000080"><FONT FACE="Tahoma, sans-serif"><SPAN LANG="zxx"><U>http://freefilesync.sourceforge.net</U></SPAN></FONT></FONT></A></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
diff --git a/BUILD/Help/html/Macros.html b/BUILD/Help/html/Macros.html
index 3e9c93d1..17b0979e 100644
--- a/BUILD/Help/html/Macros.html
+++ b/BUILD/Help/html/Macros.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20111022;16542200">
+ <META NAME="CHANGED" CONTENT="20120511;23110400">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -14,16 +14,14 @@
<!--
@page { margin: 2cm }
P { margin-bottom: 0.21cm }
- H3 { margin-bottom: 0.21cm }
- H3.western { font-family: "Arial", sans-serif }
- H3.cjk { font-family: "MS Mincho" }
- H3.ctl { font-family: "Mangal" }
+ H2.cjk { font-family: "SimSun" }
+ H2.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
<BODY LANG="de-DE" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Macros</FONT></H3>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Macros</FONT></FONT></H2>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">All
@@ -137,7 +135,7 @@ batch configuration file <FONT FACE="Courier New, monospace">C:\SyncJob.ffs_batc
<UL>
<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-right: 0.98cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif"><B>Note:</B><BR>Temporary
+ <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
diff --git a/BUILD/Help/html/RealtimeSync.html b/BUILD/Help/html/RealtimeSync.html
index 7fd3b6c9..0a302a0a 100644
--- a/BUILD/Help/html/RealtimeSync.html
+++ b/BUILD/Help/html/RealtimeSync.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20120324;18334600">
+ <META NAME="CHANGED" CONTENT="20120511;21275200">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -38,36 +38,37 @@ this command line will simply trigger a FreeFileSync batch job.</FONT></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">First
-start up RealtimeSync.exe located in FreeFileSync's installation
-directory. Then specify all directories that shall be monitored.
-Instead of doing this manually you can import a </FONT><FONT FACE="Courier New, monospace">*.ffs_batch</FONT>
+<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><FONT FACE="Tahoma, sans-serif"><I>Menu
--&gt; File -&gt; Load configuration</I></FONT><FONT FACE="Tahoma, sans-serif">.
+-&gt; Program -&gt; Open</I></FONT><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 &quot;</FONT><FONT FACE="Tahoma, sans-serif"><I>Start</I></FONT><FONT FACE="Tahoma, sans-serif">&quot;
to begin monitoring.</FONT></P>
<UL>
- <P STYLE="margin-bottom: 0cm"><IMG SRC="../img/RealtimeSync.png" NAME="Grafik3" ALIGN=MIDDLE WIDTH=420 HEIGHT=480 BORDER=0></P>
+ <P STYLE="margin-bottom: 0cm"><IMG SRC="../img/RealtimeSync.png" NAME="Grafik3" ALIGN=MIDDLE WIDTH=461 HEIGHT=446 BORDER=0></P>
</UL>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
<UL>
- <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note:</B></FONT></P>
+ <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note</B></FONT></P>
<LI><P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">The
- command-line should <B>not</B> <B>block</B> the progress. If a
- FreeFileSync batch file is called make sure it is running
- &quot;minimized&quot; and &quot;error handling&rdquo; is set to
- &quot;ignore errors&quot; or &quot;exit instantly<SPAN STYLE="text-decoration: none">&quot;.<BR>&nbsp;</SPAN></FONT></P>
+ command should </FONT><FONT FACE="Tahoma, sans-serif"><B>not</B></FONT><FONT FACE="Tahoma, sans-serif">
+ </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>
<LI><P ALIGN=LEFT STYLE="margin-right: 0.98cm; 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 allows for
- integration with the operating system's auto start
+ 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;C:\MyConfig.ffs_real&quot;<BR></FONT>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Courier New, monospace">&quot;C:\Program
@@ -75,10 +76,7 @@ to begin monitoring.</FONT></P>
<LI><P ALIGN=LEFT STYLE="margin-right: 0.98cm; 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.<BR>&nbsp;</FONT></P>
- <LI><P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">If
- you schedule a Windows batch file (.bat, .cmd), see notes in <A HREF="Batch%20Scripting.html">Batch
- Scripting</A>.</FONT></P>
+ certain directory is modified.</FONT></P>
</UL>
</SPAN><BR CLEAR=LEFT><BR>
</P>
@@ -87,12 +85,12 @@ to begin monitoring.</FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B></FONT>
<FONT FACE="Tahoma, sans-serif">Automatic synchronization when USB
stick is inserted</FONT></P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Save
-the relevant configuration on the USB stick's root directory to have
+<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>
<UL>
- <P><IMG SRC="../img/WatchUsbInsert.png" NAME="Grafik2" ALIGN=BOTTOM WIDTH=436 HEIGHT=447 BORDER=0></P>
+ <P><IMG SRC="../img/WatchUsbInsert.png" NAME="Grafik2" ALIGN=BOTTOM WIDTH=442 HEIGHT=440 BORDER=0></P>
</UL>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
@@ -107,7 +105,7 @@ files are modified in &quot;</FONT><FONT FACE="Courier New, monospace">H:\Data</
</P>
<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen2" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
<UL>
- <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note:<BR></B></FONT><FONT FACE="Tahoma, sans-serif">The
+ <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note<BR></B></FONT><FONT FACE="Tahoma, sans-serif">The
n</FONT><SPAN STYLE="text-decoration: none"><FONT FACE="Tahoma, sans-serif">ame
of the last changed file is written to an environment variable
named </FONT></SPAN><SPAN STYLE="text-decoration: none"><FONT FACE="Courier New, monospace">&quot;changed_file&quot;.</FONT></SPAN></P>
@@ -132,6 +130,21 @@ directories. (Windows)</FONT></P>
</UL>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
+<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen5" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
+ <UL>
+ <P ALIGN=LEFT STYLE="margin-right: 0.98cm; 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-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Courier New, monospace"><B>wscript
+ &quot;C:\Program files\FreeFileSync\HideConsole.vbs&quot;
+ C:\MyBatchFile.cmd</B></FONT></P>
+ </UL>
+</SPAN><BR CLEAR=LEFT><BR>
+</P>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
<P STYLE="margin-bottom: 0cm; text-decoration: none"><FONT FACE="Tahoma, sans-serif">Limitations:</FONT></P>
<UL>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">If
diff --git a/BUILD/Help/html/RunAsService.html b/BUILD/Help/html/Run as Service.html
index dcd0b029..b1bc5171 100644
--- a/BUILD/Help/html/RunAsService.html
+++ b/BUILD/Help/html/Run as Service.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20120217;11243000">
+ <META NAME="CHANGED" CONTENT="20120511;23105500">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -14,17 +14,15 @@
<!--
@page { margin: 2cm }
P { margin-bottom: 0.21cm }
- H3 { margin-bottom: 0.21cm }
- H3.western { font-family: "Arial", sans-serif }
- H3.cjk { font-family: "MS Mincho" }
- H3.ctl { font-family: "Mangal" }
+ H2.cjk { font-family: "SimSun" }
+ H2.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Run as Service
-<SPAN STYLE="font-weight: normal">(Windows only)</SPAN></FONT></H3>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Run
+as Service <SPAN STYLE="font-weight: normal">(Windows only)</SPAN></FONT></FONT></H2>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">The
@@ -37,11 +35,15 @@ into Windows' Autostart folder, specifying RealtimeSync.exe and the
.ffs_batch or .ffs_real file as argument.</FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
+<P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Reference:
+<A HREF="http://support.microsoft.com/kb/137890">http://support.microsoft.com/kb/137890</A></FONT></P>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">1. Get
access to the command-line tools &quot;</FONT><FONT FACE="Courier New, monospace">instsrv.exe</FONT><FONT FACE="Tahoma, sans-serif">&quot;
and &quot;</FONT><FONT FACE="Courier New, monospace">srvany.exe</FONT><FONT FACE="Tahoma, sans-serif">&quot;
which come with the Windows Server 2003 Resource Kit Tools:</FONT></P>
-<P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Download:
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Download:
<A HREF="http://www.microsoft.com/downloads/details.aspx?familyid=9d467a69-57ff-4ae7-96ee-b18c4790cffd&amp;displaylang=en">http://www.microsoft.com/downloads/details.aspx?familyid=9d467a69-57ff-4ae7-96ee-b18c4790cffd&amp;displaylang=en</A></FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
@@ -76,9 +78,9 @@ service is now ready for operation!</FONT></P>
</P>
<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" 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-right: 0.98cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif"><B>Attention:</B><BR>When running
+ <FONT FACE="Tahoma, sans-serif"><B>Attention</B><BR>When running
RealtimeSync as a service the application has no means to interact
- with the user. Therefore any popup dialog will halt the process!
+ with the user. Therefore any popup dialog will block progress!
Consider the following options when setting up a FreeFileSync batch
job:</FONT></P>
<UL>
@@ -86,18 +88,16 @@ service is now ready for operation!</FONT></P>
checkbox &quot;<I>Show progress dialog</I>&quot; or automatically
close it after synchronization.</FONT></P>
<LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Set
- &quot;<I>Error handling</I>&quot; to either &quot;<I>Exit
- instantly</I>&quot; or &quot;<I>Ignore errors</I>&quot;.</FONT></P>
- <LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">At
- least for debugging purposes or initial setup &quot;Allow service
- to interact with desktop&quot;. The may show error dialogs
- otherwise hidden by the SYSTEM account.</FONT></P>
+ &quot;<I>Error handling</I>&quot; to &quot;<I>Exit instantly</I>&quot;
+ or &quot;<I>Ignore errors</I>&quot;.</FONT></P>
+ <LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">To
+ ease debugging or initial setup &quot;Allow service to interact
+ with desktop&quot;. The may show error dialogs otherwise hidden by
+ the SYSTEM account.</FONT></P>
</UL>
</SPAN><BR CLEAR=LEFT><BR><IMG SRC="../img/RunAsService_html_13819326743214.png" NAME="Grafik2" ALIGN=TEXTTOP WIDTH=535 HEIGHT=589 BORDER=0></P>
<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><BR>
</P>
-<P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><BR>
-</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">You can
start the service now via command line or Windows Service
administration:</FONT></P>
@@ -109,11 +109,9 @@ administration:</FONT></P>
</UL>
<P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><BR>
</P>
-<P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><BR>
-</P>
<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen7" 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-right: 0.98cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif"><B>Note:</B><BR>By default the
+ <FONT FACE="Tahoma, sans-serif"><B>Note</B><BR>By default the
service is created with start-up type &quot;automatic&quot; which
runs it on Windows start. This behavior can be changed in Windows
Service administration.</FONT></P>
@@ -134,7 +132,5 @@ Service shall be removed from the system, enter via command line:</FONT></P>
</UL>
<P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><BR>
</P>
-<P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">(Reference:
-<A HREF="http://support.microsoft.com/kb/137890">http://support.microsoft.com/kb/137890</A>)</FONT></P>
</BODY>
</HTML> \ No newline at end of file
diff --git a/BUILD/Help/html/ScheduleBatch.html b/BUILD/Help/html/Schedule a Batch Job.html
index 9a40cce5..19b1eca2 100644
--- a/BUILD/Help/html/ScheduleBatch.html
+++ b/BUILD/Help/html/Schedule a Batch Job.html
@@ -5,40 +5,37 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20120221;18051600">
+ <META NAME="CHANGED" CONTENT="20120512;16135500">
<STYLE TYPE="text/css">
<!--
@page { margin: 2cm }
P { margin-bottom: 0.21cm }
- H3 { margin-bottom: 0.21cm }
- H3.western { font-family: "Arial", sans-serif }
- H3.cjk { font-family: "MS Mincho" }
- H3.ctl { font-family: "Mangal" }
+ H2.cjk { font-family: "SimSun" }
+ H2.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
<BODY LANG="de-DE" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Schedule a Batch
-Job</FONT></H3>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Schedule
+a Batch Job</FONT></FONT></H2>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<OL>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Create
a new batch job via FreeFileSync's main
dialog:<BR></FONT><FONT FACE="Tahoma, sans-serif"><I>Menu-&gt;Advanced-&gt;Create
- batch job</I></FONT> <FONT FACE="Tahoma, sans-serif">and save it,
- for example, as &quot;</FONT><FONT FACE="Courier New, monospace">C:\SyncJob.ffs_batch</FONT><FONT FACE="Tahoma, sans-serif">&quot;.<BR>&nbsp;</FONT></P>
+ batch job</I></FONT><FONT FACE="Tahoma, sans-serif"><BR>&nbsp;</FONT></P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">If
- the batch job shall run without user interaction or as part of a
- batch script, make sure that no popup dialog stops the progress:
- Disable checkbox &quot;<I>Show progress dialog</I>&quot; to avoid
- blocking while showing the result after synchronization.
+ the batch job shall run without user interaction or as part of an
+ unattended batch script, make sure that no popup dialog stops the
+ progress:<BR>Disable checkbox &quot;<I>Show progress dialog</I>&quot;
+ to avoid blocking while showing the result after synchronization.
Alternatively you can select the &quot;On completion&quot; action
&quot;Close progress dialog&quot; located in synchronization
- settings. Note that even if the progress is not shown initially it
- can be displayed interactively at any time during synchronization,
- by double-clicking the corresponding systray icon.<BR><IMG SRC="../img/SetupBatch.png" NAME="Grafik3" ALIGN=BOTTOM BORDER=0></FONT></P>
+ settings. <B>Note:</B> Even if the progress dialog is not shown at
+ the beginning, a user 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=560 HEIGHT=342 BORDER=0></FONT></P>
<P STYLE="margin-bottom: 0cm">&nbsp;</P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">In
order to prevent error or warning popup messages from stopping
@@ -70,9 +67,19 @@ Job</FONT></H3>
<UL>
<LI><P STYLE="margin-bottom: 0cm; font-weight: normal"><FONT FACE="Tahoma, sans-serif"><FONT COLOR="#000000"><FONT SIZE=3>Use
quotes if any paths contain spaces, e.g.: </FONT></FONT><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><FONT SIZE=3>&quot;C:\some
- folder\SyncJob.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=321 BORDER=0><BR>&nbsp;</FONT></P>
+ folder\SyncJob.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=321 BORDER=0></FONT></P>
</UL>
</OL>
+ <P STYLE="margin-bottom: 0cm"><SPAN ID="Rahmen2" 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-right: 0.98cm; 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 to
+ be a path to &quot;FreeFileSync.exe&quot; even if ffs_batch file
+ associations are set!</FONT> <FONT FACE="Tahoma, sans-serif">Else
+ the task will return with error code 0xC1, &quot;%1 is not a valid
+ Win32 application&quot; if a ffs_batch file is entered directly.</FONT></P>
+ </SPAN><BR CLEAR=LEFT>&nbsp;
+ </P>
</OL>
<OL>
<OL TYPE=A START=2>
@@ -84,10 +91,10 @@ Job</FONT></H3>
select &quot;<I>Add Scheduled Task</I>&quot;.</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">Make
- sure &quot;Run:&quot; is specified as: <FONT FACE="Courier New, monospace">&lt;FreeFileSync
- installation directory&gt;\FreeFileSync.exe &lt;ffs_batch
- file&gt;</FONT><BR><IMG SRC="../img/ScheduleBatch_html_m10bf0d36.gif" NAME="Grafik2" ALIGN=BOTTOM WIDTH=406 HEIGHT=455 BORDER=0><BR>&nbsp;</FONT></P>
+ <LI><P STYLE="margin-bottom: 0cm; font-weight: normal"><FONT FACE="Tahoma, sans-serif">Enter
+ &quot;Run:&quot; as: <FONT FACE="Courier New, monospace">&lt;FreeFileSync
+ installation directory&gt;\FreeFileSync.exe &lt;job
+ name&gt;.ffs_batch</FONT><BR><IMG SRC="../img/ScheduleBatch_html_m10bf0d36.gif" NAME="Grafik2" ALIGN=BOTTOM WIDTH=406 HEIGHT=455 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>
@@ -112,20 +119,11 @@ Job</FONT></H3>
<UL>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal">Specify
the command as:</SPAN></SPAN></FONT> <FONT FACE="Courier New, monospace"><I><SPAN STYLE="font-weight: normal">&lt;FreeFileSync
- installation directory&gt;/FreeFileSync &lt;ffs_batch file&gt;<BR></SPAN></I></FONT><IMG SRC="../img/ubuntuScheduler.png" NAME="Grafik5" ALIGN=BOTTOM WIDTH=629 HEIGHT=560 BORDER=0></P>
+ installation directory&gt;/FreeFileSync &lt;job name&gt;.ffs_batch<BR></SPAN></I></FONT><IMG SRC="../img/ubuntuScheduler.png" NAME="Grafik5" ALIGN=BOTTOM WIDTH=629 HEIGHT=560 BORDER=0></P>
</UL>
</OL>
</OL>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
-<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" 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-right: 0.98cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif"><B>Note:</B></FONT><FONT FACE="Tahoma, sans-serif"><BR>Beginning
- with Windows Vista, the command always needs to start with the path
- to &quot;FreeFileSync.exe&quot; even if file associations are set!</FONT>
- <FONT FACE="Tahoma, sans-serif">Else the task will return with error
- code 0xC1, &quot;%1 is not a valid Win32 application&quot;.</FONT></P>
-</SPAN><BR CLEAR=LEFT><BR>
-</P>
</BODY>
</HTML> \ No newline at end of file
diff --git a/BUILD/Help/html/SendMail.html b/BUILD/Help/html/SendMail.html
deleted file mode 100644
index 87e96ad4..00000000
--- a/BUILD/Help/html/SendMail.html
+++ /dev/null
@@ -1,56 +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.2 (Win32)">
- <META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20110901;20164500">
- <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 }
- H3 { margin-bottom: 0.21cm }
- H3.western { font-family: "Arial", sans-serif }
- H3.cjk { font-family: "MS Mincho" }
- H3.ctl { font-family: "Mangal" }
- A:link { so-language: zxx }
- -->
- </STYLE>
-</HEAD>
-<BODY LANG="en-US" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Send error
-notification via email</FONT></H3>
-<P STYLE="margin-bottom: 0cm"><BR>
-</P>
-<OL>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Create
- a FreeFileSync batch file using &quot;<I>Run minimized</I>&quot;.<BR>&nbsp;</FONT></P>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Set
- error handling to &quot;<I>Exit instantly</I>&quot; or &quot;<I>Ignore
- errors</I>&quot; to avoid having a pop-up stop the program flow. In
- case errors occur FreeFileSync will exit with a return code &lt; 0
- that can be checked via the ERRORLEVEL batch command.<BR>&nbsp;</FONT></P>
- <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Create
- a *.cmd or *.bat file to specify the location of FreeFileSync.exe
- and pass the name of the ffs_batch file as first argument; e.g.:</FONT></P>
-</OL>
-<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-right: 0.98cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif"><FONT FACE="Courier New, monospace">&quot;C:\Program
- Files\FreeFileSync\FreeFileSync.exe&quot; &quot;C:\SyncJob.ffs_batch&quot;<BR>@if
- not errorlevel 0 (<BR>&nbsp;&nbsp;&nbsp;&nbsp;echo An error
- occured!<BR>&nbsp;&nbsp;&nbsp;&nbsp;pause<BR>)</FONT></FONT></P>
-</SPAN><BR CLEAR=LEFT><BR>
-</P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Instead
-of displaying &quot;An error occurred!&quot; you can specify another
-command like sending an email notification (using a third party
-tool).</FONT>
-</P>
-</BODY>
-</HTML> \ No newline at end of file
diff --git a/BUILD/Help/html/Ftp.html b/BUILD/Help/html/Synchronize with FTP.html
index c11dcd24..2f452c6e 100644
--- a/BUILD/Help/html/Ftp.html
+++ b/BUILD/Help/html/Synchronize with FTP.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20110901;20315700">
+ <META NAME="CHANGED" CONTENT="20120511;23103900">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -18,13 +18,15 @@
H3.western { font-family: "Arial", sans-serif }
H3.cjk { font-family: "MS Mincho" }
H3.ctl { font-family: "Mangal" }
+ H2.cjk { font-family: "SimSun" }
+ H2.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Synchronize with
-FTP/WebDAV <SPAN STYLE="font-weight: normal">(Windows)</SPAN></FONT></H3>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Synchronize
+with FTP/WebDAV <SPAN STYLE="font-weight: normal">(Windows)</SPAN></FONT></FONT></H2>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">FreeFileSync
@@ -45,8 +47,8 @@ drive letter:</FONT></P>
</UL>
<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" 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-right: 0.98cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif"><B>Note:</B><BR>Most FTP drives set
- a file's time stamp to the current time when synchronizing ignoring
+ <FONT FACE="Tahoma, sans-serif"><B>Note</B><BR>Most FTP drives set a
+ file's time stamp to the current time when synchronizing ignoring
the source file's time and date. As a workaround you can do a
&quot;<I>compare by filesize</I>&quot;; see corresponding section.</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
diff --git a/BUILD/Help/html/VariableDrive.html b/BUILD/Help/html/Variable Drive Letters.html
index 87283a12..2effaadd 100644
--- a/BUILD/Help/html/VariableDrive.html
+++ b/BUILD/Help/html/Variable Drive Letters.html
@@ -5,22 +5,20 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20120206;18412300">
+ <META NAME="CHANGED" CONTENT="20120511;23102900">
<STYLE TYPE="text/css">
<!--
@page { margin: 2cm }
P { margin-bottom: 0.21cm }
- H3 { margin-bottom: 0.21cm }
- H3.western { font-family: "Arial", sans-serif }
- H3.cjk { font-family: "MS Mincho" }
- H3.ctl { font-family: "Mangal" }
+ H2.cjk { font-family: "SimSun" }
+ H2.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
<BODY LANG="de-DE" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Variable drive
-letters</FONT></H3>
+<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"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">USB
@@ -37,12 +35,13 @@ name]\path</FONT></FONT></P>
<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 name of the USB stick that is currently mounted in volume G:\.</FONT></P>
+ is the name of the USB stick that is currently mounted in volume
+ G:\.</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">It is
not required to look up and enter the volume name manually! Just
-select the corresponding entry in the drop down menu.<BR></FONT><IMG SRC="../img/VolumeName.png" NAME="Grafik1" ALIGN=BOTTOM></P>
+select the corresponding entry in the drop down menu.<BR></FONT><IMG SRC="../img/VolumeName.png" NAME="Grafik1" ALIGN=BOTTOM WIDTH=424 HEIGHT=86 BORDER=0></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Option
diff --git a/BUILD/Help/html/ShadowCopy.html b/BUILD/Help/html/Volume Shadow Copy.html
index ce66ccee..fa10a9e0 100644
--- a/BUILD/Help/html/ShadowCopy.html
+++ b/BUILD/Help/html/Volume Shadow Copy.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20110901;20302700">
+ <META NAME="CHANGED" CONTENT="20120511;23094200">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -14,17 +14,15 @@
<!--
@page { margin: 2cm }
P { margin-bottom: 0.21cm }
- H3 { margin-bottom: 0.21cm }
- H3.western { font-family: "Arial", sans-serif }
- H3.cjk { font-family: "MS Mincho" }
- H3.ctl { font-family: "Mangal" }
+ H2.cjk { font-family: "SimSun" }
+ H2.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Volume Shadow
-Copy Service <SPAN STYLE="font-weight: normal">(Windows only)</SPAN></FONT></H3>
+<H2 CLASS="western"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4 STYLE="font-size: 15pt">Volume
+Shadow Copy Service <SPAN STYLE="font-weight: normal">(Windows only)</SPAN></FONT></FONT></H2>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">FreeFileSync
@@ -33,13 +31,13 @@ Copy of the source drive. To enable this feature go to </FONT><FONT FACE="Tahoma
-&gt; Advanced -&gt; Global settings: Copy locked files</I></FONT><FONT FACE="Tahoma, sans-serif">.</FONT></P>
<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen3" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
<UL>
- <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note:</B></FONT></P>
+ <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note</B></FONT></P>
<LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">This
functionality is applied to locked files only. Regular files will
not use Volume Shadow Copy Service when being synchronized.</FONT></P>
- <LI><P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><SPAN STYLE="font-style: normal"><FONT FACE="Tahoma, sans-serif">Creating
- Volume Snapshots using VSS requires the application to be started
- with administrator rights.</FONT></SPAN></P>
+ <LI><P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm; font-style: normal">
+ <FONT FACE="Tahoma, sans-serif">Creating Volume Snapshots using VSS
+ requires the application to be started with administrator rights.</FONT></P>
</UL>
</SPAN><BR CLEAR=LEFT><BR>
</P>
@@ -58,9 +56,7 @@ the follow content or enter directly via command line:</FONT></P>
msxml3.dll<BR>regsvr32 msxml4.dll</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
-<P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><BR>
-</P>
-<P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">(Reference:
-<A HREF="http://support.microsoft.com/kb/940032">http://support.microsoft.com/kb/940032</A>)</FONT></P>
+<P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Reference:
+<A HREF="http://support.microsoft.com/kb/940032">http://support.microsoft.com/kb/940032</A></FONT></P>
</BODY>
</HTML> \ No newline at end of file
diff --git a/BUILD/Help/img/MainDialog.png b/BUILD/Help/img/MainDialog.png
index 6d7271a1..984e1305 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 20d582c6..56e55aea 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 d3dc81a0..469d632b 100644
--- a/BUILD/Help/img/SetupBatch.png
+++ b/BUILD/Help/img/SetupBatch.png
Binary files differ
diff --git a/BUILD/Help/img/SourceTarget.png b/BUILD/Help/img/SourceTarget.png
index 2a3a834e..df8921d6 100644
--- a/BUILD/Help/img/SourceTarget.png
+++ b/BUILD/Help/img/SourceTarget.png
Binary files differ
diff --git a/BUILD/Help/img/WatchUsbInsert.png b/BUILD/Help/img/WatchUsbInsert.png
index 9d106fb8..a4d17a4d 100644
--- a/BUILD/Help/img/WatchUsbInsert.png
+++ b/BUILD/Help/img/WatchUsbInsert.png
Binary files differ
diff --git a/BUILD/RunSilent.vbs b/BUILD/HideConsole.vbs
index a6fe4f6b..6a178410 100644
--- a/BUILD/RunSilent.vbs
+++ b/BUILD/HideConsole.vbs
@@ -3,7 +3,7 @@ num = argIn.Count
if num = 0 then
WScript.Echo "Call a Windows batch file (*.cmd, *.bat) without showing the console window" & VbCrLf & VbCrLf &_
- "Command line:" & VbCrLf & "WScript RunSilent.vbs MyBatchfile.cmd <command line arguments>"
+ "Command line:" & VbCrLf & "WScript HideConsole.vbs MyBatchfile.cmd <command line arguments>"
WScript.Quit 1
end if
diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index e40d8afc..acd8a931 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -7,8 +7,8 @@
<plural definition>0</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>正在搜索目录 %x...</target>
+<source>Searching for folder %x...</source>
+<target>正在搜索文件夹 %x...</target>
<source>Show in Explorer</source>
<target>在Explorer中显示</target>
@@ -20,23 +20,26 @@
<target>浏览目录</target>
<source>Abort requested: Waiting for current operation to finish...</source>
-<target>取消请求: 正在等待当前操作完成...</target>
+<target>请求中止: 正在等待当前操作完成...</target>
<source>RealtimeSync - Automated Synchronization</source>
<target>实时同步 - 自动同步</target>
+<source>Error</source>
+<target>错误</target>
+
<source>Select alternate comparison settings</source>
<target>选择替换的比较设置</target>
<source>Select alternate synchronization settings</source>
<target>选择替换同步设置</target>
+<source>Filter is active</source>
+<target>过滤器已生效</target>
+
<source>No filter selected</source>
<target>没有选定过滤器</target>
-<source>Filter is active</source>
-<target>过滤器已激活</target>
-
<source>Remove alternate settings</source>
<target>移除替换设置</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>关于</target>
-<source>Error</source>
-<target>错误</target>
-
<source>Warning</source>
<target>警告</target>
@@ -68,13 +68,13 @@
<target>确认</target>
<source>Configure filter</source>
-<target>配置过滤</target>
+<target>配置过滤器</target>
<source>Global settings</source>
<target>全局设置</target>
-<source>Synchronization Preview</source>
-<target>同步预览</target>
+<source>Summary</source>
+<target>总结</target>
<source>Find</source>
<target>查找</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>浏览</target>
-<source>Invalid command line: %x</source>
-<target>无效的命令行: %x</target>
+<source>Invalid command line:</source>
+<target>无效的命令行:</target>
<source>Info</source>
<target>信息</target>
@@ -119,7 +119,7 @@
<target>Linux错误代码 %x:</target>
<source>Cannot resolve symbolic link %x.</source>
-<target>无法解决 %x 的符号连接.</target>
+<target>无法解决符号连接 %x.</target>
<source>%x MB</source>
<target>%x MB</target>
@@ -223,29 +223,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>卷名 %x 并非文件名 %y 的一部分!</target>
-<source>Cannot find file %x.</source>
-<target>无法找到文件 %x .</target>
-
<source>Cannot read the following XML elements:</source>
<target>无法读取如下XML元素:</target>
-<source>S&ave configuration...</source>
-<target>保存配置(&A)...</target>
+<source>Cannot find file %x.</source>
+<target>无法找到文件 %x .</target>
+
+<source>&Open...</source>
+<target>打开(&O)...</target>
-<source>&Load configuration...</source>
-<target>加载配置(&L)...</target>
+<source>&Save...</source>
+<target>保存(&S)...</target>
<source>&Quit</source>
<target>退出(&Q)</target>
-<source>&File</source>
-<target>文件(&F)</target>
+<source>&Program</source>
+<target>程序(&P)</target>
<source>&Content</source>
<target>内容(&C)</target>
-<source>&About...</source>
-<target>关于(&A)...</target>
+<source>&About</source>
+<target>关于(&A)</target>
<source>&Help</source>
<target>帮助(&H)</target>
@@ -253,8 +253,8 @@
<source>Usage:</source>
<target>用法:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. 选择要监视的目录.</target>
+<source>1. Select folders to watch.</source>
+<target>1. 选择要监视的文件夹.</target>
<source>2. Enter a command line.</source>
<target>2. 输入一个命令行.</target>
@@ -262,41 +262,50 @@
<source>3. Press 'Start'.</source>
<target>3. 点击'开始'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-每次有如下情况时执行这个命令行:
-- 所有目录转为可用状态(例如插入U盘)
-- 目录或子目录里的文件被修改
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>要开始只需导入一个 .ffs_batch文件.</target>
-<source>Directories to watch</source>
-<target>要监视的目录</target>
+<source>Folders to watch</source>
+<target>要监视的文件夹</target>
<source>Add folder</source>
<target>添加文件夹</target>
<source>Remove folder</source>
-<target>删除文件夹</target>
+<target>移除文件夹</target>
<source>Select a folder</source>
<target>选择一个文件夹</target>
+<source>Delay [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>Minimum Idle Time [seconds]</source>
-<target>最小空闲时间[秒]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>以秒计的最后变更和执行命令行之间的空闲时间</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+命令将被触发如果:
+- 文件或子文件夹改变
+- 新文件夹到达(例如U盘插入)
+</target>
<source>Start</source>
<target>开始</target>
+<source>&Retry</source>
+<target>重试(&R)</target>
+
+<source>Cancel</source>
+<target>取消</target>
+
<source>(Build: %x)</source>
<target>(Build: %x)</target>
@@ -315,14 +324,14 @@ The command line is executed each time:
<source>Waiting for missing directories...</source>
<target>正在等待丢失的目录...</target>
-<source>A directory input field is empty.</source>
-<target>有一个目录输入字段是空的.</target>
+<source>An input folder name is empty.</source>
+<target>有一个输入的文件夹名为空.</target>
<source>Logging</source>
<target>记录</target>
<source>File time and size</source>
-<target>文件时间和日期</target>
+<target>文件时间和大小</target>
<source>File content</source>
<target>文件内容</target>
@@ -361,7 +370,7 @@ The command line is executed each time:
<target>停止</target>
<source>Synchronization aborted!</source>
-<target>同步已放弃!</target>
+<target>同步已被中止!</target>
<source>Synchronization completed with errors!</source>
<target>同步已完成但有错误.</target>
@@ -387,12 +396,12 @@ The command line is executed each time:
<source>Download now?</source>
<target>立即下载?</target>
-<source>Information</source>
-<target>信息</target>
-
<source>FreeFileSync is up to date!</source>
<target>FreeFileSync 已是最新!</target>
+<source>Information</source>
+<target>信息</target>
+
<source>Do you want FreeFileSync to automatically check for updates every week?</source>
<target>要让 FreeFileSync 保持每周检查一次更新吗?</target>
@@ -402,8 +411,8 @@ The command line is executed each time:
<source><Symlink></source>
<target><符号连接></target>
-<source><Directory></source>
-<target><目录></target>
+<source><Folder></source>
+<target><文件夹></target>
<source>Full path</source>
<target>完整路径</target>
@@ -414,8 +423,8 @@ The command line is executed each time:
<source>Relative path</source>
<target>相对路径</target>
-<source>Directory</source>
-<target>目录</target>
+<source>Base folder</source>
+<target>主文件夹</target>
<source>Size</source>
<target>大小</target>
@@ -426,8 +435,11 @@ The command line is executed each time:
<source>Extension</source>
<target>扩展名</target>
-<source>Comparison Result</source>
-<target>比较结果</target>
+<source>Action</source>
+<target>动作</target>
+
+<source>Category</source>
+<target>分类</target>
<source>Drag && drop</source>
<target>拖放</target>
@@ -435,14 +447,14 @@ The command line is executed each time:
<source>Close progress dialog</source>
<target>关闭进度对话框</target>
-<source>Shut down</source>
-<target>关机</target>
+<source>Standby</source>
+<target>待机</target>
<source>Log off</source>
<target>注销</target>
-<source>Standby</source>
-<target>待机</target>
+<source>Shut down</source>
+<target>关机</target>
<source>Hibernate</source>
<target>休眠</target>
@@ -450,15 +462,12 @@ The command line is executed each time:
<source>1. &Compare</source>
<target>1. 比较(&C)</target>
-<source>2. &Synchronize...</source>
-<target>2. 同步(&S)...</target>
+<source>2. &Synchronize</source>
+<target>2. 同步(&S)</target>
<source>&New</source>
<target>新建(&N)</target>
-<source>&Program</source>
-<target>程序(&P)</target>
-
<source>&Language</source>
<target>切换语言(&L)</target>
@@ -486,8 +495,8 @@ The command line is executed each time:
<source>&Abort</source>
<target>取消(&A)</target>
-<source>Synchronize...</source>
-<target>同步...</target>
+<source>Synchronize</source>
+<target>同步</target>
<source>Start synchronization</source>
<target>开始同步</target>
@@ -496,17 +505,17 @@ The command line is executed each time:
<target>添加成对文件夹</target>
<source>Remove folder pair</source>
-<target>删除文件夹对</target>
+<target>移除文件夹对</target>
<source>Swap sides</source>
<target>两侧互换</target>
-<source>Save current configuration to file</source>
-<target>保存当前配置到文件</target>
-
<source>Load configuration from file</source>
<target>从文件加载配置</target>
+<source>Save current configuration to file</source>
+<target>保存当前配置到文件</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>最后使用的配置(按DEL键将其从列表中移除)</target>
@@ -516,17 +525,17 @@ The command line is executed each time:
<source>Hide filtered or temporarily excluded files</source>
<target>隐藏已过滤或临时排除的文件</target>
-<source>Number of files and directories that will be created</source>
-<target>一些文件和目录将被创建</target>
+<source>Number of files and folders that will be created</source>
+<target>将被创建的文件和文件夹数</target>
<source>Number of files that will be overwritten</source>
-<target>一些文件和目录将被覆盖</target>
+<target>将被覆盖的文件数</target>
-<source>Number of files and directories that will be deleted</source>
-<target>一些文件和目录将被删除</target>
+<source>Number of files and folders that will be deleted</source>
+<target>将被删除的文件和文件夹数</target>
<source>Total amount of data that will be transferred</source>
-<target>将被转移的总数据</target>
+<target>将被传输的数据总量</target>
<source>Operation:</source>
<target>操作:</target>
@@ -546,14 +555,14 @@ The command line is executed each time:
<source>Batch job</source>
<target>批处理作业</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>创建批处理文件并自动同步. 要在批处理模式下开始, 只需简单双击此文件或运行如下命令: FreeFileSync.exe SyncJob.ffs_batch. 此外也可在你系统中的计划任务里面执行.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>创建一个用于自动同步的批处理文件. 双击这个文件或者在你的系统的任务计划中定时执行: FreeFileSync.exe <作业名>.ffs_batch</target>
<source>Help</source>
<target>帮助</target>
<source>Filter files</source>
-<target>过滤文件</target>
+<target>过滤器文件</target>
<source>Left</source>
<target>左侧</target>
@@ -573,21 +582,12 @@ The command line is executed each time:
<source>Maximum number of log files:</source>
<target>最大的日志文件数:</target>
-<source>Select log file directory:</source>
-<target>选择日志保存位置:</target>
+<source>Select folder to save log files:</source>
+<target>选择要保存日志的文件夹:</target>
<source>Batch settings</source>
<target>批处理设置</target>
-<source>&Save</source>
-<target>保存(&S)</target>
-
-<source>&Load</source>
-<target>加载(&L)</target>
-
-<source>Cancel</source>
-<target>取消</target>
-
<source>Select variant:</source>
<target>选择变化的:</target>
@@ -612,29 +612,23 @@ The command line is executed each time:
<source>Configuration</source>
<target>配置</target>
-<source>Category</source>
-<target>分类</target>
-
-<source>Action</source>
-<target>动作</target>
-
-<source>File/folder exists on left side only</source>
-<target>文件/文件夹仅存在于左侧</target>
+<source>Item exists on left side only</source>
+<target>项目仅存在于左侧</target>
-<source>File/folder exists on right side only</source>
-<target>文件/文件夹仅存在于右侧</target>
+<source>Item exists on right side only</source>
+<target>项目仅存在于右侧</target>
-<source>Left file is newer</source>
-<target>左侧文件较新</target>
+<source>Left side is newer</source>
+<target>左侧较新</target>
-<source>Right file is newer</source>
-<target>右侧文件较新</target>
+<source>Right side is newer</source>
+<target>右侧较新</target>
-<source>Files have different content</source>
-<target>文件内容不同</target>
+<source>Items have different content</source>
+<target>项目有不同的内容</target>
-<source>Conflict/file cannot be categorized</source>
-<target>冲突/文件不能被分类</target>
+<source>Conflict/item cannot be categorized</source>
+<target>冲突/项目未能被分类</target>
<source>OK</source>
<target>确定</target>
@@ -663,7 +657,7 @@ is the same
<target>
文件被认为是相同的,如果
- 文件内容
-相同
+是相同的
</target>
<source>Symbolic Link handling</source>
@@ -711,9 +705,6 @@ is the same
<source>&Ignore</source>
<target>忽略(&I)</target>
-<source>&Retry</source>
-<target>重试(&R)</target>
-
<source>Do not show this dialog again</source>
<target>不要再显示此对话框</target>
@@ -744,33 +735,6 @@ Note: File names must be relative to base directories!
注:文件名必须是主目录的相对路径!
</target>
-<source>Hints:</source>
-<target>提示:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. 输入相对文件或文件夹名称,用';'或空行分隔.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. 使用通配符‘*’和‘?’.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. 通过右键菜单在主网格排除文件.</target>
-
-<source>Example</source>
-<target>例如</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-包括: *.doc;*.zip;*.exe
-排除: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>同步所有 .doc, .zip和 .exe 文件, 除了"temp"中的一切.</target>
-
<source>Include</source>
<target>包括</target>
@@ -792,8 +756,8 @@ Exclude: \stuff\temp\*
<source>&Default</source>
<target>默认(&D)</target>
-<source>Transactional file copy</source>
-<target>事务文件复制</target>
+<source>Fail-safe file copy</source>
+<target>无风险的文件复制</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>首先写入到一个临时文件(*.ffs_tmp)然后再重命名. 这样即使出现致命错误也能保持一致的状态.</target>
@@ -807,8 +771,8 @@ Exclude: \stuff\temp\*
<source>Copy file access permissions</source>
<target>复制文件存取权限</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>转移文件和目录的权限(需要管理员权限)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>传输文件和文件夹的权限(需要管理员权限)</target>
<source>Restore hidden dialogs</source>
<target>恢复被隐藏的对话框</target>
@@ -997,7 +961,7 @@ Exclude: \stuff\temp\*
<target>显示将不被复制的文件</target>
<source>All directories in sync!</source>
-<target>所有目录同步!</target>
+<target>所有目录已同步!</target>
<source>Please run a Compare first before synchronizing!</source>
<target>同步之前请先进行对比</target>
@@ -1112,11 +1076,11 @@ Exclude: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>集成外部应用程序到右键菜单. 如下宏可用:</target>
-<source>- full file or directory name</source>
-<target>- 完整的文件名或目录名</target>
+<source>- full file or folder name</source>
+<target>- 完整的文件或文件夹名</target>
-<source>- directory part only</source>
-<target>- 只对目录部分</target>
+<source>- folder part only</source>
+<target>- 只对文件夹部分</target>
<source>- Other side's counterpart to %name</source>
<target>- 另一侧参照 %name</target>
@@ -1158,8 +1122,8 @@ Exclude: \stuff\temp\*
<source>Versioning</source>
<target>保留历史版本</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>移动文件到时间标记子目录</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>移动文件到一个以时间标记命名的子文件夹</target>
<source>Files</source>
<target>文件</target>
@@ -1251,8 +1215,8 @@ Exclude: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>无法读取目录 %x.</target>
-<source>Endless loop.</source>
-<target>无限循环.</target>
+<source>Detected endless directory recursion.</source>
+<target>检测到无限的目录递归.</target>
<source>Cannot set privilege %x.</source>
<target>无法设置 %x 的特权.</target>
@@ -1278,14 +1242,11 @@ Exclude: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>设置默认的同步方向:旧文件会被新文件覆盖.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>该文件不包含有效的配置:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>你可以忽略这个错误而认为目录是空的.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>你可以忽略这个错误而认为文件夹是空的.</target>
-<source>Cannot find directory %x.</source>
-<target>无法找到目录 %x.</target>
+<source>Cannot find folder %x.</source>
+<target>无法找到文件夹 %x</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>目录有依赖性!在设立同步规则时请小心:</target>
@@ -1294,7 +1255,7 @@ Exclude: \stuff\temp\*
<target>正在准备同步...</target>
<source>Conflict detected:</source>
-<target>检测到冲突:</target>
+<target>检测到的冲突:</target>
<source>File %x has an invalid date!</source>
<target>文件 %x 的日期非法!</target>
@@ -1317,20 +1278,20 @@ Exclude: \stuff\temp\*
<source>Both sides are equal</source>
<target>两侧相等</target>
-<source>Files/folders differ in attributes only</source>
-<target>文件/文件夹仅属性不同</target>
+<source>Items have different attributes</source>
+<target>项目有不同的属性</target>
-<source>Copy new file/folder to left</source>
-<target>复制新文件/文件夹至左侧</target>
+<source>Copy new item to left</source>
+<target>复制新项目到左侧</target>
-<source>Copy new file/folder to right</source>
-<target>复制新文件/文件夹至右侧</target>
+<source>Copy new item to right</source>
+<target>复制新项目到右侧</target>
-<source>Delete left file/folder</source>
-<target>删除左侧文件/文件夹</target>
+<source>Delete left item</source>
+<target>删除左侧项目</target>
-<source>Delete right file/folder</source>
-<target>删除右侧文件/文件夹</target>
+<source>Delete right item</source>
+<target>删除右侧项目</target>
<source>Move file on left</source>
<target>移动左侧的文件</target>
@@ -1338,20 +1299,20 @@ Exclude: \stuff\temp\*
<source>Move file on right</source>
<target>移动右侧的文件</target>
-<source>Overwrite left file/folder with right one</source>
-<target>从右侧覆盖左侧的文件/文件夹</target>
+<source>Overwrite left item</source>
+<target>覆盖左侧的项目</target>
-<source>Overwrite right file/folder with left one</source>
-<target>从左侧覆盖右侧的文件/文件夹</target>
+<source>Overwrite right item</source>
+<target>覆盖右侧的项目</target>
<source>Do nothing</source>
<target>保持不动</target>
-<source>Copy file attributes only to left</source>
-<target>仅复制文件属性到左侧</target>
+<source>Update attributes on left</source>
+<target>更新左侧的文件属性</target>
-<source>Copy file attributes only to right</source>
-<target>仅复制文件属性到右侧</target>
+<source>Update attributes on right</source>
+<target>更新右侧的文件属性</target>
<source>Multiple...</source>
<target>并联...</target>
@@ -1404,11 +1365,11 @@ Exclude: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>更新 %x 的属性</target>
-<source>Target directory name must not be empty!</source>
-<target>目标目录名不能为空!</target>
+<source>Target folder name must not be empty.</source>
+<target>目标文件夹名必须不是空的.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>用于保存文件历史版本的目录没有提供!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>存放历史版本的文件夹名必须不是空的.</target>
<source>Source directory %x not found.</source>
<target>来源目录 %x 无法找到.</target>
@@ -1437,8 +1398,8 @@ Exclude: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>如下路径的回收站不可用! 文件会被永久删除:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>有一个目录将被修改,而它是多个文件夹对的一部分!请重新检查同步设置!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>一个将被修改的文件夹是多个文件夹对的一部分. 请重新检视同步设置.</target>
<source>Processing folder pair:</source>
<target>正在处理成对文件夹:</target>
diff --git a/BUILD/Languages/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng
index 69414e19..72e3cfe2 100644
--- a/BUILD/Languages/chinese_traditional.lng
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -7,8 +7,8 @@
<plural definition>0</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>正在搜尋目錄 %x...</target>
+<source>Searching for folder %x...</source>
+<target>正在搜尋資料夾 %x...</target>
<source>Show in Explorer</source>
<target>在資源管理器中顯示</target>
@@ -34,12 +34,12 @@
<source>Select alternate synchronization settings</source>
<target>選擇替代的同步設定</target>
-<source>No filter selected</source>
-<target>沒有選擇篩選器</target>
-
<source>Filter is active</source>
<target>篩選器為啟動</target>
+<source>No filter selected</source>
+<target>沒有選擇篩選器</target>
+
<source>Remove alternate settings</source>
<target>移除替代設定</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>整體設定</target>
-<source>Synchronization Preview</source>
-<target>同步預覽</target>
+<source>Summary</source>
+<target>概要</target>
<source>Find</source>
<target>尋找</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>瀏覽</target>
-<source>Invalid command line: %x</source>
-<target>無效的命令列:%x</target>
+<source>Invalid command line:</source>
+<target>無效的命令列:</target>
<source>Info</source>
<target>訊息</target>
@@ -223,29 +223,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>卷名 %x 並非檔名 %y 的一部份!</target>
-<source>Cannot find file %x.</source>
-<target>找不到檔案 %x。</target>
-
<source>Cannot read the following XML elements:</source>
<target>無法讀取下列XML元素:</target>
-<source>S&ave configuration...</source>
-<target>儲存配置(&A)...</target>
+<source>Cannot find file %x.</source>
+<target>找不到檔案 %x。</target>
-<source>&Load configuration...</source>
-<target>載入配置(&L)...</target>
+<source>&Open...</source>
+<target>開啟(&O)...</target>
+
+<source>&Save...</source>
+<target>儲存(&S)...</target>
<source>&Quit</source>
<target>離開(&Q)</target>
-<source>&File</source>
-<target>檔案(&F)</target>
+<source>&Program</source>
+<target>程式(&P)</target>
<source>&Content</source>
<target>內容(&C)</target>
-<source>&About...</source>
-<target>關於(&A)...</target>
+<source>&About</source>
+<target>關於(&A)</target>
<source>&Help</source>
<target>說明(&H)</target>
@@ -253,8 +253,8 @@
<source>Usage:</source>
<target>使用量:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. 選擇要監測的目錄。</target>
+<source>1. Select folders to watch.</source>
+<target>1. 選擇要監看的資料夾。</target>
<source>2. Enter a command line.</source>
<target>2. 輸入命令列。</target>
@@ -262,19 +262,11 @@
<source>3. Press 'Start'.</source>
<target>3. 按下 '開始'。</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-命令列每次執行:
-- 所有目錄為可用(例如插入USB隨身碟)
-- 檔案在這些目錄或子目錄會被修改
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>開始只是導入一個.ffs_batch檔。</target>
-<source>Directories to watch</source>
-<target>要監看的目錄</target>
+<source>Folders to watch</source>
+<target>要監看的資料夾</target>
<source>Add folder</source>
<target>新增資料夾</target>
@@ -285,14 +277,25 @@ The command line is executed each time:
<source>Select a folder</source>
<target>選擇一個資料夾</target>
+<source>Delay [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>Minimum Idle Time [seconds]</source>
-<target>最小閒置時間 [秒]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>在幾秒鐘內檢測上次更改和執行命令列之間的閒置時間</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+假如要觸發該命令:
+- 檔案或子資料夾更改
+- 新資料夾到來(例如插入USB隨身碟)
+</target>
<source>Start</source>
<target>開始</target>
@@ -321,8 +324,8 @@ The command line is executed each time:
<source>Waiting for missing directories...</source>
<target>等待缺少的目錄...</target>
-<source>A directory input field is empty.</source>
-<target>目錄輸入的欄位為空</target>
+<source>An input folder name is empty.</source>
+<target>輸入的資料夾名稱為空。</target>
<source>Logging</source>
<target>日誌記錄</target>
@@ -408,8 +411,8 @@ The command line is executed each time:
<source><Symlink></source>
<target><符號連結></target>
-<source><Directory></source>
-<target><目錄></target>
+<source><Folder></source>
+<target><資料夾></target>
<source>Full path</source>
<target>完整路徑</target>
@@ -420,8 +423,8 @@ The command line is executed each time:
<source>Relative path</source>
<target>相對路徑</target>
-<source>Directory</source>
-<target>目錄</target>
+<source>Base folder</source>
+<target>底層資料夾</target>
<source>Size</source>
<target>大小</target>
@@ -432,8 +435,11 @@ The command line is executed each time:
<source>Extension</source>
<target>擴展</target>
-<source>Comparison Result</source>
-<target>比對結果</target>
+<source>Action</source>
+<target>動作</target>
+
+<source>Category</source>
+<target>分類</target>
<source>Drag && drop</source>
<target>拖放</target>
@@ -441,14 +447,14 @@ The command line is executed each time:
<source>Close progress dialog</source>
<target>關閉進度對話框</target>
-<source>Shut down</source>
-<target>關機</target>
+<source>Standby</source>
+<target>待機</target>
<source>Log off</source>
<target>登出</target>
-<source>Standby</source>
-<target>待機</target>
+<source>Shut down</source>
+<target>關機</target>
<source>Hibernate</source>
<target>休眠</target>
@@ -456,15 +462,12 @@ The command line is executed each time:
<source>1. &Compare</source>
<target>1. 比對(&C)</target>
-<source>2. &Synchronize...</source>
-<target>2. 同步(&S)...</target>
+<source>2. &Synchronize</source>
+<target>2. 同步(&S)</target>
<source>&New</source>
<target>新增專案(&N)</target>
-<source>&Program</source>
-<target>程式(&P)</target>
-
<source>&Language</source>
<target>語言(&L)</target>
@@ -492,8 +495,8 @@ The command line is executed each time:
<source>&Abort</source>
<target>取消(&A)</target>
-<source>Synchronize...</source>
-<target>同步...</target>
+<source>Synchronize</source>
+<target>同步</target>
<source>Start synchronization</source>
<target>開始同步</target>
@@ -507,12 +510,12 @@ The command line is executed each time:
<source>Swap sides</source>
<target>兩邊交換</target>
-<source>Save current configuration to file</source>
-<target>將目前配置儲存到檔案</target>
-
<source>Load configuration from file</source>
<target>從檔案載入配置</target>
+<source>Save current configuration to file</source>
+<target>將目前配置儲存到檔案</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>上次使用的配置(按DEL鍵,從清單中移除)</target>
@@ -522,14 +525,14 @@ The command line is executed each time:
<source>Hide filtered or temporarily excluded files</source>
<target>隱藏篩選或暫時被排除的檔案</target>
-<source>Number of files and directories that will be created</source>
-<target>一些檔案和目錄將被新建</target>
+<source>Number of files and folders that will be created</source>
+<target>將被新建的檔案和資料夾數量</target>
<source>Number of files that will be overwritten</source>
<target>一些檔案和目錄將被覆蓋</target>
-<source>Number of files and directories that will be deleted</source>
-<target>一些檔案和目錄將被刪除</target>
+<source>Number of files and folders that will be deleted</source>
+<target>將被刪除的檔案和資料夾數量</target>
<source>Total amount of data that will be transferred</source>
<target>將被傳輸的總資料量</target>
@@ -552,8 +555,8 @@ The command line is executed each time:
<source>Batch job</source>
<target>批次處理作業</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>新建一個批次檔,並自動執行同步。若要開始批次處理模式只需按兩下此檔或通過命令列執行:FreeFileSync.exe SyncJob.ffs批次處理。還可以安排在您的作業系統的任務計畫中。</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>新建一個批次檔來自動執行同步。按兩下此檔案或安排在您的系統任務計畫表:FreeFileSync.exe <工作名稱>.ffs_batch</target>
<source>Help</source>
<target>說明</target>
@@ -579,18 +582,12 @@ The command line is executed each time:
<source>Maximum number of log files:</source>
<target>日誌檔的最大數目:</target>
-<source>Select log file directory:</source>
-<target>選擇日誌檔目錄:</target>
+<source>Select folder to save log files:</source>
+<target>選擇要儲存日誌檔的資料夾:</target>
<source>Batch settings</source>
<target>批次處理設定</target>
-<source>&Save</source>
-<target>儲存(&S)</target>
-
-<source>&Load</source>
-<target>載入(&L)</target>
-
<source>Select variant:</source>
<target>選擇變數:</target>
@@ -615,29 +612,23 @@ The command line is executed each time:
<source>Configuration</source>
<target>配置</target>
-<source>Category</source>
-<target>分類</target>
+<source>Item exists on left side only</source>
+<target>只存在於左邊的項目</target>
-<source>Action</source>
-<target>動作</target>
-
-<source>File/folder exists on left side only</source>
-<target>只存在於左邊的檔案/資料夾</target>
-
-<source>File/folder exists on right side only</source>
-<target>只存在於右邊的檔案/資料夾</target>
+<source>Item exists on right side only</source>
+<target>只存在於右邊的項目</target>
-<source>Left file is newer</source>
-<target>左邊檔案較新</target>
+<source>Left side is newer</source>
+<target>左邊較新</target>
-<source>Right file is newer</source>
-<target>右邊檔案較新</target>
+<source>Right side is newer</source>
+<target>右邊較新</target>
-<source>Files have different content</source>
-<target>檔案的內容不同</target>
+<source>Items have different content</source>
+<target>項目具有不同內容</target>
-<source>Conflict/file cannot be categorized</source>
-<target>衝突/檔案無法分類</target>
+<source>Conflict/item cannot be categorized</source>
+<target>衝突/項目不能被分類</target>
<source>OK</source>
<target>確定</target>
@@ -735,33 +726,6 @@ Note: File names must be relative to base directories!
注意:檔名必須相對到基本目錄!
</target>
-<source>Hints:</source>
-<target>提示:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. 輸入相對檔案或目錄名稱,使用 ';' 或空行分隔。</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. 使用萬用字元 '*' 和 '?'。</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. 經由內容選單直接在主要網格排除檔案。</target>
-
-<source>Example</source>
-<target>例如</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-包括:*.doc; *.zip; *.exe
-排除:\stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>同步所有 .doc、.zip 和 .exe 檔案,除了 "temp" 子資料夾中的所有檔案。</target>
-
<source>Include</source>
<target>包括</target>
@@ -783,8 +747,8 @@ Exclude: \stuff\temp\*
<source>&Default</source>
<target>預設(&D)</target>
-<source>Transactional file copy</source>
-<target>異動檔案副本</target>
+<source>Fail-safe file copy</source>
+<target>故障保護檔案複製</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>第一次將檔寫入到一個暫存(*.ffs_tmp),順便將它們重新命名。即使在嚴重錯誤的情況下,還可確保一致的狀態。</target>
@@ -798,8 +762,8 @@ Exclude: \stuff\temp\*
<source>Copy file access permissions</source>
<target>複製檔案系統權限</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>傳輸檔案和目錄權限(需要管理員權限)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>傳輸檔案和資料夾權限(需要管理員權限)</target>
<source>Restore hidden dialogs</source>
<target>還原隱藏的對話框</target>
@@ -1103,11 +1067,11 @@ Exclude: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>整合上下文功能表中的外部應用程式。可以使用下面的巨集:</target>
-<source>- full file or directory name</source>
-<target>- 完整的檔名或目錄名稱</target>
+<source>- full file or folder name</source>
+<target>- 完整檔案或資料夾名稱</target>
-<source>- directory part only</source>
-<target>- 只有目錄部份</target>
+<source>- folder part only</source>
+<target>- 只有資料夾一部分</target>
<source>- Other side's counterpart to %name</source>
<target>- 另一邊對應到 %name</target>
@@ -1149,8 +1113,8 @@ Exclude: \stuff\temp\*
<source>Versioning</source>
<target>版本控制</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>移動檔案到一個時間標記的子目錄</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>將檔移動到一個有時間戳記的子資料夾</target>
<source>Files</source>
<target>檔案</target>
@@ -1242,8 +1206,8 @@ Exclude: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>無法讀取目錄 %x。</target>
-<source>Endless loop.</source>
-<target>無限迴圈。</target>
+<source>Detected endless directory recursion.</source>
+<target>檢測到無限目錄遞迴。</target>
<source>Cannot set privilege %x.</source>
<target>無法設定權限 %x。</target>
@@ -1269,14 +1233,11 @@ Exclude: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>設定預設同步方向:舊檔案會被較新的檔案覆蓋。</target>
-<source>The file does not contain a valid configuration:</source>
-<target>該檔案不包含有效的配置:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>您可以忽略此錯誤,考慮該目錄為空。</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>您可以忽略此錯誤,考慮到空的資料夾。</target>
-<source>Cannot find directory %x.</source>
-<target>找不到目錄 %x。</target>
+<source>Cannot find folder %x.</source>
+<target>找不到資料夾 %x。</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>目錄有依靠性!請小心設定同步規則:</target>
@@ -1308,20 +1269,20 @@ Exclude: \stuff\temp\*
<source>Both sides are equal</source>
<target>兩邊都相同</target>
-<source>Files/folders differ in attributes only</source>
-<target>檔案/資料夾僅在於不同的屬性</target>
+<source>Items have different attributes</source>
+<target>項目具有不同屬性</target>
-<source>Copy new file/folder to left</source>
-<target>複製新檔案/資料夾到左邊</target>
+<source>Copy new item to left</source>
+<target>複製新的項目到左邊</target>
-<source>Copy new file/folder to right</source>
-<target>複製新檔案/資料夾到右邊</target>
+<source>Copy new item to right</source>
+<target>複製新的項目到右邊</target>
-<source>Delete left file/folder</source>
-<target>刪除左邊檔案/資料夾</target>
+<source>Delete left item</source>
+<target>刪除左邊項目</target>
-<source>Delete right file/folder</source>
-<target>刪除右邊檔案/資料夾</target>
+<source>Delete right item</source>
+<target>刪除右邊項目</target>
<source>Move file on left</source>
<target>移動左邊的檔案</target>
@@ -1329,20 +1290,20 @@ Exclude: \stuff\temp\*
<source>Move file on right</source>
<target>移動右邊的檔案</target>
-<source>Overwrite left file/folder with right one</source>
-<target>用適合檔案/資料夾覆蓋左邊檔案/資料夾</target>
+<source>Overwrite left item</source>
+<target>覆蓋左邊項目</target>
-<source>Overwrite right file/folder with left one</source>
-<target>用適合檔案/資料夾覆蓋右邊檔案/資料夾</target>
+<source>Overwrite right item</source>
+<target>覆蓋右邊項目</target>
<source>Do nothing</source>
<target>維持原狀</target>
-<source>Copy file attributes only to left</source>
-<target>只複製檔案屬性到左邊</target>
+<source>Update attributes on left</source>
+<target>更新左邊的屬性</target>
-<source>Copy file attributes only to right</source>
-<target>只複製檔案屬性到右邊</target>
+<source>Update attributes on right</source>
+<target>更新右邊的屬性</target>
<source>Multiple...</source>
<target>多個...</target>
@@ -1395,11 +1356,11 @@ Exclude: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>正在更新 %x 個屬性</target>
-<source>Target directory name must not be empty!</source>
-<target>目標目錄名稱不能空白!</target>
+<source>Target folder name must not be empty.</source>
+<target>目的資料夾名稱不能為空。</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>版本控制檔的目錄不提供!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>檔案版本控制資料夾的名稱不能為空。</target>
<source>Source directory %x not found.</source>
<target>來源目錄 %x 找不到。</target>
@@ -1428,8 +1389,8 @@ Exclude: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>資源回收筒不可用於以下路徑!相反的,檔案將永遠被刪除:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>一個目錄將被修改,這是多對資料夾的一部份!請檢閱同步設定!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>一個將被修改的資料夾,是多個資料夾對的一部分。請檢查同步設定。</target>
<source>Processing folder pair:</source>
<target>處理一對資料夾:</target>
diff --git a/BUILD/Languages/croatian.lng b/BUILD/Languages/croatian.lng
index ff56257e..bad3c10d 100644
--- a/BUILD/Languages/croatian.lng
+++ b/BUILD/Languages/croatian.lng
@@ -7,8 +7,8 @@
<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>Searching for directory %x...</source>
-<target>Tražim direktorij %x...</target>
+<source>Searching for folder %x...</source>
+<target>Tražim mapu %x...</target>
<source>Show in Explorer</source>
<target>Prikaži u Exploreru</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSync - Automatska Sinkronizacija</target>
+<source>Error</source>
+<target>Greška</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>No filter selected</source>
-<target>Nijedan filter odabran</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>
@@ -55,9 +58,6 @@
<source>About</source>
<target>O programu</target>
-<source>Error</source>
-<target>Greška</target>
-
<source>Warning</source>
<target>Oprez</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Globalne postavke</target>
-<source>Synchronization Preview</source>
-<target>Pregled sinkronizacije</target>
+<source>Summary</source>
+<target>Pregled</target>
<source>Find</source>
<target>Pronađi</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Odaberi</target>
-<source>Invalid command line: %x</source>
-<target>Netočna naredba: %x</target>
+<source>Invalid command line:</source>
+<target>Netočna naredba:</target>
<source>Info</source>
<target>Info</target>
@@ -229,29 +229,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>Naziv particije %x dio naziva datoteke %y!</target>
-<source>Cannot find file %x.</source>
-<target>Ne mogu pronaći datoteku %x.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Ne mogu čitati slijedeće XML elemente</target>
-<source>S&ave configuration...</source>
-<target>&Spremi postavke...</target>
+<source>Cannot find file %x.</source>
+<target>Ne mogu pronaći datoteku %x.</target>
-<source>&Load configuration...</source>
-<target>&Uvezi postavke...</target>
+<source>&Open...</source>
+<target>&Otvori...</target>
+
+<source>&Save...</source>
+<target>&Spremi...</target>
<source>&Quit</source>
<target>&Izlaz</target>
-<source>&File</source>
-<target>&Datoteka</target>
+<source>&Program</source>
+<target>&Program</target>
<source>&Content</source>
<target>&Sadržaj</target>
-<source>&About...</source>
-<target>&O programu...</target>
+<source>&About</source>
+<target>&O programu</target>
<source>&Help</source>
<target>&Pomoć</target>
@@ -259,8 +259,8 @@
<source>Usage:</source>
<target>Uporaba:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Izaberite mape za nadziranje</target>
+<source>1. Select folders to watch.</source>
+<target>1. Odaberite mape za nadzirati</target>
<source>2. Enter a command line.</source>
<target>2. Unesite naredbu.</target>
@@ -268,18 +268,10 @@
<source>3. Press 'Start'.</source>
<target>3. Pretisnite 'Start'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Naredba će biti izvršena kada:
-- sve mape postanu dostupne (npr. USB stick je umetnut)
-- datoteke unutar tih mapa ili podmapa budu mijenjane
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Za započeti uvezite .ffs slijednu datoteku.</target>
-<source>Directories to watch</source>
+<source>Folders to watch</source>
<target>Mape za nadziranje</target>
<source>Add folder</source>
@@ -291,18 +283,35 @@ Naredba će biti izvršena kada:
<source>Select a folder</source>
<target>Izaberite mapu</target>
+<source>Delay [seconds]</source>
+<target>Odgoditi [sekunda]</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>
+
<source>Command line</source>
<target>Naredbena linija</target>
-<source>Minimum Idle Time [seconds]</source>
-<target>Minimalno vrijeme pripravnosti [sekunde]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Vrijeme pripravnosti između pronalaska zadnje promjene i izvršenja naredbe u sekundama</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Naredba će biti pokrenuta ako se:
+- datoteke ili podmape promijene
+- 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>(Build: %x)</source>
<target>(Inačnica: %x)</target>
@@ -321,8 +330,8 @@ Naredba će biti izvršena kada:
<source>Waiting for missing directories...</source>
<target>Čekam nedostajuće direktorije...</target>
-<source>A directory input field is empty.</source>
-<target>Upisno polje za direktorij je prazno.</target>
+<source>An input folder name is empty.</source>
+<target>Ime ulazne mape je prazno.</target>
<source>Logging</source>
<target>Zapisivanje</target>
@@ -393,12 +402,12 @@ Naredba će biti izvršena kada:
<source>Download now?</source>
<target>Preuzeti sada?</target>
-<source>Information</source>
-<target>Informacija</target>
-
<source>FreeFileSync is up to date!</source>
<target>FreeFileSync je ažuriran!</target>
+<source>Information</source>
+<target>Informacija</target>
+
<source>Do you want FreeFileSync to automatically check for updates every week?</source>
<target>Dali želite da FreeFileSync automatski traži ažuriranja svaki tjedan?</target>
@@ -408,8 +417,8 @@ Naredba će biti izvršena kada:
<source><Symlink></source>
<target><Poveznica simbola></target>
-<source><Directory></source>
-<target><Direktorij></target>
+<source><Folder></source>
+<target><Mapa></target>
<source>Full path</source>
<target>Puna putanja</target>
@@ -420,8 +429,8 @@ Naredba će biti izvršena kada:
<source>Relative path</source>
<target>Relativna Putanja</target>
-<source>Directory</source>
-<target>Direktorij</target>
+<source>Base folder</source>
+<target>Izvorna mapa</target>
<source>Size</source>
<target>Veličina</target>
@@ -432,8 +441,11 @@ Naredba će biti izvršena kada:
<source>Extension</source>
<target>Ekstenzija</target>
-<source>Comparison Result</source>
-<target>Rezultati usporedbe</target>
+<source>Action</source>
+<target>Radnja</target>
+
+<source>Category</source>
+<target>Kategorija</target>
<source>Drag && drop</source>
<target>Povuci && ispusti</target>
@@ -441,14 +453,14 @@ Naredba će biti izvršena kada:
<source>Close progress dialog</source>
<target>Zatvori prozor zadatka</target>
-<source>Shut down</source>
-<target>Isključi računalo</target>
+<source>Standby</source>
+<target>Spavaj</target>
<source>Log off</source>
<target>Odlogiraj se</target>
-<source>Standby</source>
-<target>Spavaj</target>
+<source>Shut down</source>
+<target>Isključi računalo</target>
<source>Hibernate</source>
<target>Hibernacija</target>
@@ -456,15 +468,12 @@ Naredba će biti izvršena kada:
<source>1. &Compare</source>
<target>1. &Usporedi</target>
-<source>2. &Synchronize...</source>
-<target>2. &Sinkroniziraj...</target>
+<source>2. &Synchronize</source>
+<target>2. &Sinkroniziraj</target>
<source>&New</source>
<target>&Novo</target>
-<source>&Program</source>
-<target>&Program</target>
-
<source>&Language</source>
<target>&Jezik</target>
@@ -492,8 +501,8 @@ Naredba će biti izvršena kada:
<source>&Abort</source>
<target>&Odustani</target>
-<source>Synchronize...</source>
-<target>Sinkroniziraj...</target>
+<source>Synchronize</source>
+<target>Sinkroniziraj</target>
<source>Start synchronization</source>
<target>Započni sinkronizaciju</target>
@@ -507,12 +516,12 @@ Naredba će biti izvršena kada:
<source>Swap sides</source>
<target>Zamjeni strane</target>
-<source>Save current configuration to file</source>
-<target>Spremi sadašnje postavke u datoteku</target>
-
<source>Load configuration from file</source>
<target>Uvezi postavke iz datoteke</target>
+<source>Save current configuration to file</source>
+<target>Spremi sadašnje postavke u datoteku</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Zadnje korištene postavke (pretisite DEL za ukloniti s liste)</target>
@@ -522,14 +531,14 @@ Naredba će biti izvršena kada:
<source>Hide filtered or temporarily excluded files</source>
<target>Sakrij filtrirane ili trenutno isključene datoteke</target>
-<source>Number of files and directories that will be created</source>
-<target>Broj datoteka i direktorija koji će biti napravljeni</target>
+<source>Number of files and folders that will be created</source>
+<target>Broj datoteka i foldera koji će se stvoriti</target>
<source>Number of files that will be overwritten</source>
<target>Broj datoteka koje će biti prepisane</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Broj datoteka i direktorija koji će biti izbrisani</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Broj datoteka i mapa koje će se izbrisati</target>
<source>Total amount of data that will be transferred</source>
<target>Ukupna količina podataka koja će biti prebečana</target>
@@ -552,8 +561,8 @@ Naredba će biti izvršena kada:
<source>Batch job</source>
<target>Slijedni zadatak</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Izradi slijednu datoteku i automatiziraj sinkronizaciju. Za započeti u slijednom modu dvostruki klik na ovu datoteku ili pokrenuti naredbu: FreeFileSync.exe SyncJob.ffs_batch. Ovo također može biti zadano u vašem sistemskom planeru zadataka</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Izradite slijednu datoteku za automatizirati sinkronizaciju. Dvostruki klik na ovu datoteku ili dodajte obvezu u vašem sistemskom planeru: FreeFileSync.exe <naziv zadatka>.ffs_batch</target>
<source>Help</source>
<target>Pomoć</target>
@@ -579,21 +588,12 @@ Naredba će biti izvršena kada:
<source>Maximum number of log files:</source>
<target>Maksimalan broj izvješća:</target>
-<source>Select log file directory:</source>
-<target>Odaberite direktorij izvješća:</target>
+<source>Select folder to save log files:</source>
+<target>Odabrati mapu za spremanje izvješća</target>
<source>Batch settings</source>
<target>Slijedne postavke</target>
-<source>&Save</source>
-<target>&Spremi</target>
-
-<source>&Load</source>
-<target>&Uvezi</target>
-
-<source>Cancel</source>
-<target>Odustani</target>
-
<source>Select variant:</source>
<target>Izaberite varijantu:</target>
@@ -618,29 +618,23 @@ Naredba će biti izvršena kada:
<source>Configuration</source>
<target>Postavke</target>
-<source>Category</source>
-<target>Kategorija</target>
-
-<source>Action</source>
-<target>Radnja</target>
-
-<source>File/folder exists on left side only</source>
-<target>Datoteka/mapa postoji samo na lijevoj strani</target>
+<source>Item exists on left side only</source>
+<target>Stavka postoji samo na lijevoj strani</target>
-<source>File/folder exists on right side only</source>
-<target>Datoteka/mapa postoji samo na desnoj strani</target>
+<source>Item exists on right side only</source>
+<target>Stavka postoji samo na desnoj strani</target>
-<source>Left file is newer</source>
-<target>Lijeva datoteka je novija</target>
+<source>Left side is newer</source>
+<target>Lijeva strana je novija</target>
-<source>Right file is newer</source>
-<target>Desna datoteka je novija</target>
+<source>Right side is newer</source>
+<target>Desna strana je novija</target>
-<source>Files have different content</source>
-<target>Datoteke imaju različit sadržaj</target>
+<source>Items have different content</source>
+<target>Stavke imaju različit sadržaj</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Konflikt/datoteka ne more biti kategorizirana</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Sukob/stavka ne može biti razvrstana</target>
<source>OK</source>
<target>U redu</target>
@@ -717,9 +711,6 @@ jednak
<source>&Ignore</source>
<target>&Ignoriraj</target>
-<source>&Retry</source>
-<target>&Ponovi</target>
-
<source>Do not show this dialog again</source>
<target>Ne prikazuj ovaj prozor ponovno</target>
@@ -750,33 +741,6 @@ Samo datoteke koje odgovaraju svim filterskim postavkama će biti sinkronizirane
Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
</target>
-<source>Hints:</source>
-<target>Savjeti:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Unesite relativno ime datoteke ili naziva direktorija odvojeno ';' ili novim redom.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Uporabite znakove poput '*' ili '?'.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Isključite datoteke neposredno na glavnoj mreži s kontekstnog menija.</target>
-
-<source>Example</source>
-<target>Primjer</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Uključi: *.doc;*.zip;*.exe
-Isključi: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Sinkroniziraj sve .doc, .zip i .exe datoteke, izuzev svega iz podmape "temp".</target>
-
<source>Include</source>
<target>Uključi</target>
@@ -798,8 +762,8 @@ Isključi: \stuff\temp\*
<source>&Default</source>
<target>&Zadano</target>
-<source>Transactional file copy</source>
-<target>Transakcijsko kopiranje datoteke</target>
+<source>Fail-safe file copy</source>
+<target>Kopiranje zaštićeno od grešaka</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Zapiši u privremenu datoteku (*.ffs_tmp) najprije a onda ju preimenuj. Ovo garantira nepromjenjivost čak u slučaju kritične greške.</target>
@@ -813,8 +777,8 @@ Isključi: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Kopiraj datotečna dopuštenja</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Prebaci datotečna dopuštenja (Zahtjeva Administratorske ovlasti)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Premjesti datotečna dopuštenja (Zahtjeva Administratorska prava)</target>
<source>Restore hidden dialogs</source>
<target>Prikaži skrivene prozore</target>
@@ -1126,11 +1090,11 @@ Isključi: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Integriraj vanjske aplikacije u kontekstni meni. Sljedeći makroi su dostupni:</target>
-<source>- full file or directory name</source>
-<target>- puno ime datoteke ili direktorija</target>
+<source>- full file or folder name</source>
+<target>- cijelo ime datoteke ili mape</target>
-<source>- directory part only</source>
-<target>- samo dio direktorija</target>
+<source>- folder part only</source>
+<target>- samo mapa</target>
<source>- Other side's counterpart to %name</source>
<target>- Duplikat s druge strane k %name</target>
@@ -1176,8 +1140,8 @@ Isključi: \stuff\temp\*
<source>Versioning</source>
<target>Verzija</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Premjesti datoteke u vremenski-označen podfolder</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Prebaci datoteke u vremenski-blokirani podfolder</target>
<source>Files</source>
<target>Datoteke</target>
@@ -1275,8 +1239,8 @@ Isključi: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>Ne mogu čitati mapu %x.</target>
-<source>Endless loop.</source>
-<target>Beskrajna petlja</target>
+<source>Detected endless directory recursion.</source>
+<target>Detektiran bezograničeni direktorij</target>
<source>Cannot set privilege %x.</source>
<target>Ne mogu postaviti prava za %x.</target>
@@ -1302,13 +1266,10 @@ Isključi: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Postavljam zadani sinkronizacijski smijer: Stare datoteke će biti prepisane novim datotekama.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Datoteka ne sadrži ispravne postavke:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Možete ignorirati ovu grešku uzimajući datoteku kao praznu .</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Možete ignorirati ovu pogrešku i smatrati mapu praznom</target>
-<source>Cannot find directory %x.</source>
+<source>Cannot find folder %x.</source>
<target>Ne mogu pronaći mapu %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
@@ -1341,20 +1302,20 @@ Isključi: \stuff\temp\*
<source>Both sides are equal</source>
<target>Obje strane su jednake</target>
-<source>Files/folders differ in attributes only</source>
-<target>Datoteke/mape se razlikuju samo u atributima</target>
+<source>Items have different attributes</source>
+<target>Stavke imaju različite atribute</target>
-<source>Copy new file/folder to left</source>
-<target>Kopiraj novu datoteku/mapu na lijevo</target>
+<source>Copy new item to left</source>
+<target>Kopiraj novu stavku lijevo</target>
-<source>Copy new file/folder to right</source>
-<target>Kopiraj novu datoteku/mapu na desno</target>
+<source>Copy new item to right</source>
+<target>Kopiraj novu stavku desno</target>
-<source>Delete left file/folder</source>
-<target>Izbriši lijevu datoteku/mapu</target>
+<source>Delete left item</source>
+<target>Izbriši lijevu stavku</target>
-<source>Delete right file/folder</source>
-<target>Izbriši desnu datoteku/mapu</target>
+<source>Delete right item</source>
+<target>Izbriši desnu stavku</target>
<source>Move file on left</source>
<target>Premjesti datoteku lijevo</target>
@@ -1362,20 +1323,20 @@ Isključi: \stuff\temp\*
<source>Move file on right</source>
<target>Premjest datoteku desno</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Prepiši lijevu datoteku/mapu s onom sa desne strane</target>
+<source>Overwrite left item</source>
+<target>Prepiši lijevu stavku</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Prepiši desnu datoteku/mapu s onom sa lijeve strane</target>
+<source>Overwrite right item</source>
+<target>Prepiši desnu stavku</target>
<source>Do nothing</source>
<target>Ne radi ništa</target>
-<source>Copy file attributes only to left</source>
-<target>Kopiraj atribute datoteke samo na levo</target>
+<source>Update attributes on left</source>
+<target>Osvježi atribute lijevo</target>
-<source>Copy file attributes only to right</source>
-<target>Kopiraj atribute datoteke samo na desno</target>
+<source>Update attributes on right</source>
+<target>Osvježi atribute desno</target>
<source>Multiple...</source>
<target>Mnogostruko...</target>
@@ -1428,11 +1389,11 @@ Isključi: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Obnavljam atribute od %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Ime ciljnog direktorija ne smije biti prazno!</target>
+<source>Target folder name must not be empty.</source>
+<target>Naziv odredišne mape ne može biti prazan.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Mapa za ovakvu datoteku nije isporučena</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Naziv mape za datotečni raspored ne može biti prazan</target>
<source>Source directory %x not found.</source>
<target>Izvorna mapa %x nije pronađena</target>
@@ -1461,8 +1422,8 @@ Isključi: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Koš za smeće nije dostupan za navedene putanje! Umjesto toga datoteke će biti trajno izbrisane:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Direktorij će biti mjenjan koji je dio više parova mapa! Molimo pogledajte postavke sinkronizacije!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Mapa će biti uređena koja je dio više pari mapa. Molimo provjerite sinkronizacijske postavke.</target>
<source>Processing folder pair:</source>
<target>Obrađujem parove mapa:</target>
diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng
index 3230b30b..bfc42fc0 100644
--- a/BUILD/Languages/czech.lng
+++ b/BUILD/Languages/czech.lng
@@ -7,8 +7,8 @@
<plural definition>n==1 ? 0 : n>=2 && n<=4 ? 1 : 2</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Otevírání adresáře %x</target>
+<source>Searching for folder %x...</source>
+<target>Otevírání složky %x</target>
<source>Show in Explorer</source>
<target>Zobrazit v Průzkumníkovi</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSync - Automatická synchronizace</target>
+<source>Error</source>
+<target>Chyba</target>
+
<source>Select alternate comparison settings</source>
<target>Změnit nastavení porovnání</target>
<source>Select alternate synchronization settings</source>
<target>Změnit nastavení synchronizace</target>
-<source>No filter selected</source>
-<target>Není vybrán žádný filtr</target>
-
<source>Filter is active</source>
<target>Filtr je zapnutý</target>
+<source>No filter selected</source>
+<target>Není vybrán žádný filtr</target>
+
<source>Remove alternate settings</source>
<target>Zrušit jiné nastavení</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>O Programu</target>
-<source>Error</source>
-<target>Chyba</target>
-
<source>Warning</source>
<target>Varování</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Nastavení programu</target>
-<source>Synchronization Preview</source>
-<target>Náhled synchronizace</target>
+<source>Summary</source>
+<target>Přehled</target>
<source>Find</source>
<target>Najít</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Procházet</target>
-<source>Invalid command line: %x</source>
-<target>Neplatný příkaz: %x</target>
+<source>Invalid command line:</source>
+<target>Neplatný příkaz:</target>
<source>Info</source>
<target>Info</target>
@@ -235,23 +235,23 @@
<source>Cannot read the following XML elements:</source>
<target>Nelze načíst následující XML elementy:</target>
-<source>S&ave configuration...</source>
-<target>&Uložení konfigurace...</target>
+<source>&Open...</source>
+<target>&Otevřít...</target>
-<source>&Load configuration...</source>
-<target>&Načíst konfiguraci...</target>
+<source>&Save...</source>
+<target>&Uložit</target>
<source>&Quit</source>
<target>U&končit</target>
-<source>&File</source>
-<target>&Soubor</target>
+<source>&Program</source>
+<target>&Nástroje</target>
<source>&Content</source>
<target>&Obsah</target>
-<source>&About...</source>
-<target>&O Programu...</target>
+<source>&About</source>
+<target>O &Programu</target>
<source>&Help</source>
<target>&Pomoc</target>
@@ -259,8 +259,8 @@
<source>Usage:</source>
<target>Použití:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Vyberte adresáře pro sledování.</target>
+<source>1. Select folders to watch.</source>
+<target>1. Vyberte složku ke sledování.</target>
<source>2. Enter a command line.</source>
<target>2. Zadejte příkazovou řádku.</target>
@@ -268,19 +268,11 @@
<source>3. Press 'Start'.</source>
<target>3. Zmáčkněte 'Start'</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Příkazová řádka je spuštěna pokaždé když:
-- jsou k dispozici všechny adresáře (např. vložením USB disku)
-- dojde ke změně souborů v adresáři nebo podadresářích
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Můžete načíst také konfigurační soubor soubor .ffs_batch</target>
-<source>Directories to watch</source>
-<target>Sledované adresáře</target>
+<source>Folders to watch</source>
+<target>Složka ke sledování</target>
<source>Add folder</source>
<target>Přidat adresář</target>
@@ -291,18 +283,35 @@ Příkazová řádka je spuštěna pokaždé když:
<source>Select a folder</source>
<target>Vyberte adresář</target>
+<source>Delay [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>Minimum Idle Time [seconds]</source>
-<target>Minimální čas prodlevy [v sekundách]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Prodleva mezi detekcí poslední změny a spuštěním příkazu (v sekundách)</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Příkaz je spuštěn když:
+- dojde ke změně v souboru nebo ve složce
+- je zjištěna nová složka (např. vložením USB disku)
+</target>
<source>Start</source>
<target>Start</target>
+<source>&Retry</source>
+<target>&Opakovat</target>
+
+<source>Cancel</source>
+<target>Zrušit</target>
+
<source>(Build: %x)</source>
<target>(Build: %x)</target>
@@ -321,8 +330,8 @@ Příkazová řádka je spuštěna pokaždé když:
<source>Waiting for missing directories...</source>
<target>Čekání na nedostupné adresáře...</target>
-<source>A directory input field is empty.</source>
-<target>Není zadán vstupní adresář.</target>
+<source>An input folder name is empty.</source>
+<target>Není zadána vstupní složka.</target>
<source>Logging</source>
<target>Záznam zpracování</target>
@@ -408,8 +417,8 @@ Příkazová řádka je spuštěna pokaždé když:
<source><Symlink></source>
<target><Symlink></target>
-<source><Directory></source>
-<target><Adresář></target>
+<source><Folder></source>
+<target><Složka></target>
<source>Full path</source>
<target>Plná cesta</target>
@@ -420,8 +429,8 @@ Příkazová řádka je spuštěna pokaždé když:
<source>Relative path</source>
<target>Relativní cesta</target>
-<source>Directory</source>
-<target>Adresář</target>
+<source>Base folder</source>
+<target>Složka</target>
<source>Size</source>
<target>Velikost</target>
@@ -432,23 +441,26 @@ Příkazová řádka je spuštěna pokaždé když:
<source>Extension</source>
<target>Přípona</target>
-<source>Comparison Result</source>
-<target>Výsledek porovnání</target>
+<source>Action</source>
+<target>Akce</target>
+
+<source>Category</source>
+<target>Kategorie</target>
<source>Drag && drop</source>
-<target>Drag && Drop</target>
+<target>Přetáhni sem && pusť</target>
<source>Close progress dialog</source>
<target>Zavřít průběh zpracování</target>
-<source>Shut down</source>
-<target>Vypnout počítač</target>
+<source>Standby</source>
+<target>Přepnout do úsporného režimu</target>
<source>Log off</source>
<target>Odhlásit uživatele</target>
-<source>Standby</source>
-<target>Přepnout do úsporného režimu</target>
+<source>Shut down</source>
+<target>Vypnout počítač</target>
<source>Hibernate</source>
<target>Přepnout do režimu spánku</target>
@@ -456,15 +468,12 @@ Příkazová řádka je spuštěna pokaždé když:
<source>1. &Compare</source>
<target>1. &Porovnat</target>
-<source>2. &Synchronize...</source>
-<target>2. &Synchronizovat...</target>
+<source>2. &Synchronize</source>
+<target>2. &Synchronizovat</target>
<source>&New</source>
<target>&Nový</target>
-<source>&Program</source>
-<target>&Nástroje</target>
-
<source>&Language</source>
<target>&Jazyk</target>
@@ -492,7 +501,7 @@ Příkazová řádka je spuštěna pokaždé když:
<source>&Abort</source>
<target>&Ukončit</target>
-<source>Synchronize...</source>
+<source>Synchronize</source>
<target>Synchronizace</target>
<source>Start synchronization</source>
@@ -507,12 +516,12 @@ Příkazová řádka je spuštěna pokaždé když:
<source>Swap sides</source>
<target>Změna stran</target>
-<source>Save current configuration to file</source>
-<target>Uložit změny do konfiguračního souboru</target>
-
<source>Load configuration from file</source>
<target>Načíst konfiguraci ze souboru</target>
+<source>Save current configuration to file</source>
+<target>Uložit změny do konfiguračního souboru</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Posledně použité konfigurace (pomocí DEL můžete položku smazat)</target>
@@ -522,14 +531,14 @@ Příkazová řádka je spuštěna pokaždé když:
<source>Hide filtered or temporarily excluded files</source>
<target>Skrýt filtrované nebo dočasně vynechané soubory</target>
-<source>Number of files and directories that will be created</source>
-<target>Počet souborů a adresářů k vytvoření</target>
+<source>Number of files and folders that will be created</source>
+<target>Počet souborů a složek k vytvoření</target>
<source>Number of files that will be overwritten</source>
<target>Počet souborů a adresářů k přepsání</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Počet souborů a adresářů ke smazání</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Počet souborů a složek ke smazání</target>
<source>Total amount of data that will be transferred</source>
<target>Celkový objem dat, který bude přenesen</target>
@@ -552,8 +561,8 @@ Příkazová řádka je spuštěna pokaždé když:
<source>Batch job</source>
<target>Dávkový soubor</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Vytvoří dávkový souboru pro automatický provoz. Ke spuštění dávky jednoduše poklikejte na vytvořený soubor nebo jeho jméno zadejte jako parametr při spuštění FreeFileSync: FreeFileSync.exe <jméno_souboru>. Stejně tak můžete ke spuštění využít plánovač úloh vašeho operačního systému.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Vytvoří dávkový souboru pro automatickou synchronizaci. Ke spuštění dávky jednoduše poklikejte na vytvořený soubor nebo jeho jméno zadejte jako parametr při spuštění FreeFileSync: FreeFileSync.exe <jméno_souboru>. Stejně tak můžete ke spuštění využít plánovač úloh vašeho operačního systému.</target>
<source>Help</source>
<target>Nápověda</target>
@@ -579,21 +588,12 @@ Příkazová řádka je spuštěna pokaždé když:
<source>Maximum number of log files:</source>
<target>Maximální počet záznamových souborů:</target>
-<source>Select log file directory:</source>
-<target>Vyberte adresář pro záznamové soubory:</target>
+<source>Select folder to save log files:</source>
+<target>Vyberte složku pro záznamové soubory:</target>
<source>Batch settings</source>
<target>Nastavení</target>
-<source>&Save</source>
-<target>&Uložit</target>
-
-<source>&Load</source>
-<target>&Načíst</target>
-
-<source>Cancel</source>
-<target>Zrušit</target>
-
<source>Select variant:</source>
<target>Vyberte variantu:</target>
@@ -618,29 +618,23 @@ Příkazová řádka je spuštěna pokaždé když:
<source>Configuration</source>
<target>Konfigurace</target>
-<source>Category</source>
-<target>Kategorie</target>
-
-<source>Action</source>
-<target>Akce</target>
-
-<source>File/folder exists on left side only</source>
-<target>Soubory/adresáře, které existují pouze vlevo</target>
+<source>Item exists on left side only</source>
+<target>Položky existující pouze vlevo</target>
-<source>File/folder exists on right side only</source>
-<target>Soubory/adresáře, které existují pouze vpravo</target>
+<source>Item exists on right side only</source>
+<target>Položky existující pouze vpravo</target>
-<source>Left file is newer</source>
-<target>Levý soubor je novější</target>
+<source>Left side is newer</source>
+<target>Vlevo je novější</target>
-<source>Right file is newer</source>
-<target>Pravý soubor je novější</target>
+<source>Right side is newer</source>
+<target>Vpravo je novější</target>
-<source>Files have different content</source>
-<target>Soubory, které mají rozdílný obsah</target>
+<source>Items have different content</source>
+<target>Obsah položek je rozdílný</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Konflikty/soubory které nelze zařadit</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Konflikty/položky které nelze zařadit</target>
<source>OK</source>
<target>OK</target>
@@ -717,9 +711,6 @@ je stejný
<source>&Ignore</source>
<target>&Pokračovat</target>
-<source>&Retry</source>
-<target>&Opakovat</target>
-
<source>Do not show this dialog again</source>
<target>Tento dialog již nezobrazovat</target>
@@ -750,33 +741,6 @@ Pouze soubory odpovídající nastavenému filtru budou vybrány pro synchroniza
Poznámka: Filtr je aplikován relativně k základním adresářům.
</target>
-<source>Hints:</source>
-<target>Nápověda:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Můžete použít relativní cesty k souboru nebo adresáři oddělené ';' nebo řádkem.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Můžete použít zástupné znaky (wildcard) '*' a '?'.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Můžete použít pro vynechávání souborů přímo kontextového menu.</target>
-
-<source>Example</source>
-<target>Příklad</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Přidat: *.doc;*.zip;*.exe
-Vynechat: \někde\něco\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Synchronizovat všechny soubory .doc, .zip a .exe s výjimkou všeho v podadresáři "někde\něco"</target>
-
<source>Include</source>
<target>Přidat</target>
@@ -798,7 +762,7 @@ Vynechat: \někde\něco\*
<source>&Default</source>
<target>&Předdefinované</target>
-<source>Transactional file copy</source>
+<source>Fail-safe file copy</source>
<target>Bezpečné kopírování souborů</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
@@ -813,8 +777,8 @@ Vynechat: \někde\něco\*
<source>Copy file access permissions</source>
<target>Kopírovat přístupová oprávnění k souborům</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Přenést přístupová oprávnění souborů a adresářů (Vyžaduje administrátorké oprávnění)</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átorké oprávnění)</target>
<source>Restore hidden dialogs</source>
<target>Obnovit skryté dialogy</target>
@@ -1126,10 +1090,10 @@ Vynechat: \někde\něco\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Integrace externí aplikace do kontextového menu. K dispozici jsou následující makra:</target>
-<source>- full file or directory name</source>
+<source>- full file or folder name</source>
<target>- celá cesta nebo jméno souboru</target>
-<source>- directory part only</source>
+<source>- folder part only</source>
<target>- pouze cesta</target>
<source>- Other side's counterpart to %name</source>
@@ -1176,8 +1140,8 @@ Vynechat: \někde\něco\*
<source>Versioning</source>
<target>Verzování</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Přesunout soubory do časově označeného podadresáře</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Přesunout soubory do časově označené podsložky</target>
<source>Files</source>
<target>Soubory</target>
@@ -1275,8 +1239,8 @@ Vynechat: \někde\něco\*
<source>Cannot read directory %x.</source>
<target>Nelze číst adresář %x.</target>
-<source>Endless loop.</source>
-<target>Nekonečná smyčka.</target>
+<source>Detected endless directory recursion.</source>
+<target>Nalezena nekonečná adresářová smyčka.</target>
<source>Cannot set privilege %x.</source>
<target>Nelze nastavit práva pro %x.</target>
@@ -1302,14 +1266,11 @@ Vynechat: \někde\něco\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Nastaven výchozí způsob synchronizace: Staré soubory budou nahrazeny novými.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Soubor neobsahuje platnou konfiguraci:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Tuto chybu můžete přeskočit a považovat neexistující adresář jako prázdný.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Tuto chybu můžete přeskočit a považovat neexistující složku jako prázdnou.</target>
-<source>Cannot find directory %x.</source>
-<target>Nelze najít adresář %x.</target>
+<source>Cannot find folder %x.</source>
+<target>>Nelze najít složku %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>Adresáře jsou závislé! Buďte opatrní s definicí synchronizačních pravidel:</target>
@@ -1341,20 +1302,20 @@ Vynechat: \někde\něco\*
<source>Both sides are equal</source>
<target>Obě strany jsou shodné</target>
-<source>Files/folders differ in attributes only</source>
-<target>Soubory/adresáře se liší pouze ve vlastnostech</target>
+<source>Items have different attributes</source>
+<target>Položky se liší ve vlastnostech</target>
-<source>Copy new file/folder to left</source>
-<target>Kopírovat nový soubor/adresář do leva</target>
+<source>Copy new item to left</source>
+<target>Kopírovat novou položku do leva</target>
-<source>Copy new file/folder to right</source>
-<target>Kopírovat nový soubor/adresář do prava</target>
+<source>Copy new item to right</source>
+<target>Kopírovat novou položku do prava</target>
-<source>Delete left file/folder</source>
-<target>Smazat soubor/adresář z leva</target>
+<source>Delete left item</source>
+<target>Smazat položku z leva</target>
-<source>Delete right file/folder</source>
-<target>Smazat soubor/adresáře z prava</target>
+<source>Delete right item</source>
+<target>Smazat položku z prava</target>
<source>Move file on left</source>
<target>Přesunout soubor nalevo</target>
@@ -1362,20 +1323,20 @@ Vynechat: \někde\něco\*
<source>Move file on right</source>
<target>Přesunout soubor napravo</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Přepsat levý soubor/adresář tím z prava</target>
+<source>Overwrite left item</source>
+<target>Přepsat levou položku tou z prava</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Přepsat pravý soubor/adresář tím z leva</target>
+<source>Overwrite right item</source>
+<target>Přepsat pravou položku tou z leva</target>
<source>Do nothing</source>
<target>Nic nedělat</target>
-<source>Copy file attributes only to left</source>
-<target>Kopírovat vlastnosti souboru pouze do leva</target>
+<source>Update attributes on left</source>
+<target>Nastavit vlastnosti v levo</target>
-<source>Copy file attributes only to right</source>
-<target>Kopírovat vlastnosti souboru pouze do prava</target>
+<source>Update attributes on right</source>
+<target>Nastavit vlastnoti v pravo</target>
<source>Multiple...</source>
<target>Různé...</target>
@@ -1428,11 +1389,11 @@ Vynechat: \někde\něco\*
<source>Updating attributes of %x</source>
<target>Aktualizace atributů souboru %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Není zadán cílový adresář!</target>
+<source>Target folder name must not be empty.</source>
+<target>Cílová složka nesmí být prázdná.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Nebyl zadán adresář pro verzování souborů!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Složka pro verzování souborů nesmí být prázdná.</target>
<source>Source directory %x not found.</source>
<target>Zdrojový adresář %x nelze najít.</target>
@@ -1461,8 +1422,8 @@ Vynechat: \někde\něco\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Nelze použít Koš pro následující umístění! Soubory budou odstraněny trvale:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Bude změně adresář, který je součástí adresářového páru vícenásobného porovnání! Prosím zkontrolujte si nastavení synchronizace!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Bude změněna složka, která je součástí adresářového páru vícenásobného porovnání. Prosím zkontrolujte si nastavení synchronizacem.</target>
<source>Processing folder pair:</source>
<target>Zpracovávání adresářové páru:</target>
diff --git a/BUILD/Languages/danish.lng b/BUILD/Languages/danish.lng
index d524b0bd..4c9c2cac 100644
--- a/BUILD/Languages/danish.lng
+++ b/BUILD/Languages/danish.lng
@@ -7,8 +7,8 @@
<plural definition>n == 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Søger efter bibliotek %x...</target>
+<source>Searching for folder %x...</source>
+<target>Søger efter mappen %x...</target>
<source>Show in Explorer</source>
<target>Vis i Explorer</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSynk - Automatisk Synkronisering</target>
+<source>Error</source>
+<target>Fejl</target>
+
<source>Select alternate comparison settings</source>
<target>Vælg alternative sammenlignings indstillinger</target>
<source>Select alternate synchronization settings</source>
<target>Vælg alternative indstillinger</target>
-<source>No filter selected</source>
-<target>Intet filter valgt</target>
-
<source>Filter is active</source>
<target>Filter er aktivt</target>
+<source>No filter selected</source>
+<target>Intet filter valgt</target>
+
<source>Remove alternate settings</source>
<target>Fjern alternative indstillinger</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>Om</target>
-<source>Error</source>
-<target>Fejl</target>
-
<source>Warning</source>
<target>Advarsel</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Fælles indstillinger</target>
-<source>Synchronization Preview</source>
-<target>Vis Synkronisering</target>
+<source>Summary</source>
+<target>Opsummering</target>
<source>Find</source>
<target>Find</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Gennemse</target>
-<source>Invalid command line: %x</source>
-<target>Ugyldig kommando: %x</target>
+<source>Invalid command line:</source>
+<target>Ugyldig kommando:</target>
<source>Info</source>
<target>Info</target>
@@ -226,29 +226,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>Drev navn %x ikke en del af filnavn %y!</target>
-<source>Cannot find file %x.</source>
-<target>Kan ikke finde filen %x.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Kan ikke læse følgende XML emner:</target>
-<source>S&ave configuration...</source>
-<target>G&em konfiguration...</target>
+<source>Cannot find file %x.</source>
+<target>Kan ikke finde filen %x.</target>
-<source>&Load configuration...</source>
-<target>&Hent konfiguration...</target>
+<source>&Open...</source>
+<target>&Åben...</target>
+
+<source>&Save...</source>
+<target>&Gem...</target>
<source>&Quit</source>
<target>&Afslut</target>
-<source>&File</source>
-<target>&Fil</target>
+<source>&Program</source>
+<target>&Program</target>
<source>&Content</source>
<target>&Indhold</target>
-<source>&About...</source>
-<target>&Om...</target>
+<source>&About</source>
+<target>&Om</target>
<source>&Help</source>
<target>&Hjælp</target>
@@ -256,8 +256,8 @@
<source>Usage:</source>
<target>Forbrug:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Vælg biblioteker at holde øje med.</target>
+<source>1. Select folders to watch.</source>
+<target>1. Vælg mappe at overvåge.</target>
<source>2. Enter a command line.</source>
<target>2. Skriv en kommando linje.</target>
@@ -265,19 +265,11 @@
<source>3. Press 'Start'.</source>
<target>3. Tryk 'Start'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Kommando linjen bliver afviklet hver gang:
-- Alle biblioteker bliver tilgængelige (eks. USB stick sættes i)
-- Filer i disse biblioteker eller underbiblioteker bliver ændret
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Importer en .ffs_batch for at komme igang.</target>
-<source>Directories to watch</source>
-<target>Biblioteker at overvåge</target>
+<source>Folders to watch</source>
+<target>Mapper der overvåges</target>
<source>Add folder</source>
<target>Tilføj mappe</target>
@@ -288,18 +280,35 @@ Kommando linjen bliver afviklet hver gang:
<source>Select a folder</source>
<target>Vælg en mappe</target>
+<source>Delay [seconds]</source>
+<target>Forsinkelse [sekunder]</target>
+
+<source>Idle time between last detected change and execution of command</source>
+<target>Tid imellem sidste ændring og udførelse</target>
+
<source>Command line</source>
<target>Kommando linje</target>
-<source>Minimum Idle Time [seconds]</source>
-<target>Minimum pausetid [sekunder]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Tid imellem sidste ændring og afvikling af kommando linjen i sekunder</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Kommandoen udføres hvis:
+- filer eller undermapper ændres
+- nye mapper ankommer (Hvis en USB nøgle sættes til)
+</target>
<source>Start</source>
<target>Start</target>
+<source>&Retry</source>
+<target>&Prøv igen</target>
+
+<source>Cancel</source>
+<target>Anuller</target>
+
<source>(Build: %x)</source>
<target>(Build: %x)</target>
@@ -318,8 +327,8 @@ Kommando linjen bliver afviklet hver gang:
<source>Waiting for missing directories...</source>
<target>Venter på manglende biblioteker...</target>
-<source>A directory input field is empty.</source>
-<target>Et biblioteks felt er tomt.</target>
+<source>An input folder name is empty.</source>
+<target>Et mappe navn er blankt.</target>
<source>Logging</source>
<target>Logger</target>
@@ -405,8 +414,8 @@ Kommando linjen bliver afviklet hver gang:
<source><Symlink></source>
<target><Symlink></target>
-<source><Directory></source>
-<target><Directory></target>
+<source><Folder></source>
+<target><Mappe></target>
<source>Full path</source>
<target>Fuld Sti</target>
@@ -417,8 +426,8 @@ Kommando linjen bliver afviklet hver gang:
<source>Relative path</source>
<target>Filsti</target>
-<source>Directory</source>
-<target>Bibliotek</target>
+<source>Base folder</source>
+<target>Grund mappe</target>
<source>Size</source>
<target>Størrelse</target>
@@ -429,8 +438,11 @@ Kommando linjen bliver afviklet hver gang:
<source>Extension</source>
<target>Udvidelse</target>
-<source>Comparison Result</source>
-<target>Sammenlignings Resultat</target>
+<source>Action</source>
+<target>Handling</target>
+
+<source>Category</source>
+<target>Kategori</target>
<source>Drag && drop</source>
<target>Træk && slip</target>
@@ -438,14 +450,14 @@ Kommando linjen bliver afviklet hver gang:
<source>Close progress dialog</source>
<target>Luk dialog boksen</target>
-<source>Shut down</source>
-<target>Luk ned</target>
+<source>Standby</source>
+<target>Standby</target>
<source>Log off</source>
<target>Log af</target>
-<source>Standby</source>
-<target>Standby</target>
+<source>Shut down</source>
+<target>Luk ned</target>
<source>Hibernate</source>
<target>Dvale</target>
@@ -453,15 +465,12 @@ Kommando linjen bliver afviklet hver gang:
<source>1. &Compare</source>
<target>1. &Sammenlign</target>
-<source>2. &Synchronize...</source>
-<target>2. &Synkroniser...</target>
+<source>2. &Synchronize</source>
+<target>2. &Synkroniser</target>
<source>&New</source>
<target>&Ny</target>
-<source>&Program</source>
-<target>&Program</target>
-
<source>&Language</source>
<target>&Sprog</target>
@@ -489,8 +498,8 @@ Kommando linjen bliver afviklet hver gang:
<source>&Abort</source>
<target>&Afbryd</target>
-<source>Synchronize...</source>
-<target>Synkroniser...</target>
+<source>Synchronize</source>
+<target>Synkroniser</target>
<source>Start synchronization</source>
<target>Start synkronisering</target>
@@ -504,12 +513,12 @@ Kommando linjen bliver afviklet hver gang:
<source>Swap sides</source>
<target>Byt sider</target>
-<source>Save current configuration to file</source>
-<target>Gem nuværende konfiguration i fil</target>
-
<source>Load configuration from file</source>
<target>Læs konfiguration fra fil</target>
+<source>Save current configuration to file</source>
+<target>Gem nuværende konfiguration i fil</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Senest brugte konfigurationer (tryk DEL for at fjerne fra listen)</target>
@@ -519,14 +528,14 @@ Kommando linjen bliver afviklet hver gang:
<source>Hide filtered or temporarily excluded files</source>
<target>Skjul filtrerede eller midlertidigt udelukkede filer</target>
-<source>Number of files and directories that will be created</source>
-<target>Antal filer og biblioteker der vil blive oprettet</target>
+<source>Number of files and folders that will be created</source>
+<target>Antallet af filer og mapper der vil blive oprettet</target>
<source>Number of files that will be overwritten</source>
<target>Antal filer der vil blive overskrevet</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Antal filer og biblioteker der vil blive slettet</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Antal filer og mapper der vil blive slettet</target>
<source>Total amount of data that will be transferred</source>
<target>Samlet antal data der vil blive overført</target>
@@ -549,8 +558,8 @@ Kommando linjen bliver afviklet hver gang:
<source>Batch job</source>
<target>Batch job</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Lav en batch fil og automatiser synkronisering. For at starte i batch mode dobbelt-klik på filen eller kør kommandoen: FreeFileSync.exe SyncJob.ffs_batch. Dette kan også planlægges i dit systems opgavestyring.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Opret en batch fil for at automatiserer synkronisering. Dobbelt-klik på denne fil eller planlæg den i dit systems opgavestyring: FreeFileSync.exe <opgave navn>.ffs_batch</target>
<source>Help</source>
<target>Hjælp</target>
@@ -576,21 +585,12 @@ Kommando linjen bliver afviklet hver gang:
<source>Maximum number of log files:</source>
<target>Maksimalt antal log filer:</target>
-<source>Select log file directory:</source>
-<target>Vælg log fil bibliotek:</target>
+<source>Select folder to save log files:</source>
+<target>Vælg hvor log filer skal gemmes:</target>
<source>Batch settings</source>
<target>Batch indstillinger</target>
-<source>&Save</source>
-<target>&Gem</target>
-
-<source>&Load</source>
-<target>&Hent</target>
-
-<source>Cancel</source>
-<target>Anuller</target>
-
<source>Select variant:</source>
<target>Vælg variant:</target>
@@ -615,29 +615,23 @@ Kommando linjen bliver afviklet hver gang:
<source>Configuration</source>
<target>Konfiguration</target>
-<source>Category</source>
-<target>Kategori</target>
-
-<source>Action</source>
-<target>Handling</target>
-
-<source>File/folder exists on left side only</source>
-<target>Fil/mappe findes kun til venstre</target>
+<source>Item exists on left side only</source>
+<target>Enheden findes kun på venstre side</target>
-<source>File/folder exists on right side only</source>
-<target>Fil/mappe findes kun til højre</target>
+<source>Item exists on right side only</source>
+<target>Enheden findes kun på højre side</target>
-<source>Left file is newer</source>
-<target>Fil til venstre er nyere</target>
+<source>Left side is newer</source>
+<target>Venstre side er nyest</target>
-<source>Right file is newer</source>
-<target>Fil til højre er nyere</target>
+<source>Right side is newer</source>
+<target>Højre side er nyest</target>
-<source>Files have different content</source>
-<target>Filer har forskelligt indhold</target>
+<source>Items have different content</source>
+<target>Enhederne har forskelligt indhold</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Konflikt/filen kan ikke kategoriseres</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Advarsel/enheden kan ikke kategoriseres</target>
<source>OK</source>
<target>OK</target>
@@ -714,9 +708,6 @@ er det samme
<source>&Ignore</source>
<target>&Ignorer</target>
-<source>&Retry</source>
-<target>&Prøv igen</target>
-
<source>Do not show this dialog again</source>
<target>Vis ikke denne dialog igen</target>
@@ -747,33 +738,6 @@ Synkroniserer kun filer der passer alle filtre.
Note: Fil navne må skal passe til grund bibliotekerne!
</target>
-<source>Hints:</source>
-<target>Vejledninger:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Skriv faktiske fil eller bibliotek navne adskilt af ';' eller en ny linje.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Brug wildcard tegn '*' og '?'.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Udeluk filer direkte.</target>
-
-<source>Example</source>
-<target>Eksempel</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Inkluder: *.doc;*.zip;*.exe
-Udeluk: \ting\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Synkroniserer alle .doc, .zip and .exe filer pånær alt i undermappen "temp".</target>
-
<source>Include</source>
<target>Inkluder</target>
@@ -795,8 +759,8 @@ Udeluk: \ting\temp\*
<source>&Default</source>
<target>&Standard</target>
-<source>Transactional file copy</source>
-<target>Transaktionel fil kopiering</target>
+<source>Fail-safe file copy</source>
+<target>Fejlsikret fil kopiering</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Skriv til en midlertidig fil (*.ffs_tmp) først så omdøb den. Dette garanterer sikkerheden selv ved en kritisk fejl.</target>
@@ -810,8 +774,8 @@ Udeluk: \ting\temp\*
<source>Copy file access permissions</source>
<target>Kopier fil adgangs tilladelser</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Overfør fil og biblioteks tilladelser (Kræver Administrator rettigheder)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Overfør fil og mappe tilladelser (Kræver Administrator rettigheder)</target>
<source>Restore hidden dialogs</source>
<target>Gendan skjulte dialoger</target>
@@ -1119,11 +1083,11 @@ Udeluk: \ting\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Integrere eksterne programme. Følgende macroer er mulige:</target>
-<source>- full file or directory name</source>
-<target>- komplet fil eller bibliotek navn</target>
+<source>- full file or folder name</source>
+<target>- fulde fil eller mappe navn</target>
-<source>- directory part only</source>
-<target>- kun bibliotek</target>
+<source>- folder part only</source>
+<target>- kun mappe delen</target>
<source>- Other side's counterpart to %name</source>
<target>- Modsatte sides modpart til %name</target>
@@ -1167,8 +1131,8 @@ Udeluk: \ting\temp\*
<source>Versioning</source>
<target>Versionering</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Flyt filer til et datomærket underbibliotek</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Flyt filer til tids-stemplet undermappe</target>
<source>Files</source>
<target>Filer</target>
@@ -1263,8 +1227,8 @@ Udeluk: \ting\temp\*
<source>Cannot read directory %x.</source>
<target>Kan ikke læse biblioteket %x.</target>
-<source>Endless loop.</source>
-<target>Uendelig løkke.</target>
+<source>Detected endless directory recursion.</source>
+<target>Opdaget en uendelig biblioteks løkke.</target>
<source>Cannot set privilege %x.</source>
<target>Kan ikke sætte privilegier til %x.</target>
@@ -1290,14 +1254,11 @@ Udeluk: \ting\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Sætter standard synkroniseringsvej: Gamle filer bliver overskrevet med nyere.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Filen indeholder ikke en gyldig konfiguration:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Du kan ignorer denne fejl, og opfatte biblioteket som tomt.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Du kan ignorere denne fejl og betegne mappen som tom.</target>
-<source>Cannot find directory %x.</source>
-<target>Kan ikke finde biblioteket %x.</target>
+<source>Cannot find folder %x.</source>
+<target>Kan ikke finde mappen %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>Biblioteker er afhængige! Vær forsigtig når du laver synkroniserings reglerne:</target>
@@ -1329,20 +1290,20 @@ Udeluk: \ting\temp\*
<source>Both sides are equal</source>
<target>Begge sider er ens</target>
-<source>Files/folders differ in attributes only</source>
-<target>Filer/mapper har forskellige attributter</target>
+<source>Items have different attributes</source>
+<target>Enhederne har forskellige attributter</target>
-<source>Copy new file/folder to left</source>
-<target>Kopiere ny fil/mappe til venstre</target>
+<source>Copy new item to left</source>
+<target>Kopiere nyt emne mod venstre</target>
-<source>Copy new file/folder to right</source>
-<target>Kopiere ny fil/mappe til højre</target>
+<source>Copy new item to right</source>
+<target>Kopiere nyt emne mod højre</target>
-<source>Delete left file/folder</source>
-<target>Slet venstre fil/mappe</target>
+<source>Delete left item</source>
+<target>Slet emne til venstre</target>
-<source>Delete right file/folder</source>
-<target>Slet højre fil/mappe</target>
+<source>Delete right item</source>
+<target>Slet emne til højre</target>
<source>Move file on left</source>
<target>Flyt filen til venstre</target>
@@ -1350,20 +1311,20 @@ Udeluk: \ting\temp\*
<source>Move file on right</source>
<target>flyt filen til højre</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Overskriv venstre fil/mappe med højre</target>
+<source>Overwrite left item</source>
+<target>Overskriv emne til venstre</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Overskriv højre fil/mappe med venstre</target>
+<source>Overwrite right item</source>
+<target>Overskriv emne til højre</target>
<source>Do nothing</source>
<target>Gør intet</target>
-<source>Copy file attributes only to left</source>
-<target>Kopiere fil attributter kun til venstre</target>
+<source>Update attributes on left</source>
+<target>Opdater attributter mod venstre</target>
-<source>Copy file attributes only to right</source>
-<target>Kopiere fil attributter kun til højre</target>
+<source>Update attributes on right</source>
+<target>Opdater attributter mod højre</target>
<source>Multiple...</source>
<target>Flere...</target>
@@ -1416,11 +1377,11 @@ Udeluk: \ting\temp\*
<source>Updating attributes of %x</source>
<target>Opdaterer attributter af %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Navnet på destinations biblioteket må ikke være tomt!</target>
+<source>Target folder name must not be empty.</source>
+<target>Destinations makken må ikke være tom.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Fil versions biblioteket blev ikke angivet!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Mappe navnet for fil versionering må ikke være tomt.</target>
<source>Source directory %x not found.</source>
<target>Kildebiblioteket %x blev ikke fundet.</target>
@@ -1449,8 +1410,8 @@ Udeluk: \ting\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Papirkurven kan ikke bruges på følgende stier! Filerne vil blive slettet permanent i stedet for:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Et bibliotek vil blive ændret som er en del af et mappe par! Gennemse venligst synkroniserings indstillingerne!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>En mappe som er en del af flere mappe parringer vil blive ændret. Gennemse venligst synkroniserings indstillingerne.</target>
<source>Processing folder pair:</source>
<target>Behandler mappe par:</target>
diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng
index 0e7c3cb9..08f738aa 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -7,8 +7,8 @@
<plural definition>n == 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Zoeken naar map %x...</target>
+<source>Searching for folder %x...</source>
+<target>Bezig met zoeken naar map %x...</target>
<source>Show in Explorer</source>
<target>Toon in de verkenner</target>
@@ -34,12 +34,12 @@
<source>Select alternate synchronization settings</source>
<target>Selecteer alternatieve synchronisatie instellingen</target>
-<source>No filter selected</source>
-<target>Geen filter geselecteerd</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>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Algemene instellingen</target>
-<source>Synchronization Preview</source>
-<target>Synchronisatie voorbeeldweergave</target>
+<source>Summary</source>
+<target>Overzicht</target>
<source>Find</source>
<target>Vind</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Verkennen</target>
-<source>Invalid command line: %x</source>
-<target>Ongeldige opdrachtregel: %x</target>
+<source>Invalid command line:</source>
+<target>Ongeldige opdrachtregel:</target>
<source>Info</source>
<target>Info</target>
@@ -226,29 +226,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>Schijfnaam %x maakt geen deel uit van bestandsnaam %y!</target>
-<source>Cannot find file %x.</source>
-<target>Kan bestand %x niet vinden.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Kan de volgende XML elementen niet lezen:</target>
-<source>S&ave configuration...</source>
-<target>Sl&a configuratie op...</target>
+<source>Cannot find file %x.</source>
+<target>Kan bestand %x niet vinden.</target>
+
+<source>&Open...</source>
+<target>&Open...</target>
-<source>&Load configuration...</source>
-<target>&Laad configuratie...</target>
+<source>&Save...</source>
+<target>&Opslaan...</target>
<source>&Quit</source>
<target>&Afsluiten</target>
-<source>&File</source>
-<target>&Bestand</target>
+<source>&Program</source>
+<target>&Programma</target>
<source>&Content</source>
<target>&Inhoud</target>
-<source>&About...</source>
-<target>&Informatie...</target>
+<source>&About</source>
+<target>&Over</target>
<source>&Help</source>
<target>&Help</target>
@@ -256,8 +256,8 @@
<source>Usage:</source>
<target>Gebruik:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Selecteer mappen om te observeren.</target>
+<source>1. Select folders to watch.</source>
+<target>1. Selecteer mappen om te bekijken.</target>
<source>2. Enter a command line.</source>
<target>2. Geef een opdrachtregel in.</target>
@@ -265,18 +265,10 @@
<source>3. Press 'Start'.</source>
<target>3. Klik op 'Start'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-De opdrachtregel wordt telkens uitgevoerd indien:
-- alle mappen beschikbaar worden (bijv. invoegen van USB stick)
-- bestanden binnen deze mappen of submappen veranderd zijn
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Importeer een .ffs_batch bestand om te beginnen.</target>
-<source>Directories to watch</source>
+<source>Folders to watch</source>
<target>Mappen om te bekijken</target>
<source>Add folder</source>
@@ -288,14 +280,25 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>Select a folder</source>
<target>Selecteer een map</target>
+<source>Delay [seconds]</source>
+<target>Vertraging [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>
+
<source>Command line</source>
<target>Opdrachtregel</target>
-<source>Minimum Idle Time [seconds]</source>
-<target>Minimale inactieve tijd [seconden]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Aantal inactieve seconden tussen detectie van de laatste verandering en uitvoering van een commando</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+De opdracht word geactiveerd als>:
+- bestanden of subfolders veranderen
+- nieuwe folders worden gevonden (bijvoorbeeld bij invoeging van USB stick)
+</target>
<source>Start</source>
<target>Start</target>
@@ -309,8 +312,8 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>(Build: %x)</source>
<target>(Build: %x)</target>
-<source>RealtimeSync configuration</source>
-<target>RealtimeSync configuratie</target>
+<source>All files</source>
+<target></target>
<source>&Restore</source>
<target>&Herstellen</target>
@@ -324,8 +327,8 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>Waiting for missing directories...</source>
<target>Wacht op missende mappen...</target>
-<source>A directory input field is empty.</source>
-<target>Een tekstveld over de map is leeg.</target>
+<source>An input folder name is empty.</source>
+<target>Een input map naam is leeg.</target>
<source>Logging</source>
<target>Loggen</target>
@@ -351,9 +354,6 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>FreeFileSync batch file</source>
<target>FreeFileSync taakbestand</target>
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync configuratie</target>
-
<source>Batch execution</source>
<target>Taak uitvoeren</target>
@@ -396,12 +396,12 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>Download now?</source>
<target>Nu downloaden?</target>
-<source>Information</source>
-<target>Informatie</target>
-
<source>FreeFileSync is up to date!</source>
<target>U gebruikt de nieuwste versie van FreeFileSync!</target>
+<source>Information</source>
+<target>Informatie</target>
+
<source>Do you want FreeFileSync to automatically check for updates every week?</source>
<target>Wilt u FreeFileSync elke week automatisch laten controleren of er een nieuwe versie is?</target>
@@ -411,8 +411,8 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source><Symlink></source>
<target><Symlink></target>
-<source><Directory></source>
-<target><Map></target>
+<source><Folder></source>
+<target>Map</target>
<source>Full path</source>
<target>Volledig pad</target>
@@ -423,8 +423,8 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>Relative path</source>
<target>Relatief pad</target>
-<source>Directory</source>
-<target>Map</target>
+<source>Base folder</source>
+<target>Hoofdmap</target>
<source>Size</source>
<target>Grootte</target>
@@ -435,8 +435,11 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>Extension</source>
<target>Extensie</target>
-<source>Comparison Result</source>
-<target>Resultaat vergelijken</target>
+<source>Action</source>
+<target>Actie</target>
+
+<source>Category</source>
+<target>Categorie</target>
<source>Drag && drop</source>
<target>Drag en drop</target>
@@ -444,14 +447,14 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>Close progress dialog</source>
<target>Sluit voortgangsvenster</target>
-<source>Shut down</source>
-<target>Afsluiten</target>
+<source>Standby</source>
+<target>Stand-by</target>
<source>Log off</source>
<target>Afmelden</target>
-<source>Standby</source>
-<target>Stand-by</target>
+<source>Shut down</source>
+<target>Afsluiten</target>
<source>Hibernate</source>
<target>Slaapstand</target>
@@ -459,15 +462,12 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>1. &Compare</source>
<target>1. &Vergelijk</target>
-<source>2. &Synchronize...</source>
-<target>2. &Synchroniseer...</target>
+<source>2. &Synchronize</source>
+<target>2. &Synchroniseer</target>
<source>&New</source>
<target>&Nieuw</target>
-<source>&Program</source>
-<target>&Programma</target>
-
<source>&Language</source>
<target>&Taal</target>
@@ -495,8 +495,8 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>&Abort</source>
<target>&Afbreken</target>
-<source>Synchronize...</source>
-<target>Synchroniseer...</target>
+<source>Synchronize</source>
+<target>Synchroniseer</target>
<source>Start synchronization</source>
<target>Start synchronisatie</target>
@@ -510,12 +510,12 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>Swap sides</source>
<target>Wissel zijdes</target>
-<source>Save current configuration to file</source>
-<target>Sla de huidige configuratie op in een bestand</target>
-
<source>Load configuration from file</source>
<target>Laad configuratie uit bestand</target>
+<source>Save current configuration to file</source>
+<target>Sla de huidige configuratie op in een bestand</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Laatst gebruikte instellingen (druk op DEL om iets te verwijderen)</target>
@@ -525,21 +525,18 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>Hide filtered or temporarily excluded files</source>
<target>Verberg gefilterde of tijdelijk uitgesloten bestanden</target>
-<source>Number of files and directories that will be created</source>
-<target>Aantal bestanden en mappen die aangemaakt zullen worden</target>
+<source>Number of files and folders that will be created</source>
+<target>Aantal bestanden en mappen die zullen worden aangemaakt</target>
<source>Number of files that will be overwritten</source>
<target>Aantal bestanden die overschreven zullen worden</target>
-<source>Number of files and directories that will be deleted</source>
+<source>Number of files and folders that will be deleted</source>
<target>Aantal bestanden en mappen die verwijderd zullen worden</target>
<source>Total amount of data that will be transferred</source>
<target>Totale hoeveelheid data die verplaatst wordt</target>
-<source>Operation:</source>
-<target>Bewerking:</target>
-
<source>Items found:</source>
<target>Onderdelen gevonden:</target>
@@ -555,8 +552,8 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>Batch job</source>
<target>Taaklijst</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Maak een batch bestand en automatiseer synchronisatie. Om te starten in batch modus dubbelklik je op dit bestand of voer het volgende commando uit: FreeFileSync.exe SyncJob.ffs_batch. Dit kan ook worden gepland in uw taakplanner van uw systeem.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Maak een batch bestand om synchronisatie te automatiseren. Dubbelklik op dit bestand of plan dit in de systeem taakplanner: FreeFileSync.exe <batch naam>.ffs_batch</target>
<source>Help</source>
<target>Help</target>
@@ -582,18 +579,12 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>Maximum number of log files:</source>
<target>Maximale aantal van logbestanden:</target>
-<source>Select log file directory:</source>
-<target>Selecteer een map voor het logbestand:</target>
+<source>Select folder to save log files:</source>
+<target>Selecteer de map voor het bewaren van log bestanden:</target>
<source>Batch settings</source>
<target>Batch instellingen</target>
-<source>&Save</source>
-<target>&Opslaan</target>
-
-<source>&Load</source>
-<target>&Laden</target>
-
<source>Select variant:</source>
<target>Selecteer een variant:</target>
@@ -618,29 +609,23 @@ De opdrachtregel wordt telkens uitgevoerd indien:
<source>Configuration</source>
<target>Configuratie</target>
-<source>Category</source>
-<target>Categorie</target>
-
-<source>Action</source>
-<target>Actie</target>
-
-<source>File/folder exists on left side only</source>
-<target>Bestand/Map bestaat alleen aan de linkerkant</target>
+<source>Item exists on left side only</source>
+<target>Item bestaat alleen aan de linkerkant</target>
-<source>File/folder exists on right side only</source>
-<target>Bestand/Map bestaat alleen aan de rechterkant</target>
+<source>Item exists on right side only</source>
+<target>Item bestaat alleen aan de rechterkant</target>
-<source>Left file is newer</source>
-<target>Linker bestand is nieuwer</target>
+<source>Left side is newer</source>
+<target>De linkerkant is nieuwer</target>
-<source>Right file is newer</source>
-<target>Rechter bestand is nieuwer</target>
+<source>Right side is newer</source>
+<target>De rechterkant is nieuwer</target>
-<source>Files have different content</source>
-<target>Bestanden hebben verschillende inhoud</target>
+<source>Items have different content</source>
+<target>De items hebben een andere inhoud</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Conflict/Bestand kan niet worden gecategoriseerd</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Conflict/item kan niet worden gecategoriseerd</target>
<source>OK</source>
<target>OK</target>
@@ -747,33 +732,6 @@ Alleen bestanden die met alle filter instellingen overeen komen worden gesynchro
Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
</target>
-<source>Hints:</source>
-<target>Tips:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Vul de relatieve bestands- of mapnaam in, gescheiden door ';' of een nieuwe regel.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Gebruik wildcard karakters zoals '*' en '?'.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Sluit bestanden in het hoofdscherm direct uit via het contextmenu</target>
-
-<source>Example</source>
-<target>Voorbeeld</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Opnemen: *.doc;*.zip;*.exe
-Uitsluiten: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Synchroniseer alle .doc, .zip en .exe bestanden behalve wat in submap "temp" staat.</target>
-
<source>Include</source>
<target>Opnemen</target>
@@ -795,8 +753,8 @@ Uitsluiten: \stuff\temp\*
<source>&Default</source>
<target>&Standaard</target>
-<source>Transactional file copy</source>
-<target>Transactionele bestands kopie</target>
+<source>Fail-safe file copy</source>
+<target>Fail-safe bestandskopie</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Schrijf eerst naar een tijdelijk bestand (*.ffs_tmp) en hernoem dan. Dit garandeert een consistente toestand, zelfs in het geval van een fatale fout.</target>
@@ -810,8 +768,8 @@ Uitsluiten: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Kopiëer toegangsrechten van bestand.</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Zet bestand en map permissies over (Vereist Administrator rechten)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Overdragen van bestands en maps permissies (Administrator rechten nodig)</target>
<source>Restore hidden dialogs</source>
<target>Herstel verborgen dialogen</target>
@@ -1119,11 +1077,11 @@ Uitsluiten: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Integreer externe applicaties in het context menu. De volgende macros zijn beschikbaar:</target>
-<source>- full file or directory name</source>
-<target>- volledig bestand of mapnaam</target>
+<source>- full file or folder name</source>
+<target>- volledige bestands of maps naam</target>
-<source>- directory part only</source>
-<target>- alleen de map</target>
+<source>- folder part only</source>
+<target>- alleen het map gedeelte</target>
<source>- Other side's counterpart to %name</source>
<target>- Tegenhanger andere zijde naar %naam</target>
@@ -1167,8 +1125,8 @@ Uitsluiten: \stuff\temp\*
<source>Versioning</source>
<target>Versiebeheer</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Verplaats de bestanden naar een tijd-gemarkeerde submap</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Verplaats bestanden in een tijdsaangeduide submap</target>
<source>Files</source>
<target>Bestanden</target>
@@ -1233,6 +1191,9 @@ Uitsluiten: \stuff\temp\*
<source>Cannot write modification time of %x.</source>
<target>Kan wijzigings tijd van %x niet toevoegen.</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Kan bestandskenmerken van %x niet schrijven.</target>
+
<source>Cannot find system function %x.</source>
<target>Kan systeemfunctie %x niet vinden.</target>
@@ -1254,17 +1215,14 @@ Uitsluiten: \stuff\temp\*
<source>Cannot copy symbolic link %x to %y.</source>
<target>Kan snelkoppeling %x niet kopiëren naar %y.</target>
-<source>Cannot write file attributes of %x.</source>
-<target>Kan bestandskenmerken van %x niet schrijven.</target>
-
<source>Cannot copy file %x to %y.</source>
<target>Kan bestand %x niet kopiëren naar %y.</target>
<source>Cannot read directory %x.</source>
<target>Kan map %x niet lezen.</target>
-<source>Endless loop.</source>
-<target>Oneindige loop.</target>
+<source>Detected endless directory recursion.</source>
+<target>Eindeloze map recursie gedetecteerd.</target>
<source>Cannot set privilege %x.</source>
<target>Kan privilege %x niet instellen.</target>
@@ -1290,13 +1248,10 @@ Uitsluiten: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Stel standaard synchronisatie richtingen in: Oude bestanden worden door nieuwere bestanden overschreven.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Het bestand bevat geen geldige configuratie:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Je kan deze error negeren als de map leeg is.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>U kunt deze waarschuwing negeren om de map als leeg te laten gelden.</target>
-<source>Cannot find directory %x.</source>
+<source>Cannot find folder %x.</source>
<target>Kan map %x niet vinden.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
@@ -1329,20 +1284,20 @@ Uitsluiten: \stuff\temp\*
<source>Both sides are equal</source>
<target>Beide kanten zijn gelijk</target>
-<source>Files/folders differ in attributes only</source>
-<target>Bestanden/Mappen verschillen alleen in attributen</target>
+<source>Items have different attributes</source>
+<target>Items hebben verschillende attributen</target>
-<source>Copy new file/folder to left</source>
-<target>Kopiëer nieuw bestand/map naar links</target>
+<source>Copy new item to left</source>
+<target>Kopieër nieuw item naar de linkerkant</target>
-<source>Copy new file/folder to right</source>
-<target>Kopiëer nieuw bestand/map naar rechts</target>
+<source>Copy new item to right</source>
+<target>Kopieër nieuw item naar de rechterkant</target>
-<source>Delete left file/folder</source>
-<target>Verwijder linker bestand/map</target>
+<source>Delete left item</source>
+<target>Verwijder linker item</target>
-<source>Delete right file/folder</source>
-<target>Verwijder rechter bestand/map</target>
+<source>Delete right item</source>
+<target>Verwijder rechter item</target>
<source>Move file on left</source>
<target>Verplaats bestand aan de linkerkant</target>
@@ -1350,20 +1305,20 @@ Uitsluiten: \stuff\temp\*
<source>Move file on right</source>
<target>Verplaats bestand aan de rechterkant</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Overschrijf linker bestand/map met de rechter</target>
+<source>Overwrite left item</source>
+<target>Overschrijf linker item</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Overschrijf rechter bestand/map met de linker</target>
+<source>Overwrite right item</source>
+<target>Overschrijf rechter item</target>
<source>Do nothing</source>
<target>Geen actie ondernemen</target>
-<source>Copy file attributes only to left</source>
-<target>Kopiëer bestandsattributen alleen naar links</target>
+<source>Update attributes on left</source>
+<target>Update attributen aan de linkerkant</target>
-<source>Copy file attributes only to right</source>
-<target>Kopiëer bestandsattributen alleen naar rechts</target>
+<source>Update attributes on right</source>
+<target>Update attributen aan de rechterkant</target>
<source>Multiple...</source>
<target>Meerdere...</target>
@@ -1416,11 +1371,11 @@ Uitsluiten: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Attributen bijwerken van %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Doel mapnaam mag niet leeg zijn!</target>
+<source>Target folder name must not be empty.</source>
+<target>Doelmap mag geen lege naam hebben.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Map voor bestands versiebeheer is niet ingegeven!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Mapnaam voor bestandsversies mag niet leeg zijn.</target>
<source>Source directory %x not found.</source>
<target>Bronmap %x niet gevonden.</target>
@@ -1449,8 +1404,8 @@ Uitsluiten: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Prullenbak is niet beschikbaar voor de volgende locaties! De bestanden worden permanent verwijderd:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Een map wordt bewerkt die deel is van meerdere mappen! Controleer de synchronisatie instellingen!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Een map die onderdeel is van meerdere map paren word aangepast. Kijk alstublieft uw synchronisatie instellingen na.</target>
<source>Processing folder pair:</source>
<target>Verwerking van gekoppelde mappen:</target>
diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index abed9c59..751cf0be 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -7,8 +7,8 @@
<plural definition>n == 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Searching for directory %x...</target>
+<source>Searching for folder %x...</source>
+<target>Searching for folder %x...</target>
<source>Show in Explorer</source>
<target>Show in Explorer</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSync - Automated Synchronisation</target>
+<source>Error</source>
+<target>Error</target>
+
<source>Select alternate comparison settings</source>
<target>Select alternate comparison settings</target>
<source>Select alternate synchronization settings</source>
<target>Select alternate synchronisation settings</target>
-<source>No filter selected</source>
-<target>No filter selected</target>
-
<source>Filter is active</source>
<target>Filter is active</target>
+<source>No filter selected</source>
+<target>No filter selected</target>
+
<source>Remove alternate settings</source>
<target>Remove alternate settings</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>About</target>
-<source>Error</source>
-<target>Error</target>
-
<source>Warning</source>
<target>Warning</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Global settings</target>
-<source>Synchronization Preview</source>
-<target>Synchronisation Preview</target>
+<source>Summary</source>
+<target>Summary</target>
<source>Find</source>
<target>Find</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Browse</target>
-<source>Invalid command line: %x</source>
-<target>Invalid command line: %x</target>
+<source>Invalid command line:</source>
+<target>Invalid command line:</target>
<source>Info</source>
<target>Info</target>
@@ -232,23 +232,23 @@
<source>Cannot read the following XML elements:</source>
<target>Cannot read the following XML elements:</target>
-<source>S&ave configuration...</source>
-<target>S&ave configuration...</target>
+<source>&Open...</source>
+<target>&Open...</target>
-<source>&Load configuration...</source>
-<target>&Load configuration...</target>
+<source>&Save...</source>
+<target>&Save...</target>
<source>&Quit</source>
<target>&Quit</target>
-<source>&File</source>
-<target>&File</target>
+<source>&Program</source>
+<target>&Program</target>
<source>&Content</source>
<target>&Content</target>
-<source>&About...</source>
-<target>&About...</target>
+<source>&About</source>
+<target>&About</target>
<source>&Help</source>
<target>&Help</target>
@@ -256,8 +256,8 @@
<source>Usage:</source>
<target>Usage:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Select directories to monitor.</target>
+<source>1. Select folders to watch.</source>
+<target>1. Select folders to watch.</target>
<source>2. Enter a command line.</source>
<target>2. Enter a command line.</target>
@@ -265,19 +265,11 @@
<source>3. Press 'Start'.</source>
<target>3. Press 'Start'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>To get started just import a .ffs_batch file.</target>
-<source>Directories to watch</source>
-<target>Directories to watch</target>
+<source>Folders to watch</source>
+<target>Folders to watch</target>
<source>Add folder</source>
<target>Add folder</target>
@@ -288,18 +280,35 @@ The command line is executed each time:
<source>Select a folder</source>
<target>Select a folder</target>
+<source>Delay [seconds]</source>
+<target>Delay [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>Minimum Idle Time [seconds]</source>
-<target>Minimum Idle Time [seconds]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Idle time between detection of last change and execution of command line in seconds</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</target>
<source>Start</source>
<target>Start</target>
+<source>&Retry</source>
+<target>&Retry</target>
+
+<source>Cancel</source>
+<target>Cancel</target>
+
<source>(Build: %x)</source>
<target>(Build: %x)</target>
@@ -318,8 +327,8 @@ The command line is executed each time:
<source>Waiting for missing directories...</source>
<target>Waiting for missing directories...</target>
-<source>A directory input field is empty.</source>
-<target>A directory input field is empty.</target>
+<source>An input folder name is empty.</source>
+<target>An input folder name is empty.</target>
<source>Logging</source>
<target>Logging</target>
@@ -348,9 +357,6 @@ The command line is executed each time:
<source>FreeFileSync configuration</source>
<target>FreeFileSync configuration</target>
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync Batch Job</target>
-
<source>Batch execution</source>
<target>Batch execution</target>
@@ -408,8 +414,8 @@ The command line is executed each time:
<source><Symlink></source>
<target><Symlink></target>
-<source><Directory></source>
-<target><Directory></target>
+<source><Folder></source>
+<target><Folder></target>
<source>Full path</source>
<target>Full path</target>
@@ -420,8 +426,8 @@ The command line is executed each time:
<source>Relative path</source>
<target>Relative path</target>
-<source>Directory</source>
-<target>Directory</target>
+<source>Base folder</source>
+<target>Base folder</target>
<source>Size</source>
<target>Size</target>
@@ -432,8 +438,11 @@ The command line is executed each time:
<source>Extension</source>
<target>Extension</target>
-<source>Comparison Result</source>
-<target>Comparison Result</target>
+<source>Action</source>
+<target>Action</target>
+
+<source>Category</source>
+<target>Category</target>
<source>Drag && drop</source>
<target>Drag && drop</target>
@@ -441,14 +450,14 @@ The command line is executed each time:
<source>Close progress dialog</source>
<target>Close progress dialog</target>
-<source>Shut down</source>
-<target>Shut down</target>
+<source>Standby</source>
+<target>Standby</target>
<source>Log off</source>
<target>Log off</target>
-<source>Standby</source>
-<target>Standby</target>
+<source>Shut down</source>
+<target>Shut down</target>
<source>Hibernate</source>
<target>Hibernate</target>
@@ -456,15 +465,12 @@ The command line is executed each time:
<source>1. &Compare</source>
<target>1. &Compare</target>
-<source>2. &Synchronize...</source>
-<target>2. &Synchronise...</target>
+<source>2. &Synchronize</source>
+<target>2. &Synchronise</target>
<source>&New</source>
<target>&New</target>
-<source>&Program</source>
-<target>&Program</target>
-
<source>&Language</source>
<target>&Language</target>
@@ -492,8 +498,8 @@ The command line is executed each time:
<source>&Abort</source>
<target>&Abort</target>
-<source>Synchronize...</source>
-<target>Synchronise...</target>
+<source>Synchronize</source>
+<target>Synchronise</target>
<source>Start synchronization</source>
<target>Start synchronisation</target>
@@ -507,12 +513,12 @@ The command line is executed each time:
<source>Swap sides</source>
<target>Swap sides</target>
-<source>Save current configuration to file</source>
-<target>Save current configuration to file</target>
-
<source>Load configuration from file</source>
<target>Load configuration from file</target>
+<source>Save current configuration to file</source>
+<target>Save current configuration to file</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Last used configurations (press DEL to remove from list)</target>
@@ -522,14 +528,14 @@ The command line is executed each time:
<source>Hide filtered or temporarily excluded files</source>
<target>Hide filtered or temporarily excluded files</target>
-<source>Number of files and directories that will be created</source>
-<target>Number of files and directories that will be created</target>
+<source>Number of files and folders that will be created</source>
+<target>Number of files and folders that will be created</target>
<source>Number of files that will be overwritten</source>
<target>Number of files that will be overwritten</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Number of files and directories that will be deleted</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Number of files and folders that will be deleted</target>
<source>Total amount of data that will be transferred</source>
<target>Total amount of data that will be transferred</target>
@@ -552,8 +558,8 @@ The command line is executed each time:
<source>Batch job</source>
<target>Batch job</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Create a batch file and automate synchronisation. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Create a batch file to automate synchronisation. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</target>
<source>Help</source>
<target>Help</target>
@@ -579,21 +585,12 @@ The command line is executed each time:
<source>Maximum number of log files:</source>
<target>Maximum number of log files:</target>
-<source>Select log file directory:</source>
-<target>Select log file directory:</target>
+<source>Select folder to save log files:</source>
+<target>Select folder to save log files:</target>
<source>Batch settings</source>
<target>Batch settings</target>
-<source>&Save</source>
-<target>&Save</target>
-
-<source>&Load</source>
-<target>&Load</target>
-
-<source>Cancel</source>
-<target>Cancel</target>
-
<source>Select variant:</source>
<target>Select variant:</target>
@@ -618,29 +615,23 @@ The command line is executed each time:
<source>Configuration</source>
<target>Configuration</target>
-<source>Category</source>
-<target>Category</target>
-
-<source>Action</source>
-<target>Action</target>
-
-<source>File/folder exists on left side only</source>
-<target>File/folder exists on left side only</target>
+<source>Item exists on left side only</source>
+<target>Item exists on left side only</target>
-<source>File/folder exists on right side only</source>
-<target>File/folder exists on right side only</target>
+<source>Item exists on right side only</source>
+<target>Item exists on right side only</target>
-<source>Left file is newer</source>
-<target>Left file is newer</target>
+<source>Left side is newer</source>
+<target>Left side is newer</target>
-<source>Right file is newer</source>
-<target>Right file is newer</target>
+<source>Right side is newer</source>
+<target>Right side is newer</target>
-<source>Files have different content</source>
-<target>Files have different content</target>
+<source>Items have different content</source>
+<target>Items have different content</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Conflict/file cannot be categorised</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Conflict/item cannot be categorised</target>
<source>OK</source>
<target>OK</target>
@@ -717,9 +708,6 @@ is the same
<source>&Ignore</source>
<target>&Ignore</target>
-<source>&Retry</source>
-<target>&Retry</target>
-
<source>Do not show this dialog again</source>
<target>Do not show this dialogue again</target>
@@ -750,33 +738,6 @@ Only files that match all filter settings will be synchronised.
Note: File names must be relative to base directories!
</target>
-<source>Hints:</source>
-<target>Hints:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Enter relative file or directory names separated by ';' or a new line.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Use wildcard characters '*' and '?'.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Exclude files directly on main grid via context menu.</target>
-
-<source>Example</source>
-<target>Example</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Synchronise all .doc, .zip and .exe files except everything in subfolder "temp".</target>
-
<source>Include</source>
<target>Include</target>
@@ -798,8 +759,8 @@ Exclude: \stuff\temp\*
<source>&Default</source>
<target>&Default</target>
-<source>Transactional file copy</source>
-<target>Transactional file copy</target>
+<source>Fail-safe file copy</source>
+<target>Fail-safe file copy</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</target>
@@ -813,8 +774,8 @@ Exclude: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Copy file access permissions</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Transfer file and directory permissions (Requires Administrator rights)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Transfer file and folder permissions (Requires Administrator rights)</target>
<source>Restore hidden dialogs</source>
<target>Restore hidden dialogs</target>
@@ -1122,11 +1083,11 @@ Exclude: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Integrate external applications into context menu. The following macros are available:</target>
-<source>- full file or directory name</source>
-<target>- full file or directory name</target>
+<source>- full file or folder name</source>
+<target>- full file or folder name</target>
-<source>- directory part only</source>
-<target>- directory part only</target>
+<source>- folder part only</source>
+<target>- folder part only</target>
<source>- Other side's counterpart to %name</source>
<target>- Other side's counterpart to %name</target>
@@ -1170,8 +1131,8 @@ Exclude: \stuff\temp\*
<source>Versioning</source>
<target>Versioning</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Move files into a time-stamped subdirectory</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Move files into a time-stamped subfolder</target>
<source>Files</source>
<target>Files</target>
@@ -1266,8 +1227,8 @@ Exclude: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>Cannot read directory %x.</target>
-<source>Endless loop.</source>
-<target>Endless loop.</target>
+<source>Detected endless directory recursion.</source>
+<target>Detected endless directory recursion.</target>
<source>Cannot set privilege %x.</source>
<target>Cannot set privilege %x.</target>
@@ -1293,14 +1254,11 @@ Exclude: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Setting default synchronisation directions: Old files will be overwritten with newer files.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>The file does not contain a valid configuration:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>You can ignore this error to consider the directory as empty.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>You can ignore this error to consider the folder as empty.</target>
-<source>Cannot find directory %x.</source>
-<target>Cannot find directory %x.</target>
+<source>Cannot find folder %x.</source>
+<target>Cannot find folder %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>Directories are dependent! Be careful when setting up synchronisation rules:</target>
@@ -1332,20 +1290,20 @@ Exclude: \stuff\temp\*
<source>Both sides are equal</source>
<target>Both sides are equal</target>
-<source>Files/folders differ in attributes only</source>
-<target>Files/folders differ in attributes only</target>
+<source>Items have different attributes</source>
+<target>Items have different attributes</target>
-<source>Copy new file/folder to left</source>
-<target>Copy new file/folder to left</target>
+<source>Copy new item to left</source>
+<target>Copy new item to left</target>
-<source>Copy new file/folder to right</source>
-<target>Copy new file/folder to right</target>
+<source>Copy new item to right</source>
+<target>Copy new item to right</target>
-<source>Delete left file/folder</source>
-<target>Delete left file/folder</target>
+<source>Delete left item</source>
+<target>Delete left item</target>
-<source>Delete right file/folder</source>
-<target>Delete right file/folder</target>
+<source>Delete right item</source>
+<target>Delete right item</target>
<source>Move file on left</source>
<target>Move file on left</target>
@@ -1353,20 +1311,20 @@ Exclude: \stuff\temp\*
<source>Move file on right</source>
<target>Move file on right</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Overwrite left file/folder with right one</target>
+<source>Overwrite left item</source>
+<target>Overwrite left item</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Overwrite right file/folder with left one</target>
+<source>Overwrite right item</source>
+<target>Overwrite right item</target>
<source>Do nothing</source>
<target>Do nothing</target>
-<source>Copy file attributes only to left</source>
-<target>Copy file attributes only to left</target>
+<source>Update attributes on left</source>
+<target>Update attributes on left</target>
-<source>Copy file attributes only to right</source>
-<target>Copy file attributes only to right</target>
+<source>Update attributes on right</source>
+<target>Update attributes on right</target>
<source>Multiple...</source>
<target>Multiple...</target>
@@ -1419,11 +1377,11 @@ Exclude: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Updating attributes of %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Target directory name must not be empty!</target>
+<source>Target folder name must not be empty.</source>
+<target>Target folder name must not be empty.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Directory for file versioning was not supplied!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Folder name for file versioning must not be empty.</target>
<source>Source directory %x not found.</source>
<target>Source directory %x not found.</target>
@@ -1452,8 +1410,8 @@ Exclude: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>A directory will be modified which is part of multiple folder pairs! Please review synchronisation settings!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>A folder will be modified which is part of multiple folder pairs. Please review synchronisation settings.</target>
<source>Processing folder pair:</source>
<target>Processing folder pair:</target>
diff --git a/BUILD/Languages/finnish.lng b/BUILD/Languages/finnish.lng
index 48cfc636..8ccf5448 100644
--- a/BUILD/Languages/finnish.lng
+++ b/BUILD/Languages/finnish.lng
@@ -7,8 +7,8 @@
<plural definition>n == 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Hakemistoja etsitään %x...</target>
+<source>Searching for folder %x...</source>
+<target>Etsitään hakemistoa %x...</target>
<source>Show in Explorer</source>
<target>Näytä Explorerissa</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSync - Automaattisoitu täsmäytys</target>
+<source>Error</source>
+<target>Virhe</target>
+
<source>Select alternate comparison settings</source>
<target>Valitse toinen asetus vertailulle</target>
<source>Select alternate synchronization settings</source>
<target>Valitse täsmäykselle toinen asetus</target>
-<source>No filter selected</source>
-<target>Suodin valitsematta</target>
-
<source>Filter is active</source>
<target>Suodin aktivoitu</target>
+<source>No filter selected</source>
+<target>Suodin valitsematta</target>
+
<source>Remove alternate settings</source>
<target>Poista toinen asetus</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>Ohje</target>
-<source>Error</source>
-<target>Virhe</target>
-
<source>Warning</source>
<target>Varoitus</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Yleiset asetukset</target>
-<source>Synchronization Preview</source>
-<target>Täsmäytyksen esikatselu</target>
+<source>Summary</source>
+<target>Yhteenveto</target>
<source>Find</source>
<target>Etsi</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Selaa</target>
-<source>Invalid command line: %x</source>
-<target>Virheellinen komentokehote: %x</target>
+<source>Invalid command line:</source>
+<target>Virheellinen komentokehote:</target>
<source>Info</source>
<target>Info</target>
@@ -226,29 +226,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>Taltion nimi %x ei esiinny tiedostonimessä %y!</target>
-<source>Cannot find file %x.</source>
-<target>Tiedosto %x ei löydy.</target>
-
<source>Cannot read the following XML elements:</source>
<target>XML elementit lukukelvottimia:</target>
-<source>S&ave configuration...</source>
-<target>Asetukset t&allennetaan...</target>
+<source>Cannot find file %x.</source>
+<target>Tiedosto %x ei löydy.</target>
-<source>&Load configuration...</source>
-<target>Asetusten &lataus...</target>
+<source>&Open...</source>
+<target>&Avaa...</target>
+
+<source>&Save...</source>
+<target>&Avaa...</target>
<source>&Quit</source>
<target>&Lopeta</target>
-<source>&File</source>
-<target>&Tiedosto</target>
+<source>&Program</source>
+<target>&Ohjelma</target>
<source>&Content</source>
<target>&Sisältö</target>
-<source>&About...</source>
-<target>&Ohje...</target>
+<source>&About</source>
+<target>&Ohje</target>
<source>&Help</source>
<target>&Ohje</target>
@@ -256,8 +256,8 @@
<source>Usage:</source>
<target>Käyttö:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Valitse seurattavat hakemistot</target>
+<source>1. Select folders to watch.</source>
+<target>1. Valitse seurattavat hakemistot.</target>
<source>2. Enter a command line.</source>
<target>2. Anna komentokehote</target>
@@ -265,18 +265,10 @@
<source>3. Press 'Start'.</source>
<target>3. Paina 'Käynnistä'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Komentokehoite suoritetaan kun:
-- Kaikki hakemistot ovat saatavilla (esim. USB tikku asennetaan)
-- Tiedostot näissä hakemistoissa tai alihakemistoissa muutetaan
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Aloita lataamalla joku .ffs_batch -tiedosto.</target>
-<source>Directories to watch</source>
+<source>Folders to watch</source>
<target>Tarkkailtavat hakemistot</target>
<source>Add folder</source>
@@ -288,18 +280,35 @@ Komentokehoite suoritetaan kun:
<source>Select a folder</source>
<target>Valitse hakemisto</target>
+<source>Delay [seconds]</source>
+<target>Viive [sekunttia]</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>Komentokehote</target>
-<source>Minimum Idle Time [seconds]</source>
-<target>Minimi joutoaika [sekunttia]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Joutoaika viimeisen muutos havainnon ja käskyn suorittamisen välillä, sekunneissa</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Käsky suoritetaan jos:
+- tiedosto tai alihakemisto muuttu
+- 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>(Build: %x)</source>
<target>(Versio: %x)</target>
@@ -318,8 +327,8 @@ Komentokehoite suoritetaan kun:
<source>Waiting for missing directories...</source>
<target>Odottaa puuttuvia hakemistoja...</target>
-<source>A directory input field is empty.</source>
-<target>Hakemistokenttä on tyhjä.</target>
+<source>An input folder name is empty.</source>
+<target>Tulohakemiston nimi on tyhjä.</target>
<source>Logging</source>
<target>Kirjaa</target>
@@ -405,7 +414,7 @@ Komentokehoite suoritetaan kun:
<source><Symlink></source>
<target><Pikakuvake></target>
-<source><Directory></source>
+<source><Folder></source>
<target><Hakemisto></target>
<source>Full path</source>
@@ -417,8 +426,8 @@ Komentokehoite suoritetaan kun:
<source>Relative path</source>
<target>Suhteellinen polku</target>
-<source>Directory</source>
-<target>Hakemisto</target>
+<source>Base folder</source>
+<target>Juurihakemisto</target>
<source>Size</source>
<target>Koko</target>
@@ -429,8 +438,11 @@ Komentokehoite suoritetaan kun:
<source>Extension</source>
<target>Laajennus</target>
-<source>Comparison Result</source>
-<target>Vertailun tulos</target>
+<source>Action</source>
+<target>Suorita</target>
+
+<source>Category</source>
+<target>Luokka</target>
<source>Drag && drop</source>
<target>Vedä ja pudota</target>
@@ -438,14 +450,14 @@ Komentokehoite suoritetaan kun:
<source>Close progress dialog</source>
<target>Sulje etenämän dialoogi</target>
-<source>Shut down</source>
-<target>Sulje</target>
+<source>Standby</source>
+<target>Lepotila</target>
<source>Log off</source>
<target>Kirjaudu ulos</target>
-<source>Standby</source>
-<target>Lepotila</target>
+<source>Shut down</source>
+<target>Sulje</target>
<source>Hibernate</source>
<target>Horrostila</target>
@@ -453,15 +465,12 @@ Komentokehoite suoritetaan kun:
<source>1. &Compare</source>
<target>1. &Vertaa</target>
-<source>2. &Synchronize...</source>
-<target>2. &Täsmäytä...</target>
+<source>2. &Synchronize</source>
+<target>2. &Täsmäytä</target>
<source>&New</source>
<target>&Uusi</target>
-<source>&Program</source>
-<target>&Ohjelma</target>
-
<source>&Language</source>
<target>&Kieli</target>
@@ -489,8 +498,8 @@ Komentokehoite suoritetaan kun:
<source>&Abort</source>
<target>&Lopeta</target>
-<source>Synchronize...</source>
-<target>Täsmäytä...</target>
+<source>Synchronize</source>
+<target>Täsmäytä</target>
<source>Start synchronization</source>
<target>Käynnistä täsmäytys</target>
@@ -504,12 +513,12 @@ Komentokehoite suoritetaan kun:
<source>Swap sides</source>
<target>Puolten vaihto</target>
-<source>Save current configuration to file</source>
-<target>Tallenna nämä asetukset tiedostoon</target>
-
<source>Load configuration from file</source>
<target>Lataa asetuksia tiedostosta</target>
+<source>Save current configuration to file</source>
+<target>Tallenna nämä asetukset tiedostoon</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Viimeksi käytetty asetus (poista listalta paina DEL)</target>
@@ -519,14 +528,14 @@ Komentokehoite suoritetaan kun:
<source>Hide filtered or temporarily excluded files</source>
<target>Piilota suodatetut ja tilapäisesti poistetut</target>
-<source>Number of files and directories that will be created</source>
-<target>Kirjataan tiedostojen ja hakemistojen lukumäärää</target>
+<source>Number of files and folders that will be created</source>
+<target>Luotavien tiedostojen ja hakemistojen määrä</target>
<source>Number of files that will be overwritten</source>
-<target>Ylikirjoitettavien tiedostojen ja hakemistojen lukumäärä</target>
+<target>Korvattavien tiedostojen ja hakemistojen määrä</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Poistetaan tiedostojen ja hakemistojen lukumäärää</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Poistettavien tiedostojen ja hakemistojen määrä</target>
<source>Total amount of data that will be transferred</source>
<target>Siirrettävän datan määrä</target>
@@ -549,8 +558,8 @@ Komentokehoite suoritetaan kun:
<source>Batch job</source>
<target>Eräajo</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Luo eräajotiedosto automatisoidaksesi täsmäytyksen. Käynnistä tuplaklikkaamalla tai suorita komento: FreeFileSync.exe SyncJob.ffs_batch. Voit ajastaa eräajo Tehtävien ajoitus -toiminnolla.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Täsmäytyken automatisoinnen eräajotiedoston teko. Tehtävien ajoitus; Tuplaklikkaa tai ajoita tämä tiedosto: FreeFileSync.exe <job name>.ffs_batch</target>
<source>Help</source>
<target>Ohje</target>
@@ -576,21 +585,12 @@ Komentokehoite suoritetaan kun:
<source>Maximum number of log files:</source>
<target>Lokitiedostojen enimmäismäärä:</target>
-<source>Select log file directory:</source>
-<target>Lokitiedoston hakemisto:</target>
+<source>Select folder to save log files:</source>
+<target>Lokitiedostojen tallennushakemisto:</target>
<source>Batch settings</source>
<target>Eräajo asetukset</target>
-<source>&Save</source>
-<target>&Tallenna</target>
-
-<source>&Load</source>
-<target>&Lataa</target>
-
-<source>Cancel</source>
-<target>Lopeta</target>
-
<source>Select variant:</source>
<target>Valitse vaihtoehto:</target>
@@ -615,29 +615,23 @@ Komentokehoite suoritetaan kun:
<source>Configuration</source>
<target>Asetukset</target>
-<source>Category</source>
-<target>Luokka</target>
-
-<source>Action</source>
-<target>Suorita</target>
-
-<source>File/folder exists on left side only</source>
-<target>Tiedosto/hakemisto löytyy vain vasemmalta</target>
+<source>Item exists on left side only</source>
+<target>Kohde löytyy vain vasemmalta</target>
-<source>File/folder exists on right side only</source>
-<target>Tiedosto/hakemisto löytyy vain oiealta</target>
+<source>Item exists on right side only</source>
+<target>Kohde löytyy vain oikealta</target>
-<source>Left file is newer</source>
-<target>Vasen tiedosto uudempi</target>
+<source>Left side is newer</source>
+<target>Uudempi vasemmalla</target>
-<source>Right file is newer</source>
-<target>Oikea tiedosto uudempi</target>
+<source>Right side is newer</source>
+<target>Uudempi oikealla</target>
-<source>Files have different content</source>
-<target>Tiedostojen sisältö on erilaisia</target>
+<source>Items have different content</source>
+<target>Kohteilla eri sisältö</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Poikkeaman/tiedoston luokittelu ei onnistu</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Ristiriita, ei määriteltävissä</target>
<source>OK</source>
<target>OK</target>
@@ -714,9 +708,6 @@ on sama
<source>&Ignore</source>
<target>&Unohda</target>
-<source>&Retry</source>
-<target>&Uudestaan</target>
-
<source>Do not show this dialog again</source>
<target>Älä enää näytä valintaikkunaa</target>
@@ -747,33 +738,6 @@ Vain tiedostot, jotka vastaavat kaikkia suodattimen asetuksia synkronoidaan.
Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
</target>
-<source>Hints:</source>
-<target>Vihje:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Anna tiedostojen tai hakemistojen suhteelliset nimet eroteltuina ';' tai rivivaihto</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Käytä jokerimerkkejä '*' ja '?' .</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Sulje tiedostoja pois suoraan pääikkunassa viitehakemiston avulla.</target>
-
-<source>Example</source>
-<target>Esimerkki</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Sisällytä : *.doc;*.zip;*.exe
-Sulje pois: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Täsmäytä kaikki .doc, .zip und .exe tiedostot paitsi kaikki hakemistossa "temp" olevat.</target>
-
<source>Include</source>
<target>Sisällytä</target>
@@ -795,8 +759,8 @@ Sulje pois: \stuff\temp\*
<source>&Default</source>
<target>&Vakio</target>
-<source>Transactional file copy</source>
-<target>Transaktio pohjainen kopiointi</target>
+<source>Fail-safe file copy</source>
+<target>Varmennettu tiedostokopiointi</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Kirjoittaa ensin tilapäistiedostoon (*.ffs_tmp) ja nimeä sen uudestaan. Varmistaa eheyden myös Vakavan Virheen tapahtuessa.</target>
@@ -810,8 +774,8 @@ Sulje pois: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Kopioi tiedoston käyttöoikeuksia</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Siirrä tiedosto- ja hakemisto-oikeuksia (Vaatii Järjestelmävalvojan oikeuksia)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Kopioi tiedosto ja hakemisto käyttöoikeuksia (Pääkäyttäjän oikeudet tarvitaan)</target>
<source>Restore hidden dialogs</source>
<target>Palauta piilotetut ikkunat</target>
@@ -982,16 +946,16 @@ Sulje pois: \stuff\temp\*
<target>Näytä oikealta poistettavat tiedostot</target>
<source>Hide files that will be overwritten on left side</source>
-<target>Piilota tiedostot jotka ylikirjoitetaan vasemmalla</target>
+<target>Piilota tiedostot jotka korvataan vasemmalla</target>
<source>Show files that will be overwritten on left side</source>
-<target>Näytä vasemmalla ylikirjoitettavat tiedostot</target>
+<target>Näytä vasemmalla korvattavat tiedostot</target>
<source>Hide files that will be overwritten on right side</source>
-<target>Piilota tiedostot jotka ylikirjoitetaan oikealla</target>
+<target>Piilota tiedostot jotka korvataan oikealla</target>
<source>Show files that will be overwritten on right side</source>
-<target>Näytä oikealla ylikirjoitettavat tiedostot</target>
+<target>Näytä oikealla korvattavat tiedostot</target>
<source>Hide files that won't be copied</source>
<target>Piilota tiedostot jotka eivät kopioida</target>
@@ -1119,10 +1083,10 @@ Sulje pois: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Liitä ulkoinen sovellus viitekehysvalikkoon. Seuraavat makrot ovat valittavissa:</target>
-<source>- full file or directory name</source>
-<target>- tiedoston tai hakemiston koko nimi</target>
+<source>- full file or folder name</source>
+<target>- tiedoston/hakemiston koko nimi</target>
-<source>- directory part only</source>
+<source>- folder part only</source>
<target>- vain hakemisto-osa</target>
<source>- Other side's counterpart to %name</source>
@@ -1159,16 +1123,16 @@ Sulje pois: \stuff\temp\*
<target>Poista pysyvästi</target>
<source>Delete or overwrite files permanently</source>
-<target>Poista tai ylikirjoita tiedostoja pysyvästi</target>
+<target>Poista tai korvaa tiedostoja pysyvästi</target>
<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Käytä Roskakoria kun poistat tai ylikirjoitat tiedostoja</target>
+<target>Käytä Roskakoria kun poistat tai korvaat tiedostoja</target>
<source>Versioning</source>
<target>Versiointi</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Siirrä tiedostot aikaleimattuun hakemistoon</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Siirrä tiedostot aikaleimattuun alihakemistoon</target>
<source>Files</source>
<target>Tiedostot</target>
@@ -1263,8 +1227,8 @@ Sulje pois: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>Hakemisto %x ei voida lukea.</target>
-<source>Endless loop.</source>
-<target>Ääretön silmukka.</target>
+<source>Detected endless directory recursion.</source>
+<target>Päättymätön hakemiston toisto.</target>
<source>Cannot set privilege %x.</source>
<target>Oikeuksia %x ei voitu asettaa.</target>
@@ -1288,15 +1252,12 @@ Sulje pois: \stuff\temp\*
<target>Tiedostoa ei käsitelty viime täsmäyksessä!</target>
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
-<target>Aseta oletussuunta täsmäykselle: Vanhat tiedostot ylikirjoitetaan uudemilla tiedostoilla.</target>
-
-<source>The file does not contain a valid configuration:</source>
-<target>Asetustiedosto ei ole kelvollinen:</target>
+<target>Aseta oletussuunta täsmäykselle: Vanhat tiedostot korvataan uudemilla tiedostoilla.</target>
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Jätää virhe huomiotta ja tulkitse hakemisto tyhjäksi.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Ohita tämä virhe ja oleta hakemisto tyhjäksi.</target>
-<source>Cannot find directory %x.</source>
+<source>Cannot find folder %x.</source>
<target>Hakemisto %x ei löydy.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
@@ -1329,20 +1290,20 @@ Sulje pois: \stuff\temp\*
<source>Both sides are equal</source>
<target>Puolet ovat identtiset</target>
-<source>Files/folders differ in attributes only</source>
-<target>Tiedostot/hakemistot eroavat vain ominaisuuksiltaan</target>
+<source>Items have different attributes</source>
+<target>Kohteilla poikkeavat ominaisuudet</target>
-<source>Copy new file/folder to left</source>
-<target>Kopioi uusi tiedosto/hakemisto vasemmalle</target>
+<source>Copy new item to left</source>
+<target>Monista uusi vasemmalle</target>
-<source>Copy new file/folder to right</source>
-<target>Kopioi uusi tiedosto/hakemisto oikealle</target>
+<source>Copy new item to right</source>
+<target>Monista uusi oikealle</target>
-<source>Delete left file/folder</source>
-<target>Poista tiedosto/hakemisto vasemmalta</target>
+<source>Delete left item</source>
+<target>Poista vasen</target>
-<source>Delete right file/folder</source>
-<target>Poista tiedosto/hakemisto oikealta</target>
+<source>Delete right item</source>
+<target>Poista oikea</target>
<source>Move file on left</source>
<target>Siirä vasen tiedosto</target>
@@ -1350,20 +1311,20 @@ Sulje pois: \stuff\temp\*
<source>Move file on right</source>
<target>Siirrä oikea tiedosto</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Ylikirjoita vasen tiedosto/hakemista oikealla olevalla</target>
+<source>Overwrite left item</source>
+<target>Korvaa vasen</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Ylikirjoita oikea tiedosto/hakemista vasemmalla olevalla</target>
+<source>Overwrite right item</source>
+<target>Korvaa oikea</target>
<source>Do nothing</source>
<target>Älä tee mitään</target>
-<source>Copy file attributes only to left</source>
-<target>Monista tiedosto-ominaisuudet vasemmalle</target>
+<source>Update attributes on left</source>
+<target>Päivitä oikeudet vasemmalla</target>
-<source>Copy file attributes only to right</source>
-<target>Monista tiedosto-ominaisuudet oikealle</target>
+<source>Update attributes on right</source>
+<target>Päivitä oikeudet oikealla</target>
<source>Multiple...</source>
<target>Moninkertainen...</target>
@@ -1416,11 +1377,11 @@ Sulje pois: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Päivitän %x:n ominaisuudet</target>
-<source>Target directory name must not be empty!</source>
-<target>Kohdehakemiston nimi ei saa olla tyhjä!</target>
+<source>Target folder name must not be empty.</source>
+<target>Kohdehakemistolla on oltava nimi.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Tiedostoversioinnin hakemisto on antamatta!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Versioinnin kohdehakemistolla on oltava nimi.</target>
<source>Source directory %x not found.</source>
<target>Lähdehakemisto %x ei löydy.</target>
@@ -1449,14 +1410,17 @@ Sulje pois: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Roskakori puuttuu näistä polusta! Tiedostot poistetaan pysyvästi:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Yksi moniosaisen hakemistoparin hakemisto muutetaan! Tarkista täsmäysasetuksia!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Moniosaisen hakemistoparin hakemistoa muutetaan. Tarkista täsmäytyksen asetuksia.</target>
<source>Processing folder pair:</source>
<target>Käsitellään hakemistoparia:</target>
<source>Generating database...</source>
-<target>Luodaan tietokantaa...</target>
+<target>
+Tietokanta luodaan.
+..
+</target>
<source>Data verification error: Source and target file have different content!</source>
<target>Tiedon varmennusvirhe: Lähteellä ja kohteella on eri sisältö!</target>
diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng
index 2fca8158..65759025 100644
--- a/BUILD/Languages/french.lng
+++ b/BUILD/Languages/french.lng
@@ -7,8 +7,8 @@
<plural definition>n <= 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Recherche du répertoire %x...</target>
+<source>Searching for folder %x...</source>
+<target>Recherche du dossier %x...</target>
<source>Show in Explorer</source>
<target>Montrer dans l'explorateur</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSync - Synchronisation Automatisée</target>
+<source>Error</source>
+<target>Erreur</target>
+
<source>Select alternate comparison settings</source>
<target>Choisir d'autres paramètres de comparaison</target>
<source>Select alternate synchronization settings</source>
<target>Sélectionner une autre configuration de la synchronisation</target>
-<source>No filter selected</source>
-<target>Aucun filtre sélectionné</target>
-
<source>Filter is active</source>
<target>Le filtre est actif</target>
+<source>No filter selected</source>
+<target>Aucun filtre sélectionné</target>
+
<source>Remove alternate settings</source>
<target>Supprimer les paramètres de rechange</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>A propos de</target>
-<source>Error</source>
-<target>Erreur</target>
-
<source>Warning</source>
<target>Attention</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Paramètres généraux</target>
-<source>Synchronization Preview</source>
-<target>Prévisualisation de la Synchronisation</target>
+<source>Summary</source>
+<target>Résumé</target>
<source>Find</source>
<target>Chercher</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Parcourir</target>
-<source>Invalid command line: %x</source>
-<target>Ligne de commande incorrecte : %x</target>
+<source>Invalid command line:</source>
+<target>Ligne de commande incorrecte :</target>
<source>Info</source>
<target>Info</target>
@@ -226,29 +226,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>Le nom de volume %x ne fait pas partie du nom de fichier %y !</target>
-<source>Cannot find file %x.</source>
-<target>Impossible de trouver le fichier %x.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Impossible de lire les données XML suivantes :</target>
-<source>S&ave configuration...</source>
-<target>S&auvegarder la configuration...</target>
+<source>Cannot find file %x.</source>
+<target>Impossible de trouver le fichier %x.</target>
-<source>&Load configuration...</source>
-<target>&Charger la configuration...</target>
+<source>&Open...</source>
+<target>&Ouvrir...</target>
+
+<source>&Save...</source>
+<target>&Sauvegarder...</target>
<source>&Quit</source>
<target>&Quitter</target>
-<source>&File</source>
-<target>&Fichier</target>
+<source>&Program</source>
+<target>&Actions</target>
<source>&Content</source>
<target>&Contenu</target>
-<source>&About...</source>
-<target>&A propos de...</target>
+<source>&About</source>
+<target>&A propos de</target>
<source>&Help</source>
<target>&Aide</target>
@@ -256,8 +256,8 @@
<source>Usage:</source>
<target>Utilisation :</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Sélectionner les répertoires à surveiller.</target>
+<source>1. Select folders to watch.</source>
+<target>1. Choisir les dossiers à examiner.</target>
<source>2. Enter a command line.</source>
<target>2. Entrez une ligne de commande.</target>
@@ -265,19 +265,11 @@
<source>3. Press 'Start'.</source>
<target>3. Cliquez sur 'Démarrer'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-La ligne de commande est exécutée chaque fois que :
-- tous les répertoires deviennent accessibles (par exemple, lors de l'insertion d'une clé USB)
-- les fichiers de ces répertoires ou sous-répertoires sont modifiés
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Pour démarrer il faur importer un fichier .ffs_batch.</target>
-<source>Directories to watch</source>
-<target>Réperoires à surveiller</target>
+<source>Folders to watch</source>
+<target>Dossiers à examiner</target>
<source>Add folder</source>
<target>Ajout d'un dossier</target>
@@ -288,18 +280,35 @@ La ligne de commande est exécutée chaque fois que :
<source>Select a folder</source>
<target>Choisissez un dossier</target>
+<source>Delay [seconds]</source>
+<target>Latence [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>Minimum Idle Time [seconds]</source>
-<target>Délai minimum (secondes)</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Temps mort entre la détection de la dernière modification et l'éxécution de la ligne de commande en secondes</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+La commande est déclenchée si :
+- un fichier ou un dossier est modifié
+- un nouveau dossier apparait (par exemple : insertion d'une clé USB)
+</target>
<source>Start</source>
<target>Démarrer</target>
+<source>&Retry</source>
+<target>&Réessayer</target>
+
+<source>Cancel</source>
+<target>Annuler</target>
+
<source>(Build: %x)</source>
<target>(Généré : %x)</target>
@@ -318,8 +327,8 @@ La ligne de commande est exécutée chaque fois que :
<source>Waiting for missing directories...</source>
<target>En attente des répertoires absents ...</target>
-<source>A directory input field is empty.</source>
-<target>Un champ répertoire est vide</target>
+<source>An input folder name is empty.</source>
+<target>Le nom d'un dossier entré est vide.</target>
<source>Logging</source>
<target>Connexion</target>
@@ -405,8 +414,8 @@ La ligne de commande est exécutée chaque fois que :
<source><Symlink></source>
<target><Lien_symbolique></target>
-<source><Directory></source>
-<target><Répertoire></target>
+<source><Folder></source>
+<target><Dossier></target>
<source>Full path</source>
<target>Chemin complet</target>
@@ -417,8 +426,8 @@ La ligne de commande est exécutée chaque fois que :
<source>Relative path</source>
<target>Chemin relatif</target>
-<source>Directory</source>
-<target>Répertoire</target>
+<source>Base folder</source>
+<target>Dossier de base</target>
<source>Size</source>
<target>Taille</target>
@@ -429,8 +438,11 @@ La ligne de commande est exécutée chaque fois que :
<source>Extension</source>
<target>Extension</target>
-<source>Comparison Result</source>
-<target>Résultat de la comparaison</target>
+<source>Action</source>
+<target>Action</target>
+
+<source>Category</source>
+<target>Catégorie</target>
<source>Drag && drop</source>
<target>Glisser && Déposer</target>
@@ -438,14 +450,14 @@ La ligne de commande est exécutée chaque fois que :
<source>Close progress dialog</source>
<target>Fermer la fenêtre de progression</target>
-<source>Shut down</source>
-<target>Arrêter</target>
+<source>Standby</source>
+<target>Pause</target>
<source>Log off</source>
<target>Quitter</target>
-<source>Standby</source>
-<target>Pause</target>
+<source>Shut down</source>
+<target>Arrêter</target>
<source>Hibernate</source>
<target>Figer</target>
@@ -453,15 +465,12 @@ La ligne de commande est exécutée chaque fois que :
<source>1. &Compare</source>
<target>1. &Comparer</target>
-<source>2. &Synchronize...</source>
-<target>2. &Synchroniser...</target>
+<source>2. &Synchronize</source>
+<target>2. &Synchroniser</target>
<source>&New</source>
<target>&Nouveau</target>
-<source>&Program</source>
-<target>&Actions</target>
-
<source>&Language</source>
<target>&Langue</target>
@@ -489,8 +498,8 @@ La ligne de commande est exécutée chaque fois que :
<source>&Abort</source>
<target>&Abandonner</target>
-<source>Synchronize...</source>
-<target>Synchroniser...</target>
+<source>Synchronize</source>
+<target>Synchroniser</target>
<source>Start synchronization</source>
<target>Démarrer la synchronisation</target>
@@ -504,12 +513,12 @@ La ligne de commande est exécutée chaque fois que :
<source>Swap sides</source>
<target>Permuter les côtés</target>
-<source>Save current configuration to file</source>
-<target>Enregistrer la configuration actuelle</target>
-
<source>Load configuration from file</source>
<target>Charger la configuration à partir du fichier</target>
+<source>Save current configuration to file</source>
+<target>Enregistrer la configuration actuelle</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Dernière configuration utilisée (Appuyez sur SUPPR pour l'enlever de la liste)</target>
@@ -519,14 +528,14 @@ La ligne de commande est exécutée chaque fois que :
<source>Hide filtered or temporarily excluded files</source>
<target>Masquer les fichiers filtrés ou exclus temporairement</target>
-<source>Number of files and directories that will be created</source>
-<target>Nombre de fichiers et de répertoires qui seront créés</target>
+<source>Number of files and folders that will be created</source>
+<target>Nombre de fichiers et de dossiers qui seront créés</target>
<source>Number of files that will be overwritten</source>
<target>Nombre de fichiers qui seront remplacés</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Nombre de fichiers et de répertoires qui seront supprimés</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Nombre de fichiers et de dossiers qui seront supprimés</target>
<source>Total amount of data that will be transferred</source>
<target>Volume de données à transférer</target>
@@ -549,8 +558,8 @@ La ligne de commande est exécutée chaque fois que :
<source>Batch job</source>
<target>Traitement batch</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Crée un fichier batch et une synchronisation automatique. Pour démarrer en mode batch double-cliquez sur ce fichier ou exécutez la commande : FreeFileSync.exe SyncJob.ffs_batch. Vous pouvez aussi utilisez le planificateur de tâches de votre système.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Créer un fichier batch pour automatiser la synchronisation. Double-cliquez sur ce fichier ou entrez-le dans le plannificateur de tâches : FreeFileSync.exe <job name>.ffs_batch</target>
<source>Help</source>
<target>Aide</target>
@@ -576,21 +585,12 @@ La ligne de commande est exécutée chaque fois que :
<source>Maximum number of log files:</source>
<target>Nombre maximum de fichiers Log</target>
-<source>Select log file directory:</source>
-<target>Choisissez un dossier pour le fichier .log :</target>
+<source>Select folder to save log files:</source>
+<target>Choisissez un dossier pour sauvegarder les fichiers log :</target>
<source>Batch settings</source>
<target>Configuration du traitement batch</target>
-<source>&Save</source>
-<target>&Sauvegarder</target>
-
-<source>&Load</source>
-<target>&Charger</target>
-
-<source>Cancel</source>
-<target>Annuler</target>
-
<source>Select variant:</source>
<target>Choisissez une variante :</target>
@@ -615,29 +615,23 @@ La ligne de commande est exécutée chaque fois que :
<source>Configuration</source>
<target>Configuration</target>
-<source>Category</source>
-<target>Catégorie</target>
-
-<source>Action</source>
-<target>Action</target>
-
-<source>File/folder exists on left side only</source>
-<target>Fichier/Dossier existant seulement à gauche</target>
+<source>Item exists on left side only</source>
+<target>Cet élément existe seulement à gauche</target>
-<source>File/folder exists on right side only</source>
-<target>Fichier/Dossier existant seulement à droite</target>
+<source>Item exists on right side only</source>
+<target>Cet élément existe seulement à droite</target>
-<source>Left file is newer</source>
-<target>Le fichier à gauche est nouveau</target>
+<source>Left side is newer</source>
+<target>L'élément de gauche est plus récent</target>
-<source>Right file is newer</source>
-<target>Le fichier à droite est nouveau</target>
+<source>Right side is newer</source>
+<target>L'élément de droite est plus récent</target>
-<source>Files have different content</source>
-<target>Les fichiers ont un contenu différent</target>
+<source>Items have different content</source>
+<target>Les élement ont un contenu différent</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Conflit ou fichier indéterminé</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Conflit/élément impossible à classer</target>
<source>OK</source>
<target>OK</target>
@@ -714,9 +708,6 @@ est identique
<source>&Ignore</source>
<target>&Ignorer</target>
-<source>&Retry</source>
-<target>&Réessayer</target>
-
<source>Do not show this dialog again</source>
<target>Ne plus afficher ce message la prochaine fois</target>
@@ -747,33 +738,6 @@ Seuls les fichiers correspondant à tous les paramètres de filtrage seront sync
Attention : les noms de fichiers doivent être relatifs aux répertoires de base !
</target>
-<source>Hints:</source>
-<target>Conseils :</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Entrez les noms relatifs des fichiers ou des répertoires séparés par un ';' ou par un passage à la ligne.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Les caractères génériques '*' et '?' sont acceptés.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Exclure les fichiers directement sur le tableau principal à l'aide du menu contextuel.</target>
-
-<source>Example</source>
-<target>Exemple</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Synchroniser tous les fichiers .doc, .zip et .exe sauf ceux du dossier "temp".</target>
-
<source>Include</source>
<target>Inclure</target>
@@ -795,8 +759,8 @@ Exclude: \stuff\temp\*
<source>&Default</source>
<target>&Défaut</target>
-<source>Transactional file copy</source>
-<target>Copie de fichiers transactionnelle</target>
+<source>Fail-safe file copy</source>
+<target>Copie de fichiers sécurisé</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Ecrit d'abord dans un fichier temporaire (*.ffs_tmp), puis le renomme. Ceci guarantit la cohérence des données même en cas d'erreur fatale.</target>
@@ -810,8 +774,8 @@ Exclude: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Copie des droits d'accès aux fichiers</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Transfert des attributs système des fichiers et des répertoires (avec les droits administrateur)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Transférer les permissions des fichiers et des dossiers (Nécessite les droits administrateur)</target>
<source>Restore hidden dialogs</source>
<target>Afficher les boîtes de dialogue masquées</target>
@@ -1119,11 +1083,11 @@ Exclude: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Inclure les applications externes dans le menu contextuel. Les macros suivantes sont disponibles :</target>
-<source>- full file or directory name</source>
-<target>- nom complet du fichier ou du répertoire</target>
+<source>- full file or folder name</source>
+<target>- nom du fichier ou du dossier complet</target>
-<source>- directory part only</source>
-<target>- seulement les répertoires</target>
+<source>- folder part only</source>
+<target>- Partie dossier seulement</target>
<source>- Other side's counterpart to %name</source>
<target>- équivalent de %name de l'autre côté</target>
@@ -1167,8 +1131,8 @@ Exclude: \stuff\temp\*
<source>Versioning</source>
<target>Choisir un dossier</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Déplacer les fichiers vers un sous-répertoire daté</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Déplacer les fichiers dans un sous-dossier horodaté</target>
<source>Files</source>
<target>Fichiers</target>
@@ -1263,8 +1227,8 @@ Exclude: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>Impossible de lire le répertoire %x.</target>
-<source>Endless loop.</source>
-<target>Boucle infinie.</target>
+<source>Detected endless directory recursion.</source>
+<target>Une boucle sans fin détectée dans un répertoire.</target>
<source>Cannot set privilege %x.</source>
<target>Impossible de fixer le privilège %x.</target>
@@ -1290,14 +1254,11 @@ Exclude: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Directions de la synchronisation par défaut : les anciens fichiers seront remplacés par les nouveaux.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Le fichier ne contient pas de configuration valide :</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Vous pouvez ignorer cette erreur en considérant le répertoire comme vide.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Vous pouvez ignorer cette erreur en considérant le dossier comme vide.</target>
-<source>Cannot find directory %x.</source>
-<target>Impossible de trouver le répertoire %x.</target>
+<source>Cannot find folder %x.</source>
+<target>Impossible de trouver le dossier %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>Les répertoires sont imbriqués ! Attention à la mise à jour des règles de synchronisation :</target>
@@ -1329,20 +1290,20 @@ Exclude: \stuff\temp\*
<source>Both sides are equal</source>
<target>Les deux cotés sont identiques</target>
-<source>Files/folders differ in attributes only</source>
-<target>Fichiers/Dossiers différant seulement par leurs attributs</target>
+<source>Items have different attributes</source>
+<target>Les éléments ont des attributs différents</target>
-<source>Copy new file/folder to left</source>
-<target>Copier les nouveaux fichiers/dossiers à gauche</target>
+<source>Copy new item to left</source>
+<target>Copie du nouvel élément à gauche</target>
-<source>Copy new file/folder to right</source>
-<target>Copier les nouveaux fichiers/dossiers à droite</target>
+<source>Copy new item to right</source>
+<target>Copie du nouvel élément à droite</target>
-<source>Delete left file/folder</source>
-<target>Supprimer les fichiers/dossiers de gauche</target>
+<source>Delete left item</source>
+<target>Suppression de l'élément de gauche</target>
-<source>Delete right file/folder</source>
-<target>Supprimer les fichiers/dossiers de droite</target>
+<source>Delete right item</source>
+<target>Suppression de l'élément de droite</target>
<source>Move file on left</source>
<target>Déplacer les fichiers à gauche</target>
@@ -1350,20 +1311,20 @@ Exclude: \stuff\temp\*
<source>Move file on right</source>
<target>Déplacer les fichiers à droite</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Remplacer le fichier/dossier de gauche avec celui de droite</target>
+<source>Overwrite left item</source>
+<target>Remplacement de l'élément de gauche</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Remplacer le fichier/dossier de droite avec celui de gauche</target>
+<source>Overwrite right item</source>
+<target>Remplacement de l'élément de droite</target>
<source>Do nothing</source>
<target>Ne rien faire</target>
-<source>Copy file attributes only to left</source>
-<target>Copier seulement les attributs du fichier à gauche</target>
+<source>Update attributes on left</source>
+<target>Mise à jour des attributs à gauche</target>
-<source>Copy file attributes only to right</source>
-<target>Copier seulement les attributs du fichier à droite</target>
+<source>Update attributes on right</source>
+<target>Mise à jour des attributs à droite</target>
<source>Multiple...</source>
<target>Multiple...</target>
@@ -1416,11 +1377,11 @@ Exclude: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Mise à jour des attributs de %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Le répertoire destination ne doit pas être vide !</target>
+<source>Target folder name must not be empty.</source>
+<target>Le nom du dossier Destination ne doit pas etre vide.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Le répertoire des versions de fichiers n'a pas été indiqué !</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Le nom du dossier Version ne doit pas être vide.</target>
<source>Source directory %x not found.</source>
<target>Impossible de trouver le répertoire source %x.</target>
@@ -1449,8 +1410,8 @@ Exclude: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>La corbeille n'est pas valable pour les chemins suivants ! Les fichiers seront détruits définitivement :</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Un répertoire faisant partie de paires multiples doit être modifié ! Vérifiez les paramètres de la synchronisation !</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Un dossier faisant partie de paires multiples sera modifié. Veuillez vérifier les paramètres de synchronisation.</target>
<source>Processing folder pair:</source>
<target>Traitement de la paire de dossiers :</target>
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index 96ebaf75..78f2c847 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -7,8 +7,8 @@
<plural definition>n == 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Suche Verzeichnis %x...</target>
+<source>Searching for folder %x...</source>
+<target>Suche Ordner %x...</target>
<source>Show in Explorer</source>
<target>Im Explorer anzeigen</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSync - Automatisierte Synchronisation</target>
+<source>Error</source>
+<target>Fehler</target>
+
<source>Select alternate comparison settings</source>
<target>Alternative Vergleichseinstellungen auswählen</target>
<source>Select alternate synchronization settings</source>
<target>Alternative Synchronisationseinstellungen auswählen</target>
-<source>No filter selected</source>
-<target>Kein Filter gesetzt</target>
-
<source>Filter is active</source>
<target>Filter ist aktiv</target>
+<source>No filter selected</source>
+<target>Kein Filter gesetzt</target>
+
<source>Remove alternate settings</source>
<target>Alternative Einstellungen entfernen</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>Über</target>
-<source>Error</source>
-<target>Fehler</target>
-
<source>Warning</source>
<target>Warnung</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Globale Einstellungen</target>
-<source>Synchronization Preview</source>
-<target>Synchronisationsvorschau</target>
+<source>Summary</source>
+<target>Zusammenfassung</target>
<source>Find</source>
<target>Suchen</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Auswählen</target>
-<source>Invalid command line: %x</source>
-<target>Ungültige Befehlszeile: %x</target>
+<source>Invalid command line:</source>
+<target>Ungültige Befehlszeile:</target>
<source>Info</source>
<target>Info</target>
@@ -226,29 +226,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>Laufwerksname %x ist kein Teil des Dateinamens %y!</target>
-<source>Cannot find file %x.</source>
-<target>Die Datei %x wurde nicht gefunden.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Die folgenden XML-Elemente können nicht gelesen werden:</target>
-<source>S&ave configuration...</source>
-<target>Konfiguration s&peichern...</target>
+<source>Cannot find file %x.</source>
+<target>Die Datei %x wurde nicht gefunden.</target>
+
+<source>&Open...</source>
+<target>Ö&ffnen...</target>
-<source>&Load configuration...</source>
-<target>Konfiguration &laden...</target>
+<source>&Save...</source>
+<target>&Speichern...</target>
<source>&Quit</source>
<target>&Beenden</target>
-<source>&File</source>
-<target>&Datei</target>
+<source>&Program</source>
+<target>&Programm</target>
<source>&Content</source>
<target>&Inhalt</target>
-<source>&About...</source>
-<target>&Über...</target>
+<source>&About</source>
+<target>&Über</target>
<source>&Help</source>
<target>&Hilfe</target>
@@ -256,8 +256,8 @@
<source>Usage:</source>
<target>Verwendung:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Zu überwachende Verzeichnisse wählen.</target>
+<source>1. Select folders to watch.</source>
+<target>1. Zu überwachende Ordner wählen.</target>
<source>2. Enter a command line.</source>
<target>2. Eine Befehlszeile angeben.</target>
@@ -265,46 +265,55 @@
<source>3. Press 'Start'.</source>
<target>3. 'Start' drücken.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Die Befehlszeile wird ausgeführt wenn:
-- alle Verzeichnisse verfügbar werden (z.B. beim Anschluss eines USB Sticks)
-- Dateien innerhalb dieser Verzeichnisse oder Unterverzeichnisse geändert werden
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Zum Schnelleinstieg einfach eine .ffs_batch Datei importieren.</target>
-<source>Directories to watch</source>
-<target>Zu überwachende Verzeichnisse</target>
+<source>Folders to watch</source>
+<target>Zu überwachende Ordner</target>
<source>Add folder</source>
-<target>Verzeichnis hinzufügen</target>
+<target>Ordner hinzufügen</target>
<source>Remove folder</source>
-<target>Verzeichnis entfernen</target>
+<target>Ordner entfernen</target>
<source>Select a folder</source>
-<target>Verzeichnis auswählen</target>
+<target>Ordner auswählen</target>
+
+<source>Delay [seconds]</source>
+<target>Verzögerung [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>Minimum Idle Time [seconds]</source>
-<target>Minimale Ruhezeit [Sekunden]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Ruhezeit zwischen Erkennung der letzten Änderung und Aufrufen der Kommandozeile in Sekunden</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Die Befehlszeile wird ausgelöst wenn:
+- Dateien oder Unterordner sich ändern
+- neue Ordner erscheinen (z.B. Anschluss eines USB Sticks)
+</target>
<source>Start</source>
<target>Start</target>
+<source>&Retry</source>
+<target>&Wiederholen</target>
+
+<source>Cancel</source>
+<target>Abbrechen</target>
+
<source>(Build: %x)</source>
<target>(Build: %x)</target>
-<source>RealtimeSync configuration</source>
-<target>RealtimeSync Konfiguration</target>
+<source>All files</source>
+<target>Alle Dateien</target>
<source>&Restore</source>
<target>&Wiederherstellen</target>
@@ -318,8 +327,8 @@ Die Befehlszeile wird ausgeführt wenn:
<source>Waiting for missing directories...</source>
<target>Warte auf fehlende Verzeichnisse...</target>
-<source>A directory input field is empty.</source>
-<target>Ein Verzeichniseingabefeld ist leer.</target>
+<source>An input folder name is empty.</source>
+<target>Der Name eines Eingabeordners ist leer.</target>
<source>Logging</source>
<target>Protokoll</target>
@@ -345,9 +354,6 @@ Die Befehlszeile wird ausgeführt wenn:
<source>FreeFileSync batch file</source>
<target>FreeFileSync Batchdatei</target>
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync Konfiguration</target>
-
<source>Batch execution</source>
<target>Batchlauf</target>
@@ -390,12 +396,12 @@ Die Befehlszeile wird ausgeführt wenn:
<source>Download now?</source>
<target>Jetzt herunterladen?</target>
-<source>Information</source>
-<target>Information</target>
-
<source>FreeFileSync is up to date!</source>
<target>FreeFileSync ist auf dem neuesten Stand!</target>
+<source>Information</source>
+<target>Information</target>
+
<source>Do you want FreeFileSync to automatically check for updates every week?</source>
<target>Soll FreeFileSync automatisch jede Woche nach Aktualisierungen suchen?</target>
@@ -405,8 +411,8 @@ Die Befehlszeile wird ausgeführt wenn:
<source><Symlink></source>
<target><Symlink></target>
-<source><Directory></source>
-<target><Verzeichnis></target>
+<source><Folder></source>
+<target><Ordner></target>
<source>Full path</source>
<target>Absoluter Pfad</target>
@@ -417,8 +423,8 @@ Die Befehlszeile wird ausgeführt wenn:
<source>Relative path</source>
<target>Relativer Pfad</target>
-<source>Directory</source>
-<target>Verzeichnis</target>
+<source>Base folder</source>
+<target>Basisordner</target>
<source>Size</source>
<target>Größe</target>
@@ -429,8 +435,11 @@ Die Befehlszeile wird ausgeführt wenn:
<source>Extension</source>
<target>Dateiendung</target>
-<source>Comparison Result</source>
-<target>Ergebnis des Vergleichs</target>
+<source>Action</source>
+<target>Aktion</target>
+
+<source>Category</source>
+<target>Kategorie</target>
<source>Drag && drop</source>
<target>Drag && Drop</target>
@@ -438,14 +447,14 @@ Die Befehlszeile wird ausgeführt wenn:
<source>Close progress dialog</source>
<target>Schließe Fortschrittsdialog</target>
-<source>Shut down</source>
-<target>Herunterfahren</target>
+<source>Standby</source>
+<target>Energie sparen</target>
<source>Log off</source>
<target>Abmelden</target>
-<source>Standby</source>
-<target>Energie sparen</target>
+<source>Shut down</source>
+<target>Herunterfahren</target>
<source>Hibernate</source>
<target>Ruhezustand</target>
@@ -453,15 +462,12 @@ Die Befehlszeile wird ausgeführt wenn:
<source>1. &Compare</source>
<target>1. &Vergleichen</target>
-<source>2. &Synchronize...</source>
-<target>2. &Synchronisieren...</target>
+<source>2. &Synchronize</source>
+<target>2. &Synchronisieren</target>
<source>&New</source>
<target>&Neu</target>
-<source>&Program</source>
-<target>&Programm</target>
-
<source>&Language</source>
<target>&Sprache</target>
@@ -489,27 +495,27 @@ Die Befehlszeile wird ausgeführt wenn:
<source>&Abort</source>
<target>&Abbrechen</target>
-<source>Synchronize...</source>
+<source>Synchronize</source>
<target>Synchronisieren</target>
<source>Start synchronization</source>
<target>Synchronisation starten</target>
<source>Add folder pair</source>
-<target>Verzeichnispaar hinzufügen</target>
+<target>Ordnerpaar hinzufügen</target>
<source>Remove folder pair</source>
-<target>Verzeichnispaar entfernen</target>
+<target>Ordnerpaar entfernen</target>
<source>Swap sides</source>
<target>Seiten vertauschen</target>
-<source>Save current configuration to file</source>
-<target>Aktuelle Konfiguration in Datei speichern</target>
-
<source>Load configuration from file</source>
<target>Konfiguration aus Datei laden</target>
+<source>Save current configuration to file</source>
+<target>Aktuelle Konfiguration in Datei speichern</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Zuletzt benutzte Konfigurationen (Entf-Taste löscht Einträge)</target>
@@ -519,21 +525,18 @@ Die Befehlszeile wird ausgeführt wenn:
<source>Hide filtered or temporarily excluded files</source>
<target>Gefilterte oder temporär ausgeschlossene Dateien ausblenden</target>
-<source>Number of files and directories that will be created</source>
-<target>Anzahl der zu erstellenden Dateien und Verzeichnisse</target>
+<source>Number of files and folders that will be created</source>
+<target>Anzahl der zu erstellenden Dateien und Ordner</target>
<source>Number of files that will be overwritten</source>
<target>Anzahl der zu überschreibenden Dateien</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Anzahl der zu löschenden Dateien und Verzeichnisse</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Anzahl der zu löschenden Dateien und Ordner</target>
<source>Total amount of data that will be transferred</source>
<target>Gesamtmenge der zu übertragenden Daten</target>
-<source>Operation:</source>
-<target>Vorgang:</target>
-
<source>Items found:</source>
<target>Gefundene Elemente:</target>
@@ -549,8 +552,8 @@ Die Befehlszeile wird ausgeführt wenn:
<source>Batch job</source>
<target>Batch-Job</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Erzeuge eine Batchdatei für die automatisierte Synchronisation. Um den Batchmodus zu starten, einfach auf diese Datei doppelklicken oder den Befehl ausführen: FreeFileSync.exe SyncJob.ffs_batch. Dies kann auch in den Taskplaner des Betriebssystems eingetragen werden.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Erstellt eine Batchdatei für die automatisierte Synchronisation. Anschließend die Datei doppelklicken oder in den Taskplaner des Betriebssystems eintragen: FreeFileSync.exe <Jobname>.ffs_batch.</target>
<source>Help</source>
<target>Hilfe</target>
@@ -576,21 +579,12 @@ Die Befehlszeile wird ausgeführt wenn:
<source>Maximum number of log files:</source>
<target>Maximale Anzahl an Logdateien:</target>
-<source>Select log file directory:</source>
-<target>Verzeichnis für Logdatei wählen:</target>
+<source>Select folder to save log files:</source>
+<target>Ordner zum Sichern der Logdateien wählen:</target>
<source>Batch settings</source>
<target>Batch Einstellungen</target>
-<source>&Save</source>
-<target>&Speichern</target>
-
-<source>&Load</source>
-<target>&Laden</target>
-
-<source>Cancel</source>
-<target>Abbrechen</target>
-
<source>Select variant:</source>
<target>Variante auswählen:</target>
@@ -598,10 +592,10 @@ Die Befehlszeile wird ausgeführt wenn:
<target>Identifiziere und propagiere Änderungen auf beiden Seiten mit Hilfe einer Datenbank. Löschungen, Umbenennungen und Konflikte werden automatisch erkannt.</target>
<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Spiegelkopie des linken Verzeichnisses erstellen. Das rechte Verzeichnis wird dem linken exakt angeglichen.</target>
+<target>Spiegelkopie des linken Ordners erstellen. Der rechte Ordner wird dem linken exakt angeglichen.</target>
<source>Copy new or updated files to right folder.</source>
-<target>Neue oder aktualisierte Dateien vom linken in das rechte Verzeichnis kopieren.</target>
+<target>Neue oder aktualisierte Dateien vom linken in den rechten Ordner kopieren.</target>
<source>Configure your own synchronization rules.</source>
<target>Eigene Synchronisationsregeln definieren.</target>
@@ -615,29 +609,23 @@ Die Befehlszeile wird ausgeführt wenn:
<source>Configuration</source>
<target>Konfiguration</target>
-<source>Category</source>
-<target>Kategorie</target>
+<source>Item exists on left side only</source>
+<target>Element existiert nur links</target>
-<source>Action</source>
-<target>Aktion</target>
-
-<source>File/folder exists on left side only</source>
-<target>Datei/Ordner existiert nur links</target>
-
-<source>File/folder exists on right side only</source>
-<target>Datei/Ordner existiert nur rechts</target>
+<source>Item exists on right side only</source>
+<target>Element existiert nur rechts</target>
-<source>Left file is newer</source>
-<target>Linke Datei ist neuer</target>
+<source>Left side is newer</source>
+<target>Linke Seite ist neuer</target>
-<source>Right file is newer</source>
-<target>Rechte Datei ist neuer</target>
+<source>Right side is newer</source>
+<target>Rechte Seite ist neuer</target>
-<source>Files have different content</source>
-<target>Dateien haben unterschiedlichen Inhalt</target>
+<source>Items have different content</source>
+<target>Elemente haben unterschiedlichen Inhalt</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Konflikt/Datei, die nicht eingeordnet werden kann</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Konflikt/Element, das nicht eingeordnet werden kann</target>
<source>OK</source>
<target>OK</target>
@@ -714,9 +702,6 @@ gleich ist
<source>&Ignore</source>
<target>&Ignorieren</target>
-<source>&Retry</source>
-<target>&Wiederholen</target>
-
<source>Do not show this dialog again</source>
<target>Diesen Dialog nicht mehr anzeigen</target>
@@ -747,33 +732,6 @@ Nur Dateien, die zu allen Filtereinstellungen passen, werden synchronisiert.
Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
</target>
-<source>Hints:</source>
-<target>Tipps:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Relative Datei- oder Verzeichnisnamen getrennt durch ';' oder eine Neuzeile eingeben.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Die Platzhalter '*' und '?' werden unterstützt.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Dateien können direkt über das Kontextmenü im Hauptfenster ausgeschlossen werden.</target>
-
-<source>Example</source>
-<target>Beispiel</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Einschließen: *.doc;*.zip;*.exe
-Ausschließen: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Alle .doc, .zip und .exe Dateien mit Ausnahme des Unterordners "temp" werden synchronisiert.</target>
-
<source>Include</source>
<target>Einschließen</target>
@@ -795,8 +753,8 @@ Ausschließen: \stuff\temp\*
<source>&Default</source>
<target>&Standard</target>
-<source>Transactional file copy</source>
-<target>Dateien als Transaktion kopieren</target>
+<source>Fail-safe file copy</source>
+<target>Dateien ausfallsicher kopieren</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Schreibe zunächst in eine temporäre Datei (*.ffs_tmp) und benenne diese anschließend um. Dadurch wird ein konsistenter Status auch im größten Fehlerfall sichergestellt.</target>
@@ -810,8 +768,8 @@ Ausschließen: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Dateizugriffsberechtigungen kopieren</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Übertrage Datei- und Verzeichnisberechtigungen (Benötigt Administratorrechte)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Übertrage Datei- und Ordnerberechtigungen (Benötigt Administratorrechte)</target>
<source>Restore hidden dialogs</source>
<target>Versteckte Dialoge wiederherstellen</target>
@@ -844,7 +802,7 @@ Ausschließen: \stuff\temp\*
<target>Hauptleiste</target>
<source>Folder pairs</source>
-<target>Verzeichnispaare</target>
+<target>Ordnerpaare</target>
<source>Overview</source>
<target>Übersicht</target>
@@ -913,7 +871,7 @@ Ausschließen: \stuff\temp\*
<target>Konfiguration geladen!</target>
<source>Folder Comparison and Synchronization</source>
-<target>Verzeichnisvergleich und Synchronisation</target>
+<target>Ordnervergleich und Synchronisation</target>
<source>Hide files that exist on left side only</source>
<target>Nur links existierende Dateien ausblenden</target>
@@ -1119,11 +1077,11 @@ Ausschließen: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Integriert externe Anwendungen in das Kontextmenü. Die folgenden Makros stehen zur Verfügung:</target>
-<source>- full file or directory name</source>
-<target>- kompletter Datei oder Verzeichnisname</target>
+<source>- full file or folder name</source>
+<target>- kompletter Datei oder Ordnername</target>
-<source>- directory part only</source>
-<target>- nur Verzeichnisanteil</target>
+<source>- folder part only</source>
+<target>- nur Ordneranteil</target>
<source>- Other side's counterpart to %name</source>
<target>- Entsprechung der anderen Seite zu %name</target>
@@ -1167,8 +1125,8 @@ Ausschließen: \stuff\temp\*
<source>Versioning</source>
<target>Versionierung</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Verschiebe Dateien in ein Unterverzeichnis mit Zeitstempel</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Verschiebe Dateien in einen Unterordner mit Zeitstempel</target>
<source>Files</source>
<target>Dateien</target>
@@ -1233,6 +1191,9 @@ Ausschließen: \stuff\temp\*
<source>Cannot write modification time of %x.</source>
<target>Die Änderungszeit von %x kann nicht geschrieben werden.</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Die Dateiattribute von %x können nicht geschrieben werden.</target>
+
<source>Cannot find system function %x.</source>
<target>Die Systemfunktion %x wurde nicht gefunden.</target>
@@ -1254,17 +1215,14 @@ Ausschließen: \stuff\temp\*
<source>Cannot copy symbolic link %x to %y.</source>
<target>Der Symbolische Link %x kann nicht nach %y kopiert werden.</target>
-<source>Cannot write file attributes of %x.</source>
-<target>Die Dateiattribute von %x können nicht geschrieben werden.</target>
-
<source>Cannot copy file %x to %y.</source>
<target>Die Datei %x kann nicht nach %y kopiert werden.</target>
<source>Cannot read directory %x.</source>
<target>Das Verzeichnis %x kann nicht gelesen werden.</target>
-<source>Endless loop.</source>
-<target>Endlosschleife.</target>
+<source>Detected endless directory recursion.</source>
+<target>Eine endlose Verzeichnisrekursion wurde erkannt.</target>
<source>Cannot set privilege %x.</source>
<target>Das Privileg %x kann nicht gesetzt werden.</target>
@@ -1290,14 +1248,11 @@ Ausschließen: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Setze Standardwerte für Synchronisationsrichtungen: Alte Dateien werden durch neuere überschrieben.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Die Datei enthält keine gültige Konfiguration:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Dieser Fehler kann ignoriert werden, um das Verzeichnis als leer anzusehen.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Dieser Fehler kann ignoriert werden, um den Ordner als leer anzusehen.</target>
-<source>Cannot find directory %x.</source>
-<target>Das Verzeichnis %x wurde nicht gefunden.</target>
+<source>Cannot find folder %x.</source>
+<target>Der Ordner %x wurde nicht gefunden.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>Die Verzeichnisse sind voneinander abhängig! Achtung beim Festlegen der Synchronisationsregeln:</target>
@@ -1329,20 +1284,20 @@ Ausschließen: \stuff\temp\*
<source>Both sides are equal</source>
<target>Beide Seiten sind gleich</target>
-<source>Files/folders differ in attributes only</source>
-<target>Dateien/Ordner unterscheiden sich nur in Attributen</target>
+<source>Items have different attributes</source>
+<target>Die Elemente haben unterschiedliche Attribute</target>
-<source>Copy new file/folder to left</source>
-<target>Kopiere neue Datei nach links</target>
+<source>Copy new item to left</source>
+<target>Kopiere neues Element nach links</target>
-<source>Copy new file/folder to right</source>
-<target>Kopiere neue Datei nach rechts</target>
+<source>Copy new item to right</source>
+<target>Kopiere neues Element nach rechts</target>
-<source>Delete left file/folder</source>
-<target>Lösche linke Datei</target>
+<source>Delete left item</source>
+<target>Lösche linkes Element</target>
-<source>Delete right file/folder</source>
-<target>Lösche rechte Datei</target>
+<source>Delete right item</source>
+<target>Lösche rechtes Element</target>
<source>Move file on left</source>
<target>Verschiebe linke Datei</target>
@@ -1350,20 +1305,20 @@ Ausschließen: \stuff\temp\*
<source>Move file on right</source>
<target>Verschiebe rechte Datei</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Überschreibe linke Datei mit rechter</target>
+<source>Overwrite left item</source>
+<target>Überschreibe linkes Element</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Überschreibe rechte Datei mit linker</target>
+<source>Overwrite right item</source>
+<target>Überschreibe rechtes Element</target>
<source>Do nothing</source>
<target>Nichts tun</target>
-<source>Copy file attributes only to left</source>
-<target>Kopiere nur die Dateiattribute nach links</target>
+<source>Update attributes on left</source>
+<target>Aktualisiere Attribute des linken Elements</target>
-<source>Copy file attributes only to right</source>
-<target>Kopiere nur die Dateiattribute nach rechts</target>
+<source>Update attributes on right</source>
+<target>Aktualisiere Attribute des rechten Elements</target>
<source>Multiple...</source>
<target>Verschiedene...</target>
@@ -1372,7 +1327,7 @@ Ausschließen: \stuff\temp\*
<target>Lösche Datei %x</target>
<source>Deleting folder %x</source>
-<target>Lösche Verzeichnis %x</target>
+<target>Lösche Ordner %x</target>
<source>Deleting symbolic link %x</source>
<target>Lösche Symbolischen Link %x</target>
@@ -1381,7 +1336,7 @@ Ausschließen: \stuff\temp\*
<target>Verschiebe Datei %x in den Papierkorb</target>
<source>Moving folder %x to recycle bin</source>
-<target>Verschiebe Verzeichnis %x in den Papierkorb</target>
+<target>Verschiebe Ordner %x in den Papierkorb</target>
<source>Moving symbolic link %x to recycle bin</source>
<target>Verschiebe Symbolischen Link %x in den Papierkorb</target>
@@ -1390,7 +1345,7 @@ Ausschließen: \stuff\temp\*
<target>Verschiebe Datei %x nach %y</target>
<source>Moving folder %x to %y</source>
-<target>Verschiebe Verzeichnis %x nach %y</target>
+<target>Verschiebe Ordner %x nach %y</target>
<source>Moving symbolic link %x to %y</source>
<target>Verschiebe Symbolischen Link %x nach %y</target>
@@ -1402,7 +1357,7 @@ Ausschließen: \stuff\temp\*
<target>Erstelle Symbolischen Link %x</target>
<source>Creating folder %x</source>
-<target>Erstelle Verzeichnis %x</target>
+<target>Erstelle Ordner %x</target>
<source>Overwriting file %x</source>
<target>Überschreibe Datei %x</target>
@@ -1416,11 +1371,11 @@ Ausschließen: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Aktualisiere Attribute von %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Der Zielverzeichnisname darf nicht leer sein!</target>
+<source>Target folder name must not be empty.</source>
+<target>Der Name des Zielordners darf nicht leer sein.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Das Verzeichnis für die Versionierung wurde nicht angegeben!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Der Ordnername für die Versionierung darf nicht leer sein.</target>
<source>Source directory %x not found.</source>
<target>Das Quellverzeichnis %x wurde nicht gefunden.</target>
@@ -1449,11 +1404,11 @@ Ausschließen: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Der Papierkorb ist auf nachfolgenden Verzeichnissen nicht verfügbar! Die Dateien werden stattdessen permanent gelöscht:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Ein Verzeichnis wird verändert werden, das Teil mehrerer Verzeichnispaare ist! Bitte überprüfen Sie die Synchronisationseinstellungen!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Ein Ordner wird verändert werden, der Teil mehrerer Ordnerpaare ist. Bitte überprüfen Sie die Synchronisationseinstellungen.</target>
<source>Processing folder pair:</source>
-<target>Bearbeite Verzeichnispaar:</target>
+<target>Bearbeite Ordnerpaar:</target>
<source>Generating database...</source>
<target>Erzeuge Synchronisationsdatenbank...</target>
diff --git a/BUILD/Languages/greek.lng b/BUILD/Languages/greek.lng
index 5d1dfa8a..0d750585 100644
--- a/BUILD/Languages/greek.lng
+++ b/BUILD/Languages/greek.lng
@@ -7,8 +7,8 @@
<plural definition>n == 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Αναζήτηση υποκαταλόγου %x...</target>
+<source>Searching for folder %x...</source>
+<target>Αναζήτηση του υποκαταλόγου %x...</target>
<source>Show in Explorer</source>
<target>Εμφάνιση στην Εξερεύνηση</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSync - Αυτοματοποιημένος Συγχρονισμός</target>
+<source>Error</source>
+<target>Σφάλματα</target>
+
<source>Select alternate comparison settings</source>
<target>Επιλογή διαφοροποιημένων ρυθμίσεων σύγκρισης</target>
<source>Select alternate synchronization settings</source>
<target>Επιλογή διαφοροποιημένων ρυθμίσεων συγχρονισμού</target>
-<source>No filter selected</source>
-<target>Δεν έχει επιλεχθεί φίλτρο</target>
-
<source>Filter is active</source>
<target>Το φίλτρο είναι ενεργό</target>
+<source>No filter selected</source>
+<target>Δεν έχει επιλεχθεί φίλτρο</target>
+
<source>Remove alternate settings</source>
<target>Διαγραφή των διαφοροποιημένων ρυθμίσεων</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>Σχετικά με το...</target>
-<source>Error</source>
-<target>Σφάλματα</target>
-
<source>Warning</source>
<target>Προειδοποίηση</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Γενικές ρυθμίσεις</target>
-<source>Synchronization Preview</source>
-<target>Προεπισκόπηση του συγχρονισμού</target>
+<source>Summary</source>
+<target>Σύνοψη</target>
<source>Find</source>
<target>Αναζήτηση</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Αναζήτηση</target>
-<source>Invalid command line: %x</source>
-<target>Σφάλμα στη γραμμή εντολών: %x</target>
+<source>Invalid command line:</source>
+<target>Σφάλμα στη γραμμή εντολών:</target>
<source>Info</source>
<target>Πληροφορία</target>
@@ -232,23 +232,23 @@
<source>Cannot read the following XML elements:</source>
<target>Δεν ήταν δυνατό να αναγνωσθούν τα ακόλουθα στοιχεία XML:</target>
-<source>S&ave configuration...</source>
-<target>Α&ποθήκευση διάταξης...</target>
+<source>&Open...</source>
+<target>Ά&νοιγμα...</target>
-<source>&Load configuration...</source>
-<target>&Άνοιγμα διάταξης...</target>
+<source>&Save...</source>
+<target>Α&ποθήκευση...</target>
<source>&Quit</source>
-<target>&Έξοδος</target>
+<target>Έ&ξοδος</target>
-<source>&File</source>
-<target>&Αρχείο</target>
+<source>&Program</source>
+<target>&Πρόγραμμα</target>
<source>&Content</source>
<target>&Περιεχόμενα</target>
-<source>&About...</source>
-<target>&Σχετικά...</target>
+<source>&About</source>
+<target>&Σχετικά</target>
<source>&Help</source>
<target>&Βοήθεια</target>
@@ -256,7 +256,7 @@
<source>Usage:</source>
<target>Χρήση:</target>
-<source>1. Select directories to monitor.</source>
+<source>1. Select folders to watch.</source>
<target>1. Επιλέξτε τους υποκαταλόγους που θα παρακολουθούνται.</target>
<source>2. Enter a command line.</source>
@@ -265,19 +265,11 @@
<source>3. Press 'Start'.</source>
<target>3. Πατήστε το 'Έναρξη'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Η γραμμή ενεργειών εκτελείται κάθε φορά που:
-- όλοι οι υποκατάλογοι γίνονται διαθέσιμοι (π.χ. εισαγωγή ενός USB stick)
-- κάποια αρχεία σε αυτούς τους καταλόγους ή υποκαταλόγους τους έχουν τροποποιηθεί
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Για να ξεκινήσετε μπορείτε απλά να εισάγεται ένα αρχείο .ffs_batch.</target>
-<source>Directories to watch</source>
-<target>Υποκατάλογοι για παρακολούθηση</target>
+<source>Folders to watch</source>
+<target>Υποκατάλογοι που θα παρακολουθούνται</target>
<source>Add folder</source>
<target>Προσθήκη υποκαταλόγου</target>
@@ -288,18 +280,35 @@ The command line is executed each time:
<source>Select a folder</source>
<target>Επιλογή υποκαταλόγου</target>
+<source>Delay [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>Minimum Idle Time [seconds]</source>
-<target>Ελάχιστος Χρόνος Αναμονής [δευτερόλεπτα]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Χρόνος αναμονής μεταξύ της ανίχνευσης της τελευταίας αλλαγής και της εκτέλεσης της γραμμής εντολών [δευτερόλεπτα]</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Αυτή η εντολή πραγματοποιείται εάν:
+-αρχεία ή υποκτάλογοι αλλάξουν
+-παρουσιαστούν νέοι υποκατάλογοι (π.χ. εισαχθεί ένα φλασάκι USB)
+</target>
<source>Start</source>
<target>Έναρξη</target>
+<source>&Retry</source>
+<target>&Επανάληψη</target>
+
+<source>Cancel</source>
+<target>Άκυρο</target>
+
<source>(Build: %x)</source>
<target>(Δημιουργήθηκε : %x)</target>
@@ -318,8 +327,8 @@ The command line is executed each time:
<source>Waiting for missing directories...</source>
<target>Αναμονή για τους υποκαταλόγους που απουσιάζουν...</target>
-<source>A directory input field is empty.</source>
-<target>Ένα πεδίο εισόδου είναι κενό.</target>
+<source>An input folder name is empty.</source>
+<target>Το όνομα ενός υποκαταλόγου είναι κενό.</target>
<source>Logging</source>
<target>Καταγραφή μηνυμάτων</target>
@@ -405,8 +414,8 @@ The command line is executed each time:
<source><Symlink></source>
<target><Συμβολικός δεσμός></target>
-<source><Directory></source>
-<target><Υποκατάλογος></target>
+<source><Folder></source>
+<target>Υποκατάλογος</target>
<source>Full path</source>
<target>Πλήρης διαδρομή</target>
@@ -417,8 +426,8 @@ The command line is executed each time:
<source>Relative path</source>
<target>Σχετική διαδρομή</target>
-<source>Directory</source>
-<target>Υποκατάλογος</target>
+<source>Base folder</source>
+<target>Βασικός υποκατάλογος</target>
<source>Size</source>
<target>Μέγεθος</target>
@@ -429,8 +438,11 @@ The command line is executed each time:
<source>Extension</source>
<target>Επέκταση</target>
-<source>Comparison Result</source>
-<target>Αποτέλεσμα της σύγκρισης</target>
+<source>Action</source>
+<target>Ενέργεια</target>
+
+<source>Category</source>
+<target>Κατηγορία</target>
<source>Drag && drop</source>
<target>Μεταφορά && Απόθεση</target>
@@ -438,14 +450,14 @@ The command line is executed each time:
<source>Close progress dialog</source>
<target>Κλείσιμο του παράθυρου αναφοράς</target>
-<source>Shut down</source>
-<target>Τερματισμός λειτουργίας</target>
+<source>Standby</source>
+<target>Αναστολή λειτουργίας</target>
<source>Log off</source>
<target>Αποσύνδεση</target>
-<source>Standby</source>
-<target>Αναστολή λειτουργίας</target>
+<source>Shut down</source>
+<target>Τερματισμός λειτουργίας</target>
<source>Hibernate</source>
<target>Αδρανοποίηση</target>
@@ -453,32 +465,29 @@ The command line is executed each time:
<source>1. &Compare</source>
<target>1. &Σύγκριση</target>
-<source>2. &Synchronize...</source>
-<target>2. &Συγχρονισμός...</target>
+<source>2. &Synchronize</source>
+<target>2. Συ&γχρονισμός</target>
<source>&New</source>
<target>&Δημιουργία</target>
-<source>&Program</source>
-<target>&Πρόγραμμα</target>
-
<source>&Language</source>
<target>&Γλώσσα</target>
<source>&Global settings...</source>
-<target>&Γενικές ρυθμίσεις...</target>
+<target>Γε&νικές ρυθμίσεις...</target>
<source>&Create batch job...</source>
<target>&Δημιουργία μιας δέσμης ενεργειών...</target>
<source>&Export file list...</source>
-<target>&Εξαγωγή καταλόγου αρχείων...</target>
+<target>Ε&ξαγωγή καταλόγου αρχείων...</target>
<source>&Advanced</source>
<target>&Για προχωρημένους</target>
<source>&Check for new version</source>
-<target>&Έλεγχος για νέα έκδοση</target>
+<target>Έ&λεγχος για νέα έκδοση</target>
<source>Compare</source>
<target>Σύγκριση</target>
@@ -489,8 +498,8 @@ The command line is executed each time:
<source>&Abort</source>
<target>&Άκυρο</target>
-<source>Synchronize...</source>
-<target>Συγχρονισμός...</target>
+<source>Synchronize</source>
+<target>Συγχρονισμός</target>
<source>Start synchronization</source>
<target>Έναρξη του συγχρονισμού</target>
@@ -504,12 +513,12 @@ The command line is executed each time:
<source>Swap sides</source>
<target>Ανταλλαγή πλευρών</target>
-<source>Save current configuration to file</source>
-<target>Αποθήκευση της τρέχουσας διάταξης</target>
-
<source>Load configuration from file</source>
<target>Άνοιγμα διάταξης από αρχείο</target>
+<source>Save current configuration to file</source>
+<target>Αποθήκευση της τρέχουσας διάταξης</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Διατάξεις που χρησιμοποιήθηκαν τελευταία (πατήστε DEL για διαγραφή από τη λίστα)</target>
@@ -519,13 +528,13 @@ The command line is executed each time:
<source>Hide filtered or temporarily excluded files</source>
<target>Απόκρυψη των αρχείων που φιλτραρίστηκαν ή εξαιρέθηκαν προσωρινά</target>
-<source>Number of files and directories that will be created</source>
+<source>Number of files and folders that will be created</source>
<target>Αριθμός αρχείων και υποκαταλόγων που θα δημιουργηθούν</target>
<source>Number of files that will be overwritten</source>
<target>Αριθμός αρχείων και υποκαταλόγων που θα αντικατασταθούν</target>
-<source>Number of files and directories that will be deleted</source>
+<source>Number of files and folders that will be deleted</source>
<target>Αριθμός αρχείων και υποκαταλόγων που θα διαγραφούν</target>
<source>Total amount of data that will be transferred</source>
@@ -549,8 +558,8 @@ The command line is executed each time:
<source>Batch job</source>
<target>Δέσμη ενεργειών</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Δημιουργία μιας δέσμης ενεργειών που αυτοματοποιεί το συγχρονισμό. Για να ξεκινήσετε τη λειτουργία δέσμης, απλώς κάντε διπλό κλικ στο αρχείο δέσμης ή πληκτρολογείστε την εντολή: FreeFileSync.exe SyncJob.ffs_batch. Επίσης η ενέργεια αυτή μπορεί να προγραμματιστεί στο χρονοδιάγραμμα εργασιών του υπολογιστή σας.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Δημιουργείστε ένα αρχείο δέσμης για να αυτοματοποιήσετε το συγχρονισμό. Κάντε διπλό κλικ στο αρχείο αυτό ή προγραμματίστε το στο χρονοδιάγραμμα εργασιών του συστήματός σας: FreeFileSync.exe <όνομα δέσμης>.ffs_batch</target>
<source>Help</source>
<target>Βοήθεια</target>
@@ -576,21 +585,12 @@ The command line is executed each time:
<source>Maximum number of log files:</source>
<target>Μέγιστος αριθμός αρχείων καταγραφής:</target>
-<source>Select log file directory:</source>
-<target>Επιλέξτε έναν κατάλογο για τα αρχεία καταγραφής:</target>
+<source>Select folder to save log files:</source>
+<target>Επιλέξτε τον υποκατάλογο όπου θα αποθηκευτούν τα αρχεία καταγραφής:</target>
<source>Batch settings</source>
<target>Ρυθμίσεις δέσμης ενεργειών</target>
-<source>&Save</source>
-<target>&Αποθήκευση</target>
-
-<source>&Load</source>
-<target>&Άνοιγμα</target>
-
-<source>Cancel</source>
-<target>Άκυρο</target>
-
<source>Select variant:</source>
<target>Επιλέξτε μια μέθοδο:</target>
@@ -615,29 +615,23 @@ The command line is executed each time:
<source>Configuration</source>
<target>Διάταξη</target>
-<source>Category</source>
-<target>Κατηγορία</target>
-
-<source>Action</source>
-<target>Ενέργεια</target>
-
-<source>File/folder exists on left side only</source>
-<target>Το αρχείο / ο υποκατάλογος υπάρχει μόνο στην αριστερή πλευρά</target>
+<source>Item exists on left side only</source>
+<target>Το αντικείμενο υπάρχει μόνο στην αριστερή πλευρά</target>
-<source>File/folder exists on right side only</source>
-<target>Το αρχείο / ο υποκατάλογος υπάρχει μόνο στη δεξιά πλευρά</target>
+<source>Item exists on right side only</source>
+<target>Το αντικείμενο υπάρχει μόνο στη δεξιά πλευρά</target>
-<source>Left file is newer</source>
-<target>Το αρχείο στα αριστερά είναι πιο πρόσφατο</target>
+<source>Left side is newer</source>
+<target>Το αντικείμενο στην αριστερή πλευρά είναι πιο πρόσφατο</target>
-<source>Right file is newer</source>
-<target>Το αρχείο στα δεξιά είναι πιο πρόσφατο</target>
+<source>Right side is newer</source>
+<target>Το αντικείμενο στη δεξιά πλευρά είναι πιο πρόσφατο</target>
-<source>Files have different content</source>
-<target>Τα αρχεία έχουν διαφορετικό περιεχόμενο</target>
+<source>Items have different content</source>
+<target>Τα αντικείμενα έχουν διαφορετικό περιεχόμενο</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Η διένεξη / το αρχείο δεν μπορεί να κατηγοριοποιηθεί</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Διένεξη/το αντικείμενο δεν μπορεί να κατηγοριοποιηθεί</target>
<source>OK</source>
<target>OK</target>
@@ -714,9 +708,6 @@ is the same
<source>&Ignore</source>
<target>&Παράβλεψη</target>
-<source>&Retry</source>
-<target>&Επανάληψη</target>
-
<source>Do not show this dialog again</source>
<target>Να μην εμφανιστεί ξανά αυτό το μήνυμα</target>
@@ -747,33 +738,6 @@ Note: File names must be relative to base directories!
Σημείωση: Πρέπει να χρησιμοποιούνται οι σχετικές διαδρομές των αρχείων ως προς τους υποκαταλόγους που συγχρονίζονται.
</target>
-<source>Hints:</source>
-<target>Συμβουλές:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Εισάγετε τα σχετικά ονόματα των αρχείων ή των υποκαταλόγων χωρισμένα με ';' ή με αλλαγή γραμμής.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Μπορείτε να χρησιμοποιήσετε τους χαρακτήρες-μπαλαντέρ '*' και '?'.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Μπορείτε να εξαιρέσετε αρχεία στη βασική οθόνη κάνοντας δεξί κλικ.</target>
-
-<source>Example</source>
-<target>Παράδειγμα</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Συμπερίληψη: *.doc;*.zip;*.exe
-Εξαίρεση: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Συγχρονισμός όλων των αρχείων .doc, .zip και .exe εκτός αυτών στον υποκατάλογο "temp".</target>
-
<source>Include</source>
<target>Συμπερίληψη</target>
@@ -795,8 +759,8 @@ Exclude: \stuff\temp\*
<source>&Default</source>
<target>&Προεπιλογή</target>
-<source>Transactional file copy</source>
-<target>Συνδιαλλακτική αντιγραφή αρχείων</target>
+<source>Fail-safe file copy</source>
+<target>Ασφαλής αντιγραφή αρχείων</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Εγγραφή πρώτα σε προσωρινό αρχείο (*.ffs_tmp) και μετά μετονομασία του. Αυτή η ρύθμιση εγγυάται συνέπεια ακόμα και στην περίπτωση σοβαρού σφάλματος.</target>
@@ -810,8 +774,8 @@ Exclude: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Αντιγραφή των αδειών προσπέλασης των αρχείων</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Μεταφορά των αδειών για τα αρχεία και τους υποκαταλόγους (Απαιτεί δικαιώματα Aministrator)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Μεταφορά των αδειών των αρχείων και των υποκαταλόγων (Απαιτεί δικαιώματα Διαχειριστή)</target>
<source>Restore hidden dialogs</source>
<target>Επανεμφάνιση κρυμμένων μηνυμάτων</target>
@@ -1119,11 +1083,11 @@ Exclude: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Ένταξη εξωτερικών εφαρμογών στο μενού περιβάλλοντος. Οι ακόλουθες μακροεντολές είναι διαθέσιμες:</target>
-<source>- full file or directory name</source>
-<target>- πλήρες όνομα του αρχείου ή υποκαταλόγου</target>
+<source>- full file or folder name</source>
+<target>- πλήρε όνομα αρχείου ή υποκαταλόγου</target>
-<source>- directory part only</source>
-<target>- μόνο τους υποκαταλόγους</target>
+<source>- folder part only</source>
+<target>- μέρος μόνο του υποκαταλόγου</target>
<source>- Other side's counterpart to %name</source>
<target>- Το αντίστοιχο %name της άλλης πλευράς</target>
@@ -1167,8 +1131,8 @@ Exclude: \stuff\temp\*
<source>Versioning</source>
<target>Διατήρηση παλιών εκδόσεων</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Μεταφορά των αρχείων σε έναν υποκατάλογο με ένδειξη ώρας</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Μεταφορά αρχείων σε υποκατάλογο με χρονική περιγραφή</target>
<source>Files</source>
<target>Αρχεία</target>
@@ -1263,8 +1227,8 @@ Exclude: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>Δεν μπορεί να αναγνωσθεί ο υποκατάλογος %x.</target>
-<source>Endless loop.</source>
-<target>Ατέρμων βρόχος.</target>
+<source>Detected endless directory recursion.</source>
+<target>Ανιχνεύτηκε αέναος βρόχος υποκαταλόγων.</target>
<source>Cannot set privilege %x.</source>
<target>Τα δικαιώματα %x δεν μπορούν να οριστούν.</target>
@@ -1290,13 +1254,10 @@ Exclude: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Ρύθμιση προεπιλεγμένης κατεύθυνσης συγχρονισμού: Τα νεότερα αρχεία θα αντικαταστήσουν τα παλιότερα.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Το αρχείο δεν περιέχει μια έγκυρη διάταξη:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Μπορείτε να αγνοήσετε αυτό το σφάλμα και να θεωρήσετε τον υποκατάλογο κενό.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Μπορείτε να αγνοήσετε αυτό το λάθος, για να θεωρήσετε ότι ο υποκατάλογος είναι κενός.</target>
-<source>Cannot find directory %x.</source>
+<source>Cannot find folder %x.</source>
<target>Ο υποκατάλογος %x δεν μπορεί να βρεθεί.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
@@ -1329,20 +1290,20 @@ Exclude: \stuff\temp\*
<source>Both sides are equal</source>
<target>Οι δυο πλευρές είναι ίδιες</target>
-<source>Files/folders differ in attributes only</source>
-<target>Τα αρχεία / οι υποκατάλογοι διαφέρουν μόνο στα χαρακτηριστικά τους</target>
+<source>Items have different attributes</source>
+<target>Τα στοιχεία έχουν διαφορετικά χαρακτηριστικά</target>
-<source>Copy new file/folder to left</source>
-<target>Αντιγραφή του νέου αρχείου/υποκαταλόγου στα αριστερά</target>
+<source>Copy new item to left</source>
+<target>Αντιγραφή του νέου στοιχείου στα αριστερά</target>
-<source>Copy new file/folder to right</source>
-<target>Αντιγραφή του νέου αρχείου/υποκαταλόγου στα δεξιά</target>
+<source>Copy new item to right</source>
+<target>Αντιγραφή του νέου στοιχείου στα δεξιά</target>
-<source>Delete left file/folder</source>
-<target>Διαγραφή του αρχείου/υποκαταλόγου στα αριστερά</target>
+<source>Delete left item</source>
+<target>Διαγραφή του στοιχείου στα αριστερά</target>
-<source>Delete right file/folder</source>
-<target>Διαγραφή του αρχείου/υποκαταλόγου στα δεξιά</target>
+<source>Delete right item</source>
+<target>Διαγραφή του στοιχείου στα δεξιά</target>
<source>Move file on left</source>
<target>Μεταφορά του αρχείου που βρίσκεται αριστερά</target>
@@ -1350,20 +1311,20 @@ Exclude: \stuff\temp\*
<source>Move file on right</source>
<target>Μεταφορά του αρχείου που βρίσκεται δεξιά</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Αντικατάσταση του αρχείου/υποκαταλόγου στα αριστερά από το(ν) αντίστοιχο στα δεξιά</target>
+<source>Overwrite left item</source>
+<target>Αντικατάσταση του στοιχείου που βρίσκεται στα αριστερά</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Αντικατάσταση του αρχείου/υποκαταλόγου στα δεξιά από το(ν) αντίστοιχο στα αριστερά</target>
+<source>Overwrite right item</source>
+<target>Αντικατάσταση του στοιχείου που βρίσκεται στα δεξιά</target>
<source>Do nothing</source>
<target>Καμία ενέργεια</target>
-<source>Copy file attributes only to left</source>
-<target>Αντιγραφή μόνο των χαρακτηριστικών του αρχείου στα αριστερά</target>
+<source>Update attributes on left</source>
+<target>Ενημέρωση των στοιχείων στα αριστερά</target>
-<source>Copy file attributes only to right</source>
-<target>Αντιγραφή μόνο των χαρακτηριστικών του αρχείου στα δεξιά</target>
+<source>Update attributes on right</source>
+<target>Ενημέρωση των στοιχείων στα δεξιά</target>
<source>Multiple...</source>
<target>Πολλαπλές ρυθμίσεις...</target>
@@ -1416,11 +1377,11 @@ Exclude: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Ενημέρωση των χαρακτηριστικών αρχείου του %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Το όνομα του υποκαταλόγου προορισμού πρέπει να μην είναι κενό!</target>
+<source>Target folder name must not be empty.</source>
+<target>Ο υποκατάλογος στόχος πρέπει να μην είναι κενός</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Δεν έχει οριστεί υποκατάλογος για τη διατήρηση παλιών εκδόσεων!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Το όνομα του υποκαταλόγου για τη διατήρηση παλιών εκδόσεων δεν μπορεί να είναι κενό.</target>
<source>Source directory %x not found.</source>
<target>Ο υποκατάλογος πηγής %x δεν βρέθηκε.</target>
@@ -1449,8 +1410,8 @@ Exclude: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Ο Κάδος Ανακύκλωσης δεν είναι διαθέσιμος για τις ακόλουθες διαδρομές! Τα αρχεία θα διαγραφούν μόνιμα:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Θα τροποποιηθεί ένας υποκατάλογος που ανήκει σε πολλαπλά ζεύγη υποκαταλόγων! Παρακαλώ αναθεωρείστε τις ρυθμίσεις συγχρονισμού.</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Θα τροποποιηθεί ένας υποκατάλογος που είναι μέρος από πολλαπλά ζεύγη υποκαταλόγων. Παρακαλούμε επανελέγξτε τις ρυθμίσεις συγχρονισμού.</target>
<source>Processing folder pair:</source>
<target>Σύγκριση του ζεύγους υποκαταλόγων:</target>
diff --git a/BUILD/Languages/hebrew.lng b/BUILD/Languages/hebrew.lng
index 7c2bb384..e17ef10b 100644
--- a/BUILD/Languages/hebrew.lng
+++ b/BUILD/Languages/hebrew.lng
@@ -7,8 +7,8 @@
<plural definition>n == 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>מחפש מחיצה %x</target>
+<source>Searching for folder %x...</source>
+<target>מחפש את תיקייה %x...</target>
<source>Show in Explorer</source>
<target>הראה בסייר הקבצים</target>
@@ -34,12 +34,12 @@
<source>Select alternate synchronization settings</source>
<target>בחר הגדרות סנכרון חליפיות</target>
-<source>No filter selected</source>
-<target>לא נבחר מסנן פעיל</target>
-
<source>Filter is active</source>
<target>מסנן פעיל</target>
+<source>No filter selected</source>
+<target>לא נבחר מסנן פעיל</target>
+
<source>Remove alternate settings</source>
<target>הסר הגדרות תצורה חליפיות</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>משתנים גלובליים</target>
-<source>Synchronization Preview</source>
-<target>תצוגה מקדימה של סנכרון</target>
+<source>Summary</source>
+<target>תקציר</target>
<source>Find</source>
<target>חפש</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>עיין</target>
-<source>Invalid command line: %x</source>
-<target>שורת פקודה בלתי חוקית: %x</target>
+<source>Invalid command line:</source>
+<target>שורת פקודה בלתי חוקית:</target>
<source>Info</source>
<target>מידע</target>
@@ -226,29 +226,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>ככונן %x לא בנתיב של קובץ %y!</target>
-<source>Cannot find file %x.</source>
-<target>לא יכול למצוא קובץ %x.</target>
-
<source>Cannot read the following XML elements:</source>
<target>לא יכול לקרוא את שמות צמתי XML:</target>
-<source>S&ave configuration...</source>
-<target>&שמור תצורה...</target>
+<source>Cannot find file %x.</source>
+<target>לא יכול למצוא קובץ %x.</target>
+
+<source>&Open...</source>
+<target>&פתח...</target>
-<source>&Load configuration...</source>
-<target>&טען תצורה...</target>
+<source>&Save...</source>
+<target>&שמור...</target>
<source>&Quit</source>
<target>&יציאה</target>
-<source>&File</source>
-<target>&קובץ</target>
+<source>&Program</source>
+<target>&תוכנה</target>
<source>&Content</source>
<target>&תוכן</target>
-<source>&About...</source>
-<target>&אודות...</target>
+<source>&About</source>
+<target>&אודות</target>
<source>&Help</source>
<target>&עזרה</target>
@@ -256,8 +256,8 @@
<source>Usage:</source>
<target>שימוש:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. בחר מחיצות לניטור.</target>
+<source>1. Select folders to watch.</source>
+<target>1. בחר תיקיות לצפייה.</target>
<source>2. Enter a command line.</source>
<target>2. הקש שורת פקודות.</target>
@@ -265,19 +265,11 @@
<source>3. Press 'Start'.</source>
<target>3. לחץ 'הפעל'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-שורת הפקודה מבוצעת בכל פעם כאשר:
-- כל המחיצות הופכות זמינות (לדוגמה חיבור זכרון נתיק)
-- קבצים במחיצות אלו משתנים
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>בכדי להתחיל יבא קובץ .ffs_batch</target>
-<source>Directories to watch</source>
-<target>מחיצות לניטור</target>
+<source>Folders to watch</source>
+<target>תיקיות לצפייה</target>
<source>Add folder</source>
<target>הוסף מחיצה</target>
@@ -288,14 +280,25 @@ The command line is executed each time:
<source>Select a folder</source>
<target>בחר מחיצה</target>
+<source>Delay [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>Minimum Idle Time [seconds]</source>
-<target>זמן מנוחה מינימלי [שניות]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>זמן מנוחה מגילוי שינוי אחרון עד לביצוע שורת פקודה בשניות</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+הפקודה מופעלת כאשר:
+- קבצים או תת-תיקיות משתנים
+- תיקיות חדשות מופיעות (לדוגמה התקן USB מוכנס)
+</target>
<source>Start</source>
<target>התחל</target>
@@ -324,8 +327,8 @@ The command line is executed each time:
<source>Waiting for missing directories...</source>
<target>מחכה למחיצות חסרות...</target>
-<source>A directory input field is empty.</source>
-<target>שדה כניסת מחיצה ריק.</target>
+<source>An input folder name is empty.</source>
+<target>שם תיקיית קלט ריק.</target>
<source>Logging</source>
<target>רישום ביומן</target>
@@ -396,12 +399,12 @@ The command line is executed each time:
<source>Download now?</source>
<target>הורד עכשיו?</target>
-<source>Information</source>
-<target>מידע</target>
-
<source>FreeFileSync is up to date!</source>
<target>FreeFileSync מעודכן לגירסה האחרונה!</target>
+<source>Information</source>
+<target>מידע</target>
+
<source>Do you want FreeFileSync to automatically check for updates every week?</source>
<target>האם ברצונך שהתוכנה תבדוק לעדכון בכל שבוע?</target>
@@ -411,8 +414,8 @@ The command line is executed each time:
<source><Symlink></source>
<target><קשור סימבולי></target>
-<source><Directory></source>
-<target><מחיצה></target>
+<source><Folder></source>
+<target><תיקייה></target>
<source>Full path</source>
<target>נתיב מלא</target>
@@ -423,8 +426,8 @@ The command line is executed each time:
<source>Relative path</source>
<target>נתיב יחסי</target>
-<source>Directory</source>
-<target>מחיצה</target>
+<source>Base folder</source>
+<target>תיקיית בסיס</target>
<source>Size</source>
<target>גודל</target>
@@ -435,8 +438,11 @@ The command line is executed each time:
<source>Extension</source>
<target>סיומת</target>
-<source>Comparison Result</source>
-<target>תוצאות ההשוואה</target>
+<source>Action</source>
+<target>פעולה</target>
+
+<source>Category</source>
+<target>קטגוריה</target>
<source>Drag && drop</source>
<target>גרור והשלך</target>
@@ -444,14 +450,14 @@ The command line is executed each time:
<source>Close progress dialog</source>
<target>סגור שיח התקדמות</target>
-<source>Shut down</source>
-<target>כבה מחשב</target>
+<source>Standby</source>
+<target>עבור למצב המתנה</target>
<source>Log off</source>
<target>התנתק כמשתמש</target>
-<source>Standby</source>
-<target>עבור למצב המתנה</target>
+<source>Shut down</source>
+<target>כבה מחשב</target>
<source>Hibernate</source>
<target>עבור למצב שינה</target>
@@ -459,15 +465,12 @@ The command line is executed each time:
<source>1. &Compare</source>
<target>1. &השווה</target>
-<source>2. &Synchronize...</source>
-<target>2. &סנכרן...</target>
+<source>2. &Synchronize</source>
+<target>2. &סנכרן</target>
<source>&New</source>
<target>&חדש</target>
-<source>&Program</source>
-<target>&תוכנה</target>
-
<source>&Language</source>
<target>&שפה</target>
@@ -495,8 +498,8 @@ The command line is executed each time:
<source>&Abort</source>
<target>&נטוש</target>
-<source>Synchronize...</source>
-<target>...סנכרן</target>
+<source>Synchronize</source>
+<target>סנכרן</target>
<source>Start synchronization</source>
<target>התחל סנכרון</target>
@@ -510,12 +513,12 @@ The command line is executed each time:
<source>Swap sides</source>
<target>החלף צדדים</target>
-<source>Save current configuration to file</source>
-<target>שמור תצורה נוכחית לקובץ</target>
-
<source>Load configuration from file</source>
<target>טען קונפיגורציה מקובץ</target>
+<source>Save current configuration to file</source>
+<target>שמור תצורה נוכחית לקובץ</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>תצורות אחרונות שהיו בשמוש (לחץ DEL להסרה מהרשימה)</target>
@@ -525,21 +528,18 @@ The command line is executed each time:
<source>Hide filtered or temporarily excluded files</source>
<target>החבא קבצים מסוננים או נשללים</target>
-<source>Number of files and directories that will be created</source>
-<target>מספר התקיות והקבצים אשר עומדים להיוצר</target>
+<source>Number of files and folders that will be created</source>
+<target>מספר הקבצים והתיקיות שייוצרו</target>
<source>Number of files that will be overwritten</source>
<target>מספר הקבצים העומדים להיכתב מחדש</target>
-<source>Number of files and directories that will be deleted</source>
-<target>מספר הקבצים והתיקיות העומדים להימחק</target>
+<source>Number of files and folders that will be deleted</source>
+<target>מספר הקבצים והתיקיות שימחקו</target>
<source>Total amount of data that will be transferred</source>
<target>סך הכל נתונים להעברה</target>
-<source>Operation:</source>
-<target>פעולה:</target>
-
<source>Items found:</source>
<target>אלמנטים נמצאו:</target>
@@ -555,8 +555,8 @@ The command line is executed each time:
<source>Batch job</source>
<target>עבודת אצווה</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>צור קובץ אצווה ומכן הסינכרון. הפעל באמצעות הקשה כפולה על שם הקובץ או הפעל שורת פקודה: FreeFileSync.exe <ffs_batch file>. ההפעלה ניתנת לתזמון במתזמן המשימות של מערכת ההפעלה.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>יצור קובץ אצווה לסינכרון אוטומטי. הפעל בהקלקה כפולה או תזמן באמצעות מתזמן המשימות של המערכת: FreeFileSync.exe</target>
<source>Help</source>
<target>עזרה</target>
@@ -582,18 +582,12 @@ The command line is executed each time:
<source>Maximum number of log files:</source>
<target>מספר מכסימלי של קבצי יומן</target>
-<source>Select log file directory:</source>
-<target>בחר מחיצה לקבצי יומן</target>
+<source>Select folder to save log files:</source>
+<target>בחר תיקייה לשמירה קבצי יומן:</target>
<source>Batch settings</source>
<target>הגדרות אצווה</target>
-<source>&Save</source>
-<target>&שמירה</target>
-
-<source>&Load</source>
-<target>&טען</target>
-
<source>Select variant:</source>
<target>בחר משתנה:</target>
@@ -618,29 +612,23 @@ The command line is executed each time:
<source>Configuration</source>
<target>תצורה</target>
-<source>Category</source>
-<target>קטגוריה</target>
-
-<source>Action</source>
-<target>פעולה</target>
+<source>Item exists on left side only</source>
+<target>הפריט קיים בצד ימין בלבד</target>
-<source>File/folder exists on left side only</source>
-<target>קובץ\מחיצה קיים בצד ימין בלבד</target>
+<source>Item exists on right side only</source>
+<target>הפריט קיים בצד שמאל בלבד</target>
-<source>File/folder exists on right side only</source>
-<target>קובץ\מחיצה קיים בצד שמאל בלבד</target>
+<source>Left side is newer</source>
+<target>צד ימין חדש יותר</target>
-<source>Left file is newer</source>
-<target>קובץ בצד ימין חדש יותר</target>
-
-<source>Right file is newer</source>
+<source>Right side is newer</source>
<target>צד שמאל חדש יותר</target>
-<source>Files have different content</source>
-<target>הקבצים בעלי תכולה שונה</target>
+<source>Items have different content</source>
+<target>הפריטים הם בעלי תוכן שונה</target>
-<source>Conflict/file cannot be categorized</source>
-<target>קונפליקט\קובץ אינו יכול לקבל סיווג</target>
+<source>Conflict/item cannot be categorized</source>
+<target>סתירה/פריט אינו ניתן לסיווג</target>
<source>OK</source>
<target>אשר</target>
@@ -747,33 +735,6 @@ Note: File names must be relative to base directories!
הערה: שמות קבצים חייבים להיות מוגדרים באופן יחסי למחיצות הראשיות!
</target>
-<source>Hints:</source>
-<target>טיפים:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. הכנס שם קובץ או שם תיקיה מופרדים ע"י ';' או דורה חדשה</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. השתמש באשפים '*' או '?'לבחירה מרובה.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. הוצא קבצים היישר באסכלה עיקרית דרך תפריט הקשר.</target>
-
-<source>Example</source>
-<target>דוגמה</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-כלול: *.doc;*.zip;*.exe
-אל תכלול: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>סנכרן .doc, .zip und .exe כל הקבצים בתיקית משנה "temp".</target>
-
<source>Include</source>
<target>כלול</target>
@@ -795,8 +756,8 @@ Exclude: \stuff\temp\*
<source>&Default</source>
<target>&ברירת מחדל</target>
-<source>Transactional file copy</source>
-<target>העתקת קובץ בעסקה</target>
+<source>Fail-safe file copy</source>
+<target>כשלון באבטחת העתקת קובץ</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>רשום לקובץ זמני (*.ffs_tmp) תחילה ושנה שם. פעולה זו מבטיחה עקביות המצב גם במקרה של שגיאה חמורה.</target>
@@ -810,8 +771,8 @@ Exclude: \stuff\temp\*
<source>Copy file access permissions</source>
<target>העתק הרשאות גישה של הקובץ</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>העבר הרשאות קבצים ומחיצות (דורש הרשאות מנהל מערכת)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>העבר הרשאות של תיקיות וקבצים (דורש זכויות מנהל)</target>
<source>Restore hidden dialogs</source>
<target>שחזר דיאלוגים מוסתרים</target>
@@ -1119,11 +1080,11 @@ Exclude: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>הטמע תוכנות חיצוניות. תפריטי המקרו הבאים זמינים:</target>
-<source>- full file or directory name</source>
-<target>- שם מלא של קובץ או תיקיה</target>
+<source>- full file or folder name</source>
+<target>- שם מלא של קובץ או תיקייה</target>
-<source>- directory part only</source>
-<target>- חלק התיקיה בלבד</target>
+<source>- folder part only</source>
+<target>- תיקייה בלבד</target>
<source>- Other side's counterpart to %name</source>
<target>- הצד השני מקביל ל- %name</target>
@@ -1167,8 +1128,8 @@ Exclude: \stuff\temp\*
<source>Versioning</source>
<target>עדכון גרסאות</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>העבר קבצים לתוך מחיצות עם שם המכיל טביעת זמן ותאריך</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>העבר קבצים לתיקייה המסומנת בחותמת-זמן</target>
<source>Files</source>
<target>קבצים</target>
@@ -1263,8 +1224,8 @@ Exclude: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>לא יכול לקרוא מחיצה %x.</target>
-<source>Endless loop.</source>
-<target>לולאה אינסופית.</target>
+<source>Detected endless directory recursion.</source>
+<target>אובחנה רקורסית תיקיות אינסופית.</target>
<source>Cannot set privilege %x.</source>
<target>לא יכול להגדיר זבות %x.</target>
@@ -1290,14 +1251,11 @@ Exclude: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>בחר ברירת מחדל של סנכרון: קבצים ישנים ידרסו ע"י קבצים חדשים יותר.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>קובץ זה לא מכיל קונפיגורציה ברת תוקף</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>אפשר להתעלם משגיאה זו ולהניח כי המחיצה ריקה.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>ניתן להתעלם משגיאה זו ולהחשיב התיקייה כריקה.</target>
-<source>Cannot find directory %x.</source>
-<target>לא יכול למצוא מחיצה %x.</target>
+<source>Cannot find folder %x.</source>
+<target>לא מוצא תיקייה %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>מחיצות תלויות! זהירות בהגדרת כללי סנכרון:</target>
@@ -1329,20 +1287,20 @@ Exclude: \stuff\temp\*
<source>Both sides are equal</source>
<target>שני הצדדים שווים</target>
-<source>Files/folders differ in attributes only</source>
-<target>קבצים\מחיצות שונים בערכי התכונות בלבד</target>
+<source>Items have different attributes</source>
+<target>הפריטים הם בעלי תכונות שונות</target>
-<source>Copy new file/folder to left</source>
-<target>העתק קובץ\מחיצה חדש\ה משמאל לימין</target>
+<source>Copy new item to left</source>
+<target>העתק פריט חדש לצד ימין</target>
-<source>Copy new file/folder to right</source>
-<target>העתק קובץ\מחיצה חדש\ה מימין לשמאל</target>
+<source>Copy new item to right</source>
+<target>העתק פריט חדש לצד שמאל</target>
-<source>Delete left file/folder</source>
-<target>מחק קובץ\מחיצה בצד ימין</target>
+<source>Delete left item</source>
+<target>מחק פריט בצד ימין</target>
-<source>Delete right file/folder</source>
-<target>מחק קובץ\מחיצה בצד שמאל</target>
+<source>Delete right item</source>
+<target>מחק פריט בצד שמאל</target>
<source>Move file on left</source>
<target>העבר קובץ בצד ימין</target>
@@ -1350,20 +1308,20 @@ Exclude: \stuff\temp\*
<source>Move file on right</source>
<target>העבר קובץ בצד שמאל</target>
-<source>Overwrite left file/folder with right one</source>
-<target>העתק ודרוס קובץ\מחיצה משמאל לימין</target>
+<source>Overwrite left item</source>
+<target>רשום על גבי פריט בצד ימין</target>
-<source>Overwrite right file/folder with left one</source>
-<target>העתק ודרוס קובץ\מחיצה מימין לשמאל</target>
+<source>Overwrite right item</source>
+<target>רשום על גבי פריט בצד שמאל</target>
<source>Do nothing</source>
<target>אל תעשה כלום</target>
-<source>Copy file attributes only to left</source>
-<target>העתק תכונות קובץ בלבד משמאל לימין</target>
+<source>Update attributes on left</source>
+<target>עדכן תכונות בצד ימין</target>
-<source>Copy file attributes only to right</source>
-<target>העתק תכונות קובץ בלבד מימין לשמאל</target>
+<source>Update attributes on right</source>
+<target>עדכן תכונות בצד שמאל</target>
<source>Multiple...</source>
<target>הכפל...</target>
@@ -1416,11 +1374,11 @@ Exclude: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>מעדכן תכונות של %x</target>
-<source>Target directory name must not be empty!</source>
-<target>שם של מחיצת מטרה אינו יכול להיות ריק!</target>
+<source>Target folder name must not be empty.</source>
+<target>שם תיקיית מטרה אינו יכול להיות ריק.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>לא סופקה מחיצה לרישום גרסאות קבצים</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>שם תיקייה לגרסאות קבצים אינו יכול להיות ריק</target>
<source>Source directory %x not found.</source>
<target>מחיצת מקור %x לא נמצאה.</target>
@@ -1449,8 +1407,8 @@ Exclude: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>סל מחזור אינו זמין עבור הנתיבים הבאים! קבצים ימחקו לצמיתות:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>מחיצה שתשתנה היא חלק מריבוי זוגות מחיצות! בבקשה בדוק הגדרות סינכרון!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>התיקייה שתשתנה היא חלק מריבוי זוגות תיקיות. אנא סקור מחדש הגדרות סינכרון.</target>
<source>Processing folder pair:</source>
<target>מבצע זוג מחיצות:</target>
diff --git a/BUILD/Languages/hungarian.lng b/BUILD/Languages/hungarian.lng
index 67b2ac34..d06b0529 100644
--- a/BUILD/Languages/hungarian.lng
+++ b/BUILD/Languages/hungarian.lng
@@ -7,8 +7,8 @@
<plural definition>n == 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Mappa keresése: %x...</target>
+<source>Searching for folder %x...</source>
+<target>A(z) %x mappa keresése...</target>
<source>Show in Explorer</source>
<target>Mutatás az Intézőben</target>
@@ -34,12 +34,12 @@
<source>Select alternate synchronization settings</source>
<target>Alternatív szinkronizációs beállítások kiválasztása</target>
-<source>No filter selected</source>
-<target>Nincs szűrő kiválasztva</target>
-
<source>Filter is active</source>
<target>A szűrő aktív</target>
+<source>No filter selected</source>
+<target>Nincs szűrő kiválasztva</target>
+
<source>Remove alternate settings</source>
<target>Alternatív beállítások eltávolítása</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Globális beállítások</target>
-<source>Synchronization Preview</source>
-<target>Szinkronizáció előnézete</target>
+<source>Summary</source>
+<target>Összegzés</target>
<source>Find</source>
<target>Keresés:</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Tallózás</target>
-<source>Invalid command line: %x</source>
-<target>Érvénytelen parancssor: %x</target>
+<source>Invalid command line:</source>
+<target>Érvénytelen parancssor:</target>
<source>Info</source>
<target>Információ</target>
@@ -226,29 +226,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>A(z) %x kötetnevet nem tartalmazza a(z) %y fájlnév!</target>
-<source>Cannot find file %x.</source>
-<target>Nem található a következő fájl: %x.</target>
-
<source>Cannot read the following XML elements:</source>
<target>A következő XML elemek olvasása sikertelen:</target>
-<source>S&ave configuration...</source>
-<target>Beállítások mentés&e...</target>
+<source>Cannot find file %x.</source>
+<target>Nem található a következő fájl: %x.</target>
-<source>&Load configuration...</source>
-<target>&Beállítások betöltése...</target>
+<source>&Open...</source>
+<target>&Megnyitás...</target>
+
+<source>&Save...</source>
+<target>Me&ntés...</target>
<source>&Quit</source>
<target>&Kilépés</target>
-<source>&File</source>
-<target>&Fájl</target>
+<source>&Program</source>
+<target>&Program</target>
<source>&Content</source>
<target>&Tartalom</target>
-<source>&About...</source>
-<target>&A programról...</target>
+<source>&About</source>
+<target>&A programról</target>
<source>&Help</source>
<target>&Súgó</target>
@@ -256,8 +256,8 @@
<source>Usage:</source>
<target>Használat:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Válaszd ki a figyelendő mappákat.</target>
+<source>1. Select folders to watch.</source>
+<target>1. Válaszd ki a figyelendő mappát.</target>
<source>2. Enter a command line.</source>
<target>2. Add meg a parancssort.</target>
@@ -265,18 +265,10 @@
<source>3. Press 'Start'.</source>
<target>3. Nyomd meg a Start gombot.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-A parancssor végrehajtódik minden alkalommal, ha:
-- minden mappa elérhetővé válik (pl. USB-kulcs csatlakoztatása)
-- fájlok módosulnak az adott mappákban és almappákban
-</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>
-<source>Directories to watch</source>
+<source>Folders to watch</source>
<target>Figyelendő mappák</target>
<source>Add folder</source>
@@ -288,14 +280,25 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>Select a folder</source>
<target>Mappa kiválasztása</target>
+<source>Delay [seconds]</source>
+<target>Késleltetés (másodperc)</target>
+
+<source>Idle time between last detected change and execution of command</source>
+<target>Tétlenség 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>Minimum Idle Time [seconds]</source>
-<target>Minimális tétlenségi idő (másodpercek)</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>A tétlenség hossza másodpercekben az utolsó változás észlelése és a parancssor végrehajtása között.</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+A parancs végrehajtódik, ha:
+- fájlok vagy almappák megváltoznak
+- új mappák jelennek meg (pl. USB-kulcs csatlakoztatása)
+</target>
<source>Start</source>
<target>Indítás</target>
@@ -309,8 +312,8 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>(Build: %x)</source>
<target>(Build: %x)</target>
-<source>RealtimeSync configuration</source>
-<target>RealtimeSync beállítások</target>
+<source>All files</source>
+<target></target>
<source>&Restore</source>
<target>&Visszaállítás</target>
@@ -324,8 +327,8 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>Waiting for missing directories...</source>
<target>Várakozás a hiányzó mappákra...</target>
-<source>A directory input field is empty.</source>
-<target>Valamelyik mappa megadására szolgáló mező üres.</target>
+<source>An input folder name is empty.</source>
+<target>A megadott mappa neve üres.</target>
<source>Logging</source>
<target>Naplózás</target>
@@ -351,9 +354,6 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>FreeFileSync batch file</source>
<target>FreeFileSync kötegelt fájl</target>
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync beállítások</target>
-
<source>Batch execution</source>
<target>Kötegelt végrehajtás</target>
@@ -396,12 +396,12 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>Download now?</source>
<target>Letöltsem most?</target>
-<source>Information</source>
-<target>Információ</target>
-
<source>FreeFileSync is up to date!</source>
<target>A FreeFileSync naprakész!</target>
+<source>Information</source>
+<target>Információ</target>
+
<source>Do you want FreeFileSync to automatically check for updates every week?</source>
<target>Akarod, hogy a FreeFileSync automatikusan minden héten keressen frissítést?</target>
@@ -411,7 +411,7 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source><Symlink></source>
<target><Symlink></target>
-<source><Directory></source>
+<source><Folder></source>
<target><Mappa></target>
<source>Full path</source>
@@ -423,8 +423,8 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>Relative path</source>
<target>Relatív útvonal</target>
-<source>Directory</source>
-<target>Mappa</target>
+<source>Base folder</source>
+<target>Főmappa</target>
<source>Size</source>
<target>Méret</target>
@@ -435,8 +435,11 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>Extension</source>
<target>Kiterjesztés</target>
-<source>Comparison Result</source>
-<target>Az összehasonlítás eredménye</target>
+<source>Action</source>
+<target>Művelet</target>
+
+<source>Category</source>
+<target>Kategória</target>
<source>Drag && drop</source>
<target>Húzd && Ejtsd</target>
@@ -444,14 +447,14 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>Close progress dialog</source>
<target>Folyamatjelző párbeszédablak bezárása</target>
-<source>Shut down</source>
-<target>Gép leállítása</target>
+<source>Standby</source>
+<target>Készenléti állapot</target>
<source>Log off</source>
<target>Kijelentkezés</target>
-<source>Standby</source>
-<target>Készenléti állapot</target>
+<source>Shut down</source>
+<target>Gép leállítása</target>
<source>Hibernate</source>
<target>Hibernálás</target>
@@ -459,15 +462,12 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>1. &Compare</source>
<target>1. &Összehasonlítás</target>
-<source>2. &Synchronize...</source>
+<source>2. &Synchronize</source>
<target>2. &Szinkronizálás</target>
<source>&New</source>
<target>&Új</target>
-<source>&Program</source>
-<target>&Program</target>
-
<source>&Language</source>
<target>&Nyelv</target>
@@ -495,7 +495,7 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>&Abort</source>
<target>&Megszakít</target>
-<source>Synchronize...</source>
+<source>Synchronize</source>
<target>Szinkronizálás</target>
<source>Start synchronization</source>
@@ -510,12 +510,12 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>Swap sides</source>
<target>Oldalak felcserélése</target>
-<source>Save current configuration to file</source>
-<target>Aktuális beállítások mentése fájlba</target>
-
<source>Load configuration from file</source>
<target>Beállítások betöltése fájlból</target>
+<source>Save current configuration to file</source>
+<target>Aktuális beállítások mentése fájlba</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Utoljára használt beállítások (DEL billentyűvel törölhető a listából)</target>
@@ -525,21 +525,18 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>Hide filtered or temporarily excluded files</source>
<target>A kiszűrt vagy ideiglenesen kizárt fájlok elrejtése</target>
-<source>Number of files and directories that will be created</source>
+<source>Number of files and folders that will be created</source>
<target>A létrehozandó fájlok és mappák száma</target>
<source>Number of files that will be overwritten</source>
<target>A felülírandó fájlok száma</target>
-<source>Number of files and directories that will be deleted</source>
+<source>Number of files and folders that will be deleted</source>
<target>A törlendő fájlok és mappák száma</target>
<source>Total amount of data that will be transferred</source>
<target>A mozgatandó adatok összmérete</target>
-<source>Operation:</source>
-<target>Művelet:</target>
-
<source>Items found:</source>
<target>Talált elemek száma:</target>
@@ -555,8 +552,8 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>Batch job</source>
<target>Kötegelt feladat</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Kötegelt feladat fájl létrehozása és automatikus szinkronizálás. A kötegelt feladat módban való indításhoz csak egyszerűen kattints duplát a fájlon vagy futtasd a következő parancsot: FreeFileSync.exe SzinkFeladat.ffs_batch. Ez ütemezhető is az operációs rendszer ütemezőjének a segítségével.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Kötegelt fájl létrehozása a szinkronizálás automatizálásához. Kattints duplán a fájlon vagy ütemezed be a rendszered feladatütemezőjével: FreeFileSync.exe <feladatnév>.ffs_batch</target>
<source>Help</source>
<target>Súgó</target>
@@ -582,18 +579,12 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>Maximum number of log files:</source>
<target>Naplófájlok maximális száma:</target>
-<source>Select log file directory:</source>
-<target>Naplófájl mappájának kiválasztása:</target>
+<source>Select folder to save log files:</source>
+<target>Válaszd ki a mappát a naplófájlok mentéséhez:</target>
<source>Batch settings</source>
<target>Beállítások</target>
-<source>&Save</source>
-<target>&Mentés</target>
-
-<source>&Load</source>
-<target>&Betöltés</target>
-
<source>Select variant:</source>
<target>Változat kiválasztása:</target>
@@ -618,29 +609,23 @@ A parancssor végrehajtódik minden alkalommal, ha:
<source>Configuration</source>
<target>Beállítás</target>
-<source>Category</source>
-<target>Kategória</target>
-
-<source>Action</source>
-<target>Művelet</target>
-
-<source>File/folder exists on left side only</source>
-<target>Csak a bal oldalon létező fájlok/mappák</target>
+<source>Item exists on left side only</source>
+<target>Az elem csak a bal oldalon létezik</target>
-<source>File/folder exists on right side only</source>
-<target>Csak a jobb oldalon létező fájlok/mappák</target>
+<source>Item exists on right side only</source>
+<target>Az elem csak a jobb oldalon létezik</target>
-<source>Left file is newer</source>
-<target>A bal oldalon lévő fájl újabb</target>
+<source>Left side is newer</source>
+<target>A bal oldal újabb</target>
-<source>Right file is newer</source>
-<target>A jobb oldalon lévő fájl újabb</target>
+<source>Right side is newer</source>
+<target>A jobb oldal újabb</target>
-<source>Files have different content</source>
-<target>A fájlok tartalma különböző</target>
+<source>Items have different content</source>
+<target>Az elemek tartalma különbözik</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Kategorizálhatatlan ütközések/fájlok</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Az ütközés vagy elem nem kategorizálható</target>
<source>OK</source>
<target>OK</target>
@@ -748,33 +733,6 @@ Csak azok a fájlok lesznek szinkronizálva, amelyek megfelelnek az összes szű
Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszonyítva!
</target>
-<source>Hints:</source>
-<target>Tippek:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. A relatív fájl- és mappanevek megadása pontosvesszővel elválasztva vagy új sorban.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. A csillag ('*') és a kérdőjel ('?') helyettesítő karakterek megengedettek.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Fájlok közvetlen kizárása a fő listából helyi menü segítségével.</target>
-
-<source>Example</source>
-<target>Példa</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Csatolni: *.doc; *.zip; *.exe
-Kizárni: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Minden .doc, .zip és .exe fájl szinkronizálása a "temp" almappában találhatók kivételével.</target>
-
<source>Include</source>
<target>Csatolni</target>
@@ -796,8 +754,8 @@ Kizárni: \stuff\temp\*
<source>&Default</source>
<target>&Alapértelmezett</target>
-<source>Transactional file copy</source>
-<target>Tranzakciós fájlmásolás</target>
+<source>Fail-safe file copy</source>
+<target>Hibamentes fájlmásolás</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Írás egy ideiglenes fájlba (*.ffs_tmp), majd annak átnevezése. Ez egyező állapotot garantál még végzetes hiba esetén is.</target>
@@ -811,8 +769,8 @@ Kizárni: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Fájl hozzáférési jogosultságainak másolása</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Fájlok és mappák jogosultságainak átvitele (Adminisztrátori jogok szükségesek)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Fájlok és mappák jogosultságának átvitele (adminisztrátori jogok szükségesek)</target>
<source>Restore hidden dialogs</source>
<target>Rejtett párbeszédablakok visszaállítása</target>
@@ -1120,11 +1078,11 @@ Kizárni: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Külső alkalmazás integrálása a helyi menübe. Az elérhető makrók a következők:</target>
-<source>- full file or directory name</source>
+<source>- full file or folder name</source>
<target>- teljes fájl- vagy mappanév</target>
-<source>- directory part only</source>
-<target>- csak a mappa részét</target>
+<source>- folder part only</source>
+<target>- csak mappa rész</target>
<source>- Other side's counterpart to %name</source>
<target>- A %name másik oldalon szereplő párja</target>
@@ -1168,8 +1126,8 @@ Kizárni: \stuff\temp\*
<source>Versioning</source>
<target>Verziókövetés</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Fájlok másolása időbélyeggel ellátott almappába</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Fájlok mozgatása egy időbélyeges almappába</target>
<source>Files</source>
<target>Fájlok</target>
@@ -1234,6 +1192,9 @@ Kizárni: \stuff\temp\*
<source>Cannot write modification time of %x.</source>
<target>Az utolsó módosítás dátumának a beállítása sikertelen a következő fájlnál: %x.</target>
+<source>Cannot write file attributes of %x.</source>
+<target>A következő fájl attribútumainak írása sikertelen: %x.</target>
+
<source>Cannot find system function %x.</source>
<target>Nem található a következő rendszerfunkció: %x.</target>
@@ -1255,17 +1216,14 @@ Kizárni: \stuff\temp\*
<source>Cannot copy symbolic link %x to %y.</source>
<target>%x symlink másolása a(z) %y symlinkbe sikertelen.</target>
-<source>Cannot write file attributes of %x.</source>
-<target>A következő fájl attribútumainak írása sikertelen: %x.</target>
-
<source>Cannot copy file %x to %y.</source>
<target>%x fájl másolása a(z) %y fájlba sikertelen.</target>
<source>Cannot read directory %x.</source>
<target>A következő mappa olvasása sikertelen: %x.</target>
-<source>Endless loop.</source>
-<target>Végtelen hurok.</target>
+<source>Detected endless directory recursion.</source>
+<target>Végtelen mapparekurzió detektálva.</target>
<source>Cannot set privilege %x.</source>
<target>A következő privilégium beállítása sikertelen: %x.</target>
@@ -1291,13 +1249,10 @@ Kizárni: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Alapértelmezett szinkronizációs irányok beállítása: a régebbi fájlok felülíródnak az újabbakkal.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>A következő fájl nem tartalmaz érvényes beállításokat:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Figyelmen kívül hagyhatod ezt a hibát, üresnek tekintve a mappát.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Figyelmen kívül hagyhatod ezt a hibát ezzel üresnek tekintve a mappát.</target>
-<source>Cannot find directory %x.</source>
+<source>Cannot find folder %x.</source>
<target>Nem található a következő mappa: %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
@@ -1330,20 +1285,20 @@ Kizárni: \stuff\temp\*
<source>Both sides are equal</source>
<target>Mindkét oldal egyforma</target>
-<source>Files/folders differ in attributes only</source>
-<target>Csak attribútumokban különböző fájlok/mappák</target>
+<source>Items have different attributes</source>
+<target>Az elemek attribútumai különböznek</target>
-<source>Copy new file/folder to left</source>
-<target>Új fájl/mappa másolása a bal oldalra</target>
+<source>Copy new item to left</source>
+<target>Új elemek másolása a bal oldalra</target>
-<source>Copy new file/folder to right</source>
-<target>Új fájl/mappa másolása a jobb oldalra</target>
+<source>Copy new item to right</source>
+<target>Új elemek másolása a jobb oldalra</target>
-<source>Delete left file/folder</source>
-<target>Bal oldali fájl/mappa törlése</target>
+<source>Delete left item</source>
+<target>Bal oldali elem törlése</target>
-<source>Delete right file/folder</source>
-<target>Jobb oldali fájl/mappa törlése</target>
+<source>Delete right item</source>
+<target>Jobb oldali elem törlése</target>
<source>Move file on left</source>
<target>Bal oldali fájl mozgatása</target>
@@ -1351,20 +1306,20 @@ Kizárni: \stuff\temp\*
<source>Move file on right</source>
<target>Jobb oldali fájl mozgatása</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Bal oldali fájl/mappa felülírása a jobb oldalival</target>
+<source>Overwrite left item</source>
+<target>Bal oldali elem fölülírása</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Jobb oldali fájl/mappa felülírása a bal oldalival</target>
+<source>Overwrite right item</source>
+<target>Jobb oldali elem fölülírása</target>
<source>Do nothing</source>
<target>Nincs mit csinálni</target>
-<source>Copy file attributes only to left</source>
-<target>Fájl attribútumok másolása csak a bal oldalra</target>
+<source>Update attributes on left</source>
+<target>Attribútumok frissítése a bal oldalon</target>
-<source>Copy file attributes only to right</source>
-<target>Fájl attribútumok másolása csak a jobb oldalra</target>
+<source>Update attributes on right</source>
+<target>Attribútumok frissítése a jobb oldalon</target>
<source>Multiple...</source>
<target>Sokszorosítás</target>
@@ -1417,11 +1372,11 @@ Kizárni: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>A(z) %x attribútumainak frissítése</target>
-<source>Target directory name must not be empty!</source>
-<target>A célmappa neve nem lehet üres!</target>
+<source>Target folder name must not be empty.</source>
+<target>A célmappa nem lehet üres.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Nem lett megadva mappa a fájlok verziókezeléséhez!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>A fájlok verziókövetéséhez használatos mappa neve nem lehet üres.</target>
<source>Source directory %x not found.</source>
<target>Nem található a következő forrásmappa: %x.</target>
@@ -1450,8 +1405,8 @@ Kizárni: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>A Lomtár (Recycle Bin) nem elérhető a következő útvonalakhoz! A fájlok azonnali törlésre kerülnek helyette:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Egy olyan mappa kerül módosításra, amely tagja több mappa párosnak! Kérjük, nézd át a szinkronizációs beállításokat!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Egy olyan mappa kerül módosításra, amely része több mappapárnak. Kérjük, ellenőrizze a szinkronizációs beállításokat.</target>
<source>Processing folder pair:</source>
<target>Mappapár feldolgozása:</target>
diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng
index 27523f4d..f80146fb 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -7,8 +7,8 @@
<plural definition>n == 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Ricerca cartella %x in corso...</target>
+<source>Searching for folder %x...</source>
+<target>Ricerca della cartella %x...</target>
<source>Show in Explorer</source>
<target>Mostra in Esplora Risorse</target>
@@ -34,12 +34,12 @@
<source>Select alternate synchronization settings</source>
<target>Seleziona impostazioni di sincronizzazione alternative</target>
-<source>No filter selected</source>
-<target>Nessun filtro selezionato</target>
-
<source>Filter is active</source>
<target>Il filtro e' attivo</target>
+<source>No filter selected</source>
+<target>Nessun filtro selezionato</target>
+
<source>Remove alternate settings</source>
<target>Rimuovi impostazioni alternative</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Preferenze</target>
-<source>Synchronization Preview</source>
-<target>Anteprima sincronizzazione</target>
+<source>Summary</source>
+<target>Sommario</target>
<source>Find</source>
<target>Trova</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Sfoglia</target>
-<source>Invalid command line: %x</source>
-<target>Linea di comando non valida: %x</target>
+<source>Invalid command line:</source>
+<target>Linea di comando non valida:</target>
<source>Info</source>
<target>Info</target>
@@ -119,7 +119,7 @@
<target>Linux - Errore codice %x:</target>
<source>Cannot resolve symbolic link %x.</source>
-<target></target>
+<target>Impossibile risolvere collegamento %x.</target>
<source>%x MB</source>
<target>%x MB</target>
@@ -226,29 +226,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>Il nome volume %x non è parte del nome file %y!</target>
-<source>Cannot find file %x.</source>
-<target>Impossibile trovare il file %x.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Impossibile leggere i seguenti elementi XML:</target>
-<source>S&ave configuration...</source>
-<target>S&alva configurazione...</target>
+<source>Cannot find file %x.</source>
+<target>Impossibile trovare il file %x.</target>
+
+<source>&Open...</source>
+<target>&Apri...</target>
-<source>&Load configuration...</source>
-<target>&Carica configurazione...</target>
+<source>&Save...</source>
+<target>&Salva...</target>
<source>&Quit</source>
<target>&Esci</target>
-<source>&File</source>
-<target>&File</target>
+<source>&Program</source>
+<target>&Programma</target>
<source>&Content</source>
<target>&Contenuto</target>
-<source>&About...</source>
-<target>&Informazioni...</target>
+<source>&About</source>
+<target>&Informazioni</target>
<source>&Help</source>
<target>&?</target>
@@ -256,8 +256,8 @@
<source>Usage:</source>
<target>Uso:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Seleziona cartelle da monitorare.</target>
+<source>1. Select folders to watch.</source>
+<target>1. Seleziona cartelle da controllare.</target>
<source>2. Enter a command line.</source>
<target>2. Inserisci linea di comando.</target>
@@ -265,18 +265,10 @@
<source>3. Press 'Start'.</source>
<target>3. Premi 'Start'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-La linea di comando è eseguita ogni volta che:
-- tutte le cartelle diventano disponibili (es: inserimento memoria USB)
-- file in queste cartelle o sottocartelle vengono modificati
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Per iniziare è sufficiente importare un file con estensione .ffs_batch</target>
-<source>Directories to watch</source>
+<source>Folders to watch</source>
<target>Cartelle da controllare</target>
<source>Add folder</source>
@@ -288,14 +280,25 @@ La linea di comando è eseguita ogni volta che:
<source>Select a folder</source>
<target>Seleziona una cartella</target>
+<source>Delay [seconds]</source>
+<target>Ritardo [secondi]</target>
+
+<source>Idle time between last detected change and execution of command</source>
+<target>Tempo di attesa tra ultimo cambiamento rilevato ed esecuzione dei comandi</target>
+
<source>Command line</source>
<target>Linea di comando</target>
-<source>Minimum Idle Time [seconds]</source>
-<target>Tempo minimo di attesa [seconds]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Tempo di attesa in secondi fra il rilevamento dell'ultima modifica e l'esecuzione della linea di comando</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Il comando è attivato se:
+- file o sottocartelle cambiano
+- nuove cartelle vengono aggiunte (es. inserimento di memoria USB)
+</target>
<source>Start</source>
<target>Avvia</target>
@@ -324,8 +327,8 @@ La linea di comando è eseguita ogni volta che:
<source>Waiting for missing directories...</source>
<target>In attesa delle cartelle mancanti...</target>
-<source>A directory input field is empty.</source>
-<target>Un campo cartella di input è vuoto.</target>
+<source>An input folder name is empty.</source>
+<target>Il nome di una cartella di input è vuoto.</target>
<source>Logging</source>
<target>Registo attività</target>
@@ -396,12 +399,12 @@ La linea di comando è eseguita ogni volta che:
<source>Download now?</source>
<target>Scaricarla ora?</target>
-<source>Information</source>
-<target>Informazioni</target>
-
<source>FreeFileSync is up to date!</source>
<target>FreeFileSync è aggiornato!</target>
+<source>Information</source>
+<target>Informazioni</target>
+
<source>Do you want FreeFileSync to automatically check for updates every week?</source>
<target>Vuoi che FreeFileSync controlli automaticamente gli aggiornamenti ogni settimana?</target>
@@ -411,7 +414,7 @@ La linea di comando è eseguita ogni volta che:
<source><Symlink></source>
<target><Symlink></target>
-<source><Directory></source>
+<source><Folder></source>
<target><Cartella></target>
<source>Full path</source>
@@ -423,8 +426,8 @@ La linea di comando è eseguita ogni volta che:
<source>Relative path</source>
<target>Percorso relativo</target>
-<source>Directory</source>
-<target>Cartella</target>
+<source>Base folder</source>
+<target>Cartella di partenza</target>
<source>Size</source>
<target>Dimensione</target>
@@ -435,23 +438,26 @@ La linea di comando è eseguita ogni volta che:
<source>Extension</source>
<target>Estensione</target>
-<source>Comparison Result</source>
-<target>Risultato della comparazione</target>
+<source>Action</source>
+<target>Azioni</target>
+
+<source>Category</source>
+<target>Categoria</target>
<source>Drag && drop</source>
-<target>Drag && drop</target>
+<target>Trascina</target>
<source>Close progress dialog</source>
<target>Chiudi stato di avanzamento</target>
-<source>Shut down</source>
-<target>Arresta</target>
+<source>Standby</source>
+<target>Sospendi</target>
<source>Log off</source>
<target>Termina sessione</target>
-<source>Standby</source>
-<target>Sospendi</target>
+<source>Shut down</source>
+<target>Arresta</target>
<source>Hibernate</source>
<target>Iberna</target>
@@ -459,15 +465,12 @@ La linea di comando è eseguita ogni volta che:
<source>1. &Compare</source>
<target>1. &Compara</target>
-<source>2. &Synchronize...</source>
-<target>2. &Sincronizza...</target>
+<source>2. &Synchronize</source>
+<target>2. &Sincronizza</target>
<source>&New</source>
<target>&Nuovo</target>
-<source>&Program</source>
-<target>&Programma</target>
-
<source>&Language</source>
<target>&Lingua</target>
@@ -495,8 +498,8 @@ La linea di comando è eseguita ogni volta che:
<source>&Abort</source>
<target>&Abbandona</target>
-<source>Synchronize...</source>
-<target>Sincronizza...</target>
+<source>Synchronize</source>
+<target>Sincronizza</target>
<source>Start synchronization</source>
<target>Avvia sincronizzazione</target>
@@ -510,12 +513,12 @@ La linea di comando è eseguita ogni volta che:
<source>Swap sides</source>
<target>Inverti i lati</target>
-<source>Save current configuration to file</source>
-<target>Salva la configurazione corrente in un file</target>
-
<source>Load configuration from file</source>
<target>Carica configurazione da file</target>
+<source>Save current configuration to file</source>
+<target>Salva la configurazione corrente in un file</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Ultima configurazione utilizzata (premi CANC per rimuovere dall'elenco)</target>
@@ -525,21 +528,18 @@ La linea di comando è eseguita ogni volta che:
<source>Hide filtered or temporarily excluded files</source>
<target>Nascondi file filtrati o temporaneamente esclusi</target>
-<source>Number of files and directories that will be created</source>
+<source>Number of files and folders that will be created</source>
<target>Numero di file e cartelle che verranno creati</target>
<source>Number of files that will be overwritten</source>
<target>Numero di file che verranno sovrascritti</target>
-<source>Number of files and directories that will be deleted</source>
+<source>Number of files and folders that will be deleted</source>
<target>Numero di file e cartelle che verranno eliminati</target>
<source>Total amount of data that will be transferred</source>
<target>Volume dei dati che verranno trasferiti</target>
-<source>Operation:</source>
-<target>Operazione:</target>
-
<source>Items found:</source>
<target>Elementi trovati:</target>
@@ -555,8 +555,8 @@ La linea di comando è eseguita ogni volta che:
<source>Batch job</source>
<target>Attivitò batch</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Crea un file batch e automatizza la sincronizzazione. Per lanciare in modalità batch fai semplicemente doppio-click su questo file o esegui da linea di comando: FreeFileSync.exe SyncJob.ffs_batch. Puoi anche schedularlo nelle operazioni pianificate del tuo sistema.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Crea un file batch per automatizzare la sincronizzazione. Doppio click su questo file o schedula nelle operazioni pianificate del tuo sistema: FreeFileSync.exe <nome file batch>.ffs_batch</target>
<source>Help</source>
<target>?</target>
@@ -582,18 +582,12 @@ La linea di comando è eseguita ogni volta che:
<source>Maximum number of log files:</source>
<target>Numero massimo di file registro:</target>
-<source>Select log file directory:</source>
-<target>Seleziona cartella per il file di registro:</target>
+<source>Select folder to save log files:</source>
+<target>Seleziona cartella per il salvataggio dei file registro:</target>
<source>Batch settings</source>
<target>Impostazioni batch</target>
-<source>&Save</source>
-<target>&Salva</target>
-
-<source>&Load</source>
-<target>&Carica</target>
-
<source>Select variant:</source>
<target>Seleziona una variante:</target>
@@ -618,29 +612,23 @@ La linea di comando è eseguita ogni volta che:
<source>Configuration</source>
<target>Configurazione</target>
-<source>Category</source>
-<target>Categoria</target>
-
-<source>Action</source>
-<target>Azioni</target>
+<source>Item exists on left side only</source>
+<target>L'elemento esiste solo sul lato sinistro</target>
-<source>File/folder exists on left side only</source>
-<target>File/cartella esiste solo sul lato sinistro</target>
+<source>Item exists on right side only</source>
+<target>L'elemento esiste solo sul lato destro</target>
-<source>File/folder exists on right side only</source>
-<target>File/cartella esiste solo sul lato destro</target>
+<source>Left side is newer</source>
+<target>Il più recente è sul lato sinistro</target>
-<source>Left file is newer</source>
-<target>Il file di sinistra è più recente</target>
+<source>Right side is newer</source>
+<target>Il più recente è sul lato destro</target>
-<source>Right file is newer</source>
-<target>Il file di destra è più recente</target>
+<source>Items have different content</source>
+<target>Gli elementi hanno contenuto differente</target>
-<source>Files have different content</source>
-<target>I file hanno differente contenuto</target>
-
-<source>Conflict/file cannot be categorized</source>
-<target>I conflitti/file non possono essere categorizzati</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Conflitto/elemento non categorizzabile</target>
<source>OK</source>
<target>OK</target>
@@ -673,7 +661,7 @@ I file sono considerati identici se
</target>
<source>Symbolic Link handling</source>
-<target>Gestione link simbolico</target>
+<target>Gestione Collegamenti</target>
<source>Synchronizing...</source>
<target>Sincronizzazione...</target>
@@ -747,33 +735,6 @@ Solo i file che corrispondono esattamente a tutti i filtri impostati verrranno s
Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
</target>
-<source>Hints:</source>
-<target>Consigli:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Inserisci i nomi relativi di file o cartella separati da ';' o su una nuova riga.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Sono ammessi i caratteri generici '*' e '?'.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Escludi i file direttamente sulla griglia principale tramite il menu contestuale.</target>
-
-<source>Example</source>
-<target>Esempio</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Includi: *.doc;*.zip;*.exe
-Escludi: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Sincronizza tutti i file .doc, .zip e .exe eccetto tutti quelli nella cartella "temp".</target>
-
<source>Include</source>
<target>Includi</target>
@@ -795,8 +756,8 @@ Escludi: \stuff\temp\*
<source>&Default</source>
<target>&Predefinito</target>
-<source>Transactional file copy</source>
-<target>Copia transazionale file</target>
+<source>Fail-safe file copy</source>
+<target>Copia file sicura</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Scrivi in un file temporaneo (*.ffs_tmp) prima di rinominarlo. Ciò garantisce uno stato consistente anche in caso di errore fatale.</target>
@@ -810,8 +771,8 @@ Escludi: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Copia permessi di accesso file</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Trasferisci permessi file cartelle (richiede diritti di amministrazione)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Permessi di traferimento file e cartelle (Richiede diritti di Amministratore)</target>
<source>Restore hidden dialogs</source>
<target>Ripristina i messaggi nascosti</target>
@@ -1119,11 +1080,11 @@ Escludi: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Integra applicazioni esterne nel menu contestuale. Sono disponibili le seguenti macro:</target>
-<source>- full file or directory name</source>
-<target>- file completo o nome cartella</target>
+<source>- full file or folder name</source>
+<target>- nome completo file o cartella</target>
-<source>- directory part only</source>
-<target>- solo parte di cartella</target>
+<source>- folder part only</source>
+<target>- solo porzione cartella</target>
<source>- Other side's counterpart to %name</source>
<target>- l'altro lato e' equivalente a %name</target>
@@ -1167,8 +1128,8 @@ Escludi: \stuff\temp\*
<source>Versioning</source>
<target>Versione</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Sposta file in una sotto cartella datata</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Sposta file in una sotto-cartella con data e ora</target>
<source>Files</source>
<target>File</target>
@@ -1252,7 +1213,7 @@ Escludi: \stuff\temp\*
<target>Impossibile creare cartella %x.</target>
<source>Cannot copy symbolic link %x to %y.</source>
-<target>Impossibile copiare collegamento simbolico %x su %y.</target>
+<target>Impossibile copiare collegamento %x su %y.</target>
<source>Cannot write file attributes of %x.</source>
<target>Impossibile scrivere attributi file di %x.</target>
@@ -1263,8 +1224,8 @@ Escludi: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>Impossibile leggere cartella %x.</target>
-<source>Endless loop.</source>
-<target>Loop senza fine.</target>
+<source>Detected endless directory recursion.</source>
+<target>Rilevato percorso ricorsivo senza fine.</target>
<source>Cannot set privilege %x.</source>
<target>Impossibile impostare privilegi %x.</target>
@@ -1290,13 +1251,10 @@ Escludi: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Imposta direzioni di sincronizzazione dpredefinite: i vecchi file saranno sovrascritti dai nuovi.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Il file non contiene una configurazione valida</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
+<source>You can ignore this error to consider the folder as empty.</source>
<target>Puoi ignorare questo errore per considerare la cartella come vuota.</target>
-<source>Cannot find directory %x.</source>
+<source>Cannot find folder %x.</source>
<target>Impossibile trovare cartella %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
@@ -1315,7 +1273,7 @@ Escludi: \stuff\temp\*
<target>I file %x hanno la stessa data ma dimensione diversa!</target>
<source>Symbolic links %x have the same date but a different target.</source>
-<target>Collegamento simbolico %x ha stessa data ma un diverso puntamento.</target>
+<target>Il collegamento %x ha stessa data ma un diverso puntamento.</target>
<source>Comparing content of files %x</source>
<target>Comparazione contenuto del file %x</target>
@@ -1329,20 +1287,20 @@ Escludi: \stuff\temp\*
<source>Both sides are equal</source>
<target>Entrambi i lati sono uguali</target>
-<source>Files/folders differ in attributes only</source>
-<target>File/cartelle differiscono solo negli attributi</target>
+<source>Items have different attributes</source>
+<target>Gli elementi hanno differenti attributi</target>
-<source>Copy new file/folder to left</source>
-<target>Copia nuovo file/cartella verso sinistra</target>
+<source>Copy new item to left</source>
+<target>Copia nuovo elemento a sinistra</target>
-<source>Copy new file/folder to right</source>
-<target>Copia nuovo file/cartella verso destra</target>
+<source>Copy new item to right</source>
+<target>Copia nuovo elemento a destra</target>
-<source>Delete left file/folder</source>
-<target>Cancella file/cartella di sinistra</target>
+<source>Delete left item</source>
+<target>Elimina elemento di sinistra</target>
-<source>Delete right file/folder</source>
-<target>Cancella file/cartella di destra</target>
+<source>Delete right item</source>
+<target>Elimina elemento di destra</target>
<source>Move file on left</source>
<target>Sposta il file a sinistra</target>
@@ -1350,20 +1308,20 @@ Escludi: \stuff\temp\*
<source>Move file on right</source>
<target>Sposta il file a destra</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Sovrascrivi file/cartella di sinistra con quello di destra</target>
+<source>Overwrite left item</source>
+<target>Sovrascrivi elemento di sinistra</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Sovrascrivi file/cartella di destra con quello di sinistra</target>
+<source>Overwrite right item</source>
+<target>Sovrascrivi elemento di destra</target>
<source>Do nothing</source>
<target>Non fare nulla</target>
-<source>Copy file attributes only to left</source>
-<target>Copia i soli attributi file verso sinistra</target>
+<source>Update attributes on left</source>
+<target>Aggiorna attributi a sinistra</target>
-<source>Copy file attributes only to right</source>
-<target>Copia i soli attributi file verso destra</target>
+<source>Update attributes on right</source>
+<target>Aggiorna attributi a destra</target>
<source>Multiple...</source>
<target>Multiplo...</target>
@@ -1375,7 +1333,7 @@ Escludi: \stuff\temp\*
<target>Eliminazione cartella %x</target>
<source>Deleting symbolic link %x</source>
-<target>Eliminazione link simbolico %x</target>
+<target>Eliminazione collegamento %x</target>
<source>Moving file %x to recycle bin</source>
<target>Spostamento file %x nel Cestino</target>
@@ -1384,7 +1342,7 @@ Escludi: \stuff\temp\*
<target>Spostamento cartella %x nel Cestino</target>
<source>Moving symbolic link %x to recycle bin</source>
-<target>Spostamento link simbolico %x nel Cestino</target>
+<target>Spostamento collegamento %x nel Cestino</target>
<source>Moving file %x to %y</source>
<target>Spostamento file %x in %y</target>
@@ -1393,13 +1351,13 @@ Escludi: \stuff\temp\*
<target>Spostamento cartella %x in %y</target>
<source>Moving symbolic link %x to %y</source>
-<target>Spostamento link simbolico %x in %y</target>
+<target>Spostamento collegamento %x in %y</target>
<source>Creating file %x</source>
<target>Creazione file %x</target>
<source>Creating symbolic link %x</source>
-<target>Creazione link simbolico %x</target>
+<target>Creazione collegamento %x</target>
<source>Creating folder %x</source>
<target>Creazione cartella %x</target>
@@ -1408,7 +1366,7 @@ Escludi: \stuff\temp\*
<target>Sovrascrittura file %x</target>
<source>Overwriting symbolic link %x</source>
-<target>Sovrascrittura link simbolico %x</target>
+<target>Sovrascrittura collegamento %x</target>
<source>Verifying file %x</source>
<target>Verifica file %x</target>
@@ -1416,11 +1374,11 @@ Escludi: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Aggiornamento attributi di %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Il nome della cartella di destinazione non può essere vuoto!</target>
+<source>Target folder name must not be empty.</source>
+<target>Il nome della cartella di destinazione non può essere vuoto.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Non è stata indicata una cartella per il file delle versioni!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Il nome della cartella per le versioni dei file non può essere vuoto.</target>
<source>Source directory %x not found.</source>
<target>Cartella sorgente %x non trovata.</target>
@@ -1449,8 +1407,8 @@ Escludi: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Cestino non disponibile per i seguenti percorsi! I file verranno cancellati in modo permanente:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Una cartella che fa parte di più coppie di cartelle sarà modificata! Ricontrolla le impostazioni di sincronizzazione!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Verrà modificata una cartella che è parte di molteplici coppie di cartelle. Controlla le impostazioni di sincronizzazione.</target>
<source>Processing folder pair:</source>
<target>Elaborazione coppia di cartelle:</target>
diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng
index 1d7b1b65..bd10d465 100644
--- a/BUILD/Languages/japanese.lng
+++ b/BUILD/Languages/japanese.lng
@@ -7,8 +7,8 @@
<plural definition>0</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>ディレクトリ %x を検索中...</target>
+<source>Searching for folder %x...</source>
+<target>フォルダ %x を検索中...</target>
<source>Show in Explorer</source>
<target>エクスプローラで表示</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>リアルタイム同期 - 自動同期</target>
+<source>Error</source>
+<target>エラー</target>
+
<source>Select alternate comparison settings</source>
<target>代替比較設定を選択</target>
<source>Select alternate synchronization settings</source>
<target>代替同期設定を選択</target>
-<source>No filter selected</source>
-<target>フィルター選択なし</target>
-
<source>Filter is active</source>
<target>フィルターを有効化</target>
+<source>No filter selected</source>
+<target>フィルター選択なし</target>
+
<source>Remove alternate settings</source>
<target>代替設定を除去</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>情報</target>
-<source>Error</source>
-<target>エラー</target>
-
<source>Warning</source>
<target>警告</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>全般的な設定</target>
-<source>Synchronization Preview</source>
-<target>同期処理のプレビュー</target>
+<source>Summary</source>
+<target>概要</target>
<source>Find</source>
<target>検索</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>参照</target>
-<source>Invalid command line: %x</source>
-<target>無効なコマンドライン: %x</target>
+<source>Invalid command line:</source>
+<target>無効なコマンドライン:</target>
<source>Info</source>
<target>情報</target>
@@ -229,23 +229,23 @@
<source>Cannot read the following XML elements:</source>
<target>次の XML要素を読み込めません:</target>
-<source>S&ave configuration...</source>
-<target>構成設定を保存(&A)...</target>
+<source>&Open...</source>
+<target>開く(&O)...</target>
-<source>&Load configuration...</source>
-<target>構成設定の読み込み(&L)...</target>
+<source>&Save...</source>
+<target>保存(&S)...</target>
<source>&Quit</source>
-<target>終了(&Q)</target>
+<target>終了(&Q)(&Q)</target>
-<source>&File</source>
-<target>ファイル(&F)</target>
+<source>&Program</source>
+<target>プログラム(&P)</target>
<source>&Content</source>
<target>トピック(&C)</target>
-<source>&About...</source>
-<target>情報(&A)...</target>
+<source>&About</source>
+<target>情報(&A)</target>
<source>&Help</source>
<target>ヘルプ(&H)</target>
@@ -253,8 +253,8 @@
<source>Usage:</source>
<target>使用方法:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. 監視するディレクトリを選択</target>
+<source>1. Select folders to watch.</source>
+<target>1. 監視するフォルダを選択</target>
<source>2. Enter a command line.</source>
<target>2. コマンドラインを入力</target>
@@ -262,19 +262,11 @@
<source>3. Press 'Start'.</source>
<target>3. 'スタート'をクリック</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-これらのコマンドはその都度実行されます:
-- すべてのディレクトリで利用可能です (例. USB スティックの挿入時)
-- ディレクトリ、またはサブディレクトリ内のファイルは更新されます。
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>一括ファイル(.ffs)からインポートして開始</target>
-<source>Directories to watch</source>
-<target>ディレクトリを監視</target>
+<source>Folders to watch</source>
+<target>監視するフォルダ</target>
<source>Add folder</source>
<target>フォルダを追加</target>
@@ -285,18 +277,35 @@ The command line is executed each time:
<source>Select a folder</source>
<target>フォルダを選択</target>
+<source>Delay [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>Minimum Idle Time [seconds]</source>
-<target>最小待機時間[秒]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>最後の変更の検出から、次にコマンドラインを実行するまでの待機時間(秒)</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+このコマンドのトリガ条件:
+- ファイルまたはサブフォルダの変更
+- 新規フォルダの追加 (例. USB の挿入)
+</target>
<source>Start</source>
<target>開始</target>
+<source>&Retry</source>
+<target>再試行(&R)</target>
+
+<source>Cancel</source>
+<target>キャンセル</target>
+
<source>(Build: %x)</source>
<target>(ビルド: %x)</target>
@@ -315,8 +324,8 @@ The command line is executed each time:
<source>Waiting for missing directories...</source>
<target>見失ったディレクトリの待機中...</target>
-<source>A directory input field is empty.</source>
-<target>ディレクトリが入力されていません</target>
+<source>An input folder name is empty.</source>
+<target>空のフォルダ名入力</target>
<source>Logging</source>
<target>ログ</target>
@@ -402,8 +411,8 @@ The command line is executed each time:
<source><Symlink></source>
<target><シンボリックリンク></target>
-<source><Directory></source>
-<target><ディレクトリ></target>
+<source><Folder></source>
+<target><フォルダ></target>
<source>Full path</source>
<target>フルパス</target>
@@ -414,8 +423,8 @@ The command line is executed each time:
<source>Relative path</source>
<target>相対パス</target>
-<source>Directory</source>
-<target>ディレクトリ</target>
+<source>Base folder</source>
+<target>基準フォルダ</target>
<source>Size</source>
<target>サイズ</target>
@@ -426,8 +435,11 @@ The command line is executed each time:
<source>Extension</source>
<target>拡張子</target>
-<source>Comparison Result</source>
-<target>比較結果</target>
+<source>Action</source>
+<target>操作</target>
+
+<source>Category</source>
+<target>カテゴリ</target>
<source>Drag && drop</source>
<target>ドラッグ && ドロップ</target>
@@ -435,14 +447,14 @@ The command line is executed each time:
<source>Close progress dialog</source>
<target>進捗ダイアログを閉じる</target>
-<source>Shut down</source>
-<target>シャットダウン</target>
+<source>Standby</source>
+<target>スタンバイ</target>
<source>Log off</source>
<target>ログオフ</target>
-<source>Standby</source>
-<target>スタンバイ</target>
+<source>Shut down</source>
+<target>シャットダウン</target>
<source>Hibernate</source>
<target>休止状態</target>
@@ -450,15 +462,12 @@ The command line is executed each time:
<source>1. &Compare</source>
<target>1. 比較(&C)</target>
-<source>2. &Synchronize...</source>
-<target>2. 同期処理(&S)...</target>
+<source>2. &Synchronize</source>
+<target>2. 同期処理(&S)</target>
<source>&New</source>
<target>新規(&N)</target>
-<source>&Program</source>
-<target>プログラム(&P)</target>
-
<source>&Language</source>
<target>使用言語(&L)</target>
@@ -486,8 +495,8 @@ The command line is executed each time:
<source>&Abort</source>
<target>情報(&A)</target>
-<source>Synchronize...</source>
-<target>同期処理...</target>
+<source>Synchronize</source>
+<target>同期処理</target>
<source>Start synchronization</source>
<target>同期の開始</target>
@@ -501,12 +510,12 @@ The command line is executed each time:
<source>Swap sides</source>
<target>パネルを入れ替え</target>
-<source>Save current configuration to file</source>
-<target>現在の設定をファイルに保存</target>
-
<source>Load configuration from file</source>
<target>外部ファイルから構成設定を読み込みます</target>
+<source>Save current configuration to file</source>
+<target>現在の設定をファイルに保存</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>前回使用した構成設定(DEL キーでリストから除去します)</target>
@@ -516,14 +525,14 @@ The command line is executed each time:
<source>Hide filtered or temporarily excluded files</source>
<target>フィルター、または一時除外ファイルを隠す</target>
-<source>Number of files and directories that will be created</source>
-<target>作成されたファイルとディレクトリ数</target>
+<source>Number of files and folders that will be created</source>
+<target>作成されたファイル、およびフォルダの数</target>
<source>Number of files that will be overwritten</source>
<target>上書きされたファイル数</target>
-<source>Number of files and directories that will be deleted</source>
-<target>削除されたファイルとディレクトリ数</target>
+<source>Number of files and folders that will be deleted</source>
+<target>削除されたファイル、およびフォルダの数</target>
<source>Total amount of data that will be transferred</source>
<target>転送されたデータの総量</target>
@@ -546,14 +555,14 @@ The command line is executed each time:
<source>Batch job</source>
<target>一括処理</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>一括バッチファイルを作成して、同期を自動化します、開始方法はバッチファイルをダブルクリックするか次のコマンドを実行します:FreeFileSync.exe SyncJob.ffs_batch. またこの操作はシステムのタスクから実行することも出来ます.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>同期処理を自動的に行うための一括ファイルを作成します。ファイルをダブルクリック,または次のコマンドをタスクから実行:FreeFileSync.exe <ジョブ名>.ffs_batch</target>
<source>Help</source>
<target>ヘルプ</target>
<source>Filter files</source>
-<target>ファイルフィルター</target>
+<target>ファイルフィルター</target>
<source>Left</source>
<target>左側</target>
@@ -573,21 +582,12 @@ The command line is executed each time:
<source>Maximum number of log files:</source>
<target>ログファイルの最大数:</target>
-<source>Select log file directory:</source>
-<target>ログファイルの保存先を選択:</target>
+<source>Select folder to save log files:</source>
+<target>ログファイル保存先フォルダを選択:</target>
<source>Batch settings</source>
<target>一括設定</target>
-<source>&Save</source>
-<target>保存(&S)</target>
-
-<source>&Load</source>
-<target>読み込み(&L)</target>
-
-<source>Cancel</source>
-<target>キャンセル</target>
-
<source>Select variant:</source>
<target>変数を選択:</target>
@@ -612,29 +612,23 @@ The command line is executed each time:
<source>Configuration</source>
<target>構成設定</target>
-<source>Category</source>
-<target>カテゴリ</target>
-
-<source>Action</source>
-<target>操作</target>
-
-<source>File/folder exists on left side only</source>
-<target>左側のみに存在するファイル/フォルダ</target>
+<source>Item exists on left side only</source>
+<target>左側のみに存在する項目</target>
-<source>File/folder exists on right side only</source>
-<target>右側のみに存在するファイル/フォルダ</target>
+<source>Item exists on right side only</source>
+<target>右側のみに存在する項目</target>
-<source>Left file is newer</source>
-<target>左側の新しいファイル</target>
+<source>Left side is newer</source>
+<target>左側がより新しい</target>
-<source>Right file is newer</source>
-<target>右側の新しいファイル</target>
+<source>Right side is newer</source>
+<target>右側がより新しい</target>
-<source>Files have different content</source>
-<target>ファイル内容は異なります</target>
+<source>Items have different content</source>
+<target>内容が異なる項目</target>
-<source>Conflict/file cannot be categorized</source>
-<target>競合があるため分類できません</target>
+<source>Conflict/item cannot be categorized</source>
+<target>競合/項目を分類化できません</target>
<source>OK</source>
<target>OK</target>
@@ -711,9 +705,6 @@ is the same
<source>&Ignore</source>
<target>無視(&I)</target>
-<source>&Retry</source>
-<target>再試行(&R)</target>
-
<source>Do not show this dialog again</source>
<target>次回から表示しない</target>
@@ -744,33 +735,6 @@ Note: File names must be relative to base directories!
注意: ファイル名は基準ディレクトリに比例する必要があります!
</target>
-<source>Hints:</source>
-<target>ヒント:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. 相対ファイル、またはディレクトリを ';' または 改行で区切って入力</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. ワイルドカードに ' * ' と ' ? ' を使用出来ます。</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. コンテキストメニューから直接ファイルを除外出来ます。</target>
-
-<source>Example</source>
-<target>例</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-含める: *.doc;*.zip;*.exe
-除外: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>"temp" のサブフォルダを除いて、すべての.doc、.zip、および.exeファイルを同期</target>
-
<source>Include</source>
<target>含める</target>
@@ -792,8 +756,8 @@ Exclude: \stuff\temp\*
<source>&Default</source>
<target>デフォルト(&D)</target>
-<source>Transactional file copy</source>
-<target>トランザクション・コピーを使用</target>
+<source>Fail-safe file copy</source>
+<target>ファイルコピーの失敗</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>最初に一時ファイル(*.ffs_tmp)に書き込み、それをリネームします。これにより、致命的なエラーが起こっても状態は保証されます</target>
@@ -807,8 +771,8 @@ Exclude: \stuff\temp\*
<source>Copy file access permissions</source>
<target>ファイルのアクセスパーミッションをコピーする</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>ファイルとディレクトリのパーミッション転送(管理者権限が必要)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>転送ファイルとフォルダのパーミッション(管理者権限が必要)</target>
<source>Restore hidden dialogs</source>
<target>隠したダイアログを復帰</target>
@@ -1112,11 +1076,11 @@ Exclude: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>外部のアプリケーションをコンテキストメニューに統合、以下のマクロが利用できます:</target>
-<source>- full file or directory name</source>
-<target>- 完全なファイル/フォルダ名</target>
+<source>- full file or folder name</source>
+<target>- ファイル、フォルダの完全な名前</target>
-<source>- directory part only</source>
-<target>- ディレクトリ部のみ</target>
+<source>- folder part only</source>
+<target>- フォルダ部分のみ</target>
<source>- Other side's counterpart to %name</source>
<target>- %name の反対側の対象</target>
@@ -1158,8 +1122,8 @@ Exclude: \stuff\temp\*
<source>Versioning</source>
<target>バージョン付け</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>ファイルをタイムスタンプ名のサブフォルダに移動</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>サブフォルダのタイムスタンプでファイルを移動</target>
<source>Files</source>
<target>ファイル</target>
@@ -1251,8 +1215,8 @@ Exclude: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>ディレクトリ %x を読み込めません.</target>
-<source>Endless loop.</source>
-<target>エンドレスループ</target>
+<source>Detected endless directory recursion.</source>
+<target>ディレクトリ再帰処理でループを検出</target>
<source>Cannot set privilege %x.</source>
<target>%x の特権をセットできません.</target>
@@ -1278,14 +1242,11 @@ Exclude: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>同期方向のデフォルト設定: 古いファイルに新しいファイルを上書き</target>
-<source>The file does not contain a valid configuration:</source>
-<target>このファイルには有効な構成が含まれていません:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>ディレクトリが空と考慮する場合、このエラーは無視できます。</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>フォルダを空と想定する場合は、このエラーは無視できます.</target>
-<source>Cannot find directory %x.</source>
-<target>ディレクトリ %x がみつかりません.</target>
+<source>Cannot find folder %x.</source>
+<target>フォルダ %x がみつかりません.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>ディレクトリが依存関係にあります! 同期規則の設定時には注意してください:</target>
@@ -1317,20 +1278,20 @@ Exclude: \stuff\temp\*
<source>Both sides are equal</source>
<target>両側とも等しく</target>
-<source>Files/folders differ in attributes only</source>
-<target>属性の異なるファイル/フォルダのみ</target>
+<source>Items have different attributes</source>
+<target>属性が異なる項目</target>
-<source>Copy new file/folder to left</source>
-<target>新しいファイル/フォルダを左側にコピー</target>
+<source>Copy new item to left</source>
+<target>新しい項目を左にコピー</target>
-<source>Copy new file/folder to right</source>
-<target>新しいファイル/フォルダを右側にコピー</target>
+<source>Copy new item to right</source>
+<target>新しい項目を右にコピー</target>
-<source>Delete left file/folder</source>
-<target>左側のファイル/フォルダを削除</target>
+<source>Delete left item</source>
+<target>左の項目を削除</target>
-<source>Delete right file/folder</source>
-<target>右側のファイル/フォルダを削除</target>
+<source>Delete right item</source>
+<target>右の項目を削除</target>
<source>Move file on left</source>
<target>ファイルを左に移動</target>
@@ -1338,20 +1299,20 @@ Exclude: \stuff\temp\*
<source>Move file on right</source>
<target>ファイルを右に移動</target>
-<source>Overwrite left file/folder with right one</source>
-<target>右側のものを左側のファイル/フォルダに上書き</target>
+<source>Overwrite left item</source>
+<target>左の項目に上書き</target>
-<source>Overwrite right file/folder with left one</source>
-<target>左側のものを右側のファイル/フォルダに上書き</target>
+<source>Overwrite right item</source>
+<target>右の項目に上書き</target>
<source>Do nothing</source>
<target>何もしない</target>
-<source>Copy file attributes only to left</source>
-<target>ファイル属性のみ左側にコピー</target>
+<source>Update attributes on left</source>
+<target>左の属性を更新</target>
-<source>Copy file attributes only to right</source>
-<target>ファイル属性のみ右側にコピー</target>
+<source>Update attributes on right</source>
+<target>右の属性を更新</target>
<source>Multiple...</source>
<target>複数処理...</target>
@@ -1404,11 +1365,11 @@ Exclude: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>%x の属性を更新</target>
-<source>Target directory name must not be empty!</source>
-<target>対象ディレクトリ名が空白です!</target>
+<source>Target folder name must not be empty.</source>
+<target>対象フォルダ名に空白は使用出来ません.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>ファイルバージョンが利用できないディレクトリです!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>ファイルバージョンのフォルダ名に空白は使用出来ません.</target>
<source>Source directory %x not found.</source>
<target>ソースディレクトリ %x がみつかりません.</target>
@@ -1437,8 +1398,8 @@ Exclude: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>以下のパスにあるゴミ箱が利用できません! 代わりにファイルは完全削除されます:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>複数ペアのディレクトリ設定部分に変更された箇所があります! 同期設定を再確認してみてください!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>複数フォルダペアの一部であるフォルダが変更されています. 同期設定を確認してください.</target>
<source>Processing folder pair:</source>
<target>フォルダペアを処理中:</target>
diff --git a/BUILD/Languages/korean.lng b/BUILD/Languages/korean.lng
index b7952f45..47561dfe 100644
--- a/BUILD/Languages/korean.lng
+++ b/BUILD/Languages/korean.lng
@@ -7,8 +7,8 @@
<plural definition>0</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>디렉토리 %x 검색 중...</target>
+<source>Searching for folder %x...</source>
+<target>폴더 %x 검색 중...</target>
<source>Show in Explorer</source>
<target>탐색기에 표시</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>실시간 동기화 - 자동 동기화</target>
+<source>Error</source>
+<target>오류</target>
+
<source>Select alternate comparison settings</source>
<target>대체 비교 설정 선택</target>
<source>Select alternate synchronization settings</source>
<target>대체 동기화 설정 선택</target>
-<source>No filter selected</source>
-<target>선택한 필터가 없음</target>
-
<source>Filter is active</source>
<target>필터 활성화</target>
+<source>No filter selected</source>
+<target>선택한 필터가 없음</target>
+
<source>Remove alternate settings</source>
<target>대체설정 제거</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>상세 정보</target>
-<source>Error</source>
-<target>오류</target>
-
<source>Warning</source>
<target>경고</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>전체 설정</target>
-<source>Synchronization Preview</source>
-<target>동기화 미리보기</target>
+<source>Summary</source>
+<target>개요</target>
<source>Find</source>
<target>검색</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>찾아보기</target>
-<source>Invalid command line: %x</source>
-<target>잘못된 명령줄 : %x</target>
+<source>Invalid command line:</source>
+<target>잘못된 명령줄 :</target>
<source>Info</source>
<target>정보</target>
@@ -229,22 +229,22 @@
<source>Cannot read the following XML elements:</source>
<target>다음 XML 요소를 읽을 수 없습니다 :</target>
-<source>S&ave configuration...</source>
-<target>설정 저장</target>
+<source>&Open...</source>
+<target>열기(&O)</target>
-<source>&Load configuration...</source>
-<target>설정 로드</target>
+<source>&Save...</source>
+<target>저장(&S)</target>
<source>&Quit</source>
-<target>종료</target>
+<target>종료(&Q)</target>
-<source>&File</source>
-<target>파일(&F)</target>
+<source>&Program</source>
+<target>프로그램(&P)</target>
<source>&Content</source>
-<target>도움말 내용</target>
+<target>도움말 내용(&C)</target>
-<source>&About...</source>
+<source>&About</source>
<target>상세 정보(&A)</target>
<source>&Help</source>
@@ -253,8 +253,8 @@
<source>Usage:</source>
<target>사용 :</target>
-<source>1. Select directories to monitor.</source>
-<target>1. 모니터 대상이 될 디렉토리를 선택하세요.</target>
+<source>1. Select folders to watch.</source>
+<target>1. 열어 볼 폴더를 선택하세요.</target>
<source>2. Enter a command line.</source>
<target>2. 명령줄을 입력하세요.</target>
@@ -262,19 +262,11 @@
<source>3. Press 'Start'.</source>
<target>3. '시작'을 누르세요.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-명령줄은 다음과 같은 경우에 매번 실행 됩니다:
-- 모든 디렉토리가 사용 가능할 경우 (예 : USB 스틱 삽입시)
-- 해당 디렉토리 또는 서브디렉토리 내의 파일이 변경될 경우
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>시작하려면 .ffs_batch file (일괄 파일)만 가져오면 됩니다.</target>
-<source>Directories to watch</source>
-<target>감시 대상 디렉토리</target>
+<source>Folders to watch</source>
+<target>열어 볼 폴더</target>
<source>Add folder</source>
<target>폴더 추가</target>
@@ -285,18 +277,35 @@ The command line is executed each time:
<source>Select a folder</source>
<target>폴더 선택</target>
+<source>Delay [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>Minimum Idle Time [seconds]</source>
-<target>최소 대기시간 [초 단위]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>마지막 변경내용 감지로부터 다음 명령줄 실행까지 대기시간 [초 단위]</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+명령은 다음과 경우에 실행됩니다 :
+- 파일이나 하위 폴더 변경 시
+- 새 폴더가 생겼을 시 (예 : USB 스틱 삽입)
+</target>
<source>Start</source>
<target>시작</target>
+<source>&Retry</source>
+<target>다시 시도(&R)</target>
+
+<source>Cancel</source>
+<target>취소</target>
+
<source>(Build: %x)</source>
<target>(빌드: %x)</target>
@@ -315,8 +324,8 @@ The command line is executed each time:
<source>Waiting for missing directories...</source>
<target>누락 디렉토리 대기 중...</target>
-<source>A directory input field is empty.</source>
-<target>디렉토리 입력 필드가 비어 있습니다.</target>
+<source>An input folder name is empty.</source>
+<target>입력 폴더 이름이 비어 있습니다.</target>
<source>Logging</source>
<target>로깅</target>
@@ -402,8 +411,8 @@ The command line is executed each time:
<source><Symlink></source>
<target><심링크></target>
-<source><Directory></source>
-<target><디렉토리></target>
+<source><Folder></source>
+<target><폴더></target>
<source>Full path</source>
<target>전체 경로</target>
@@ -414,8 +423,8 @@ The command line is executed each time:
<source>Relative path</source>
<target>대상 경로</target>
-<source>Directory</source>
-<target>디렉토리</target>
+<source>Base folder</source>
+<target>기본 폴더</target>
<source>Size</source>
<target>크기</target>
@@ -426,8 +435,11 @@ The command line is executed each time:
<source>Extension</source>
<target>확장자</target>
-<source>Comparison Result</source>
-<target>비교 결과</target>
+<source>Action</source>
+<target>실행</target>
+
+<source>Category</source>
+<target>카테고리</target>
<source>Drag && drop</source>
<target>드래그 && 드랍 (마우스로 파일 끌어다 놓기)</target>
@@ -435,14 +447,14 @@ The command line is executed each time:
<source>Close progress dialog</source>
<target>프로그레스 다이얼로그 (진행창) 닫기</target>
-<source>Shut down</source>
-<target>종료</target>
+<source>Standby</source>
+<target>대기</target>
<source>Log off</source>
<target>로그오프</target>
-<source>Standby</source>
-<target>대기</target>
+<source>Shut down</source>
+<target>종료</target>
<source>Hibernate</source>
<target>최대절전모드</target>
@@ -450,15 +462,12 @@ The command line is executed each time:
<source>1. &Compare</source>
<target>1. 비교</target>
-<source>2. &Synchronize...</source>
+<source>2. &Synchronize</source>
<target>2. 동기화</target>
<source>&New</source>
<target>신규 작업</target>
-<source>&Program</source>
-<target>프로그램(&P)</target>
-
<source>&Language</source>
<target>언어 선택(&L)</target>
@@ -486,7 +495,7 @@ The command line is executed each time:
<source>&Abort</source>
<target>작업 중지(&A)</target>
-<source>Synchronize...</source>
+<source>Synchronize</source>
<target>동 기 화</target>
<source>Start synchronization</source>
@@ -501,12 +510,12 @@ The command line is executed each time:
<source>Swap sides</source>
<target>양측 위치 바꾸기</target>
-<source>Save current configuration to file</source>
-<target>현재 설정을 파일로 저장</target>
-
<source>Load configuration from file</source>
<target>외부 파일로부터 설정 로드</target>
+<source>Save current configuration to file</source>
+<target>현재 설정을 파일로 저장</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>마지막으로 사용한 설정 (DEL 키를 누르면 리스트에서 삭제)</target>
@@ -516,14 +525,14 @@ The command line is executed each time:
<source>Hide filtered or temporarily excluded files</source>
<target>필터링 되거나 임시 제외될 파일 숨기기</target>
-<source>Number of files and directories that will be created</source>
-<target>생성될 파일 및 디렉토리 개수</target>
+<source>Number of files and folders that will be created</source>
+<target>생성될 파일 및 폴더 ​​개수</target>
<source>Number of files that will be overwritten</source>
<target>덮어 씌어질 파일 개수</target>
-<source>Number of files and directories that will be deleted</source>
-<target>삭제될 파일 및 디렉토리 개수</target>
+<source>Number of files and folders that will be deleted</source>
+<target>삭제될 파일 및 폴더 ​​개수</target>
<source>Total amount of data that will be transferred</source>
<target>전송하게 될 전체 데이터 용량</target>
@@ -546,8 +555,8 @@ The command line is executed each time:
<source>Batch job</source>
<target>일괄 작업</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>일괄 파일 생성 및 자동 동기화. 배치모드 시작은 본 파일을 더블클릭하거나 다음 명령을 실행 : FreeFileSync.exe SyncJob.ffs_batch. 이 작업은 운영체제 작업관리 기능에서도 예약 가능합니다.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>자동 동기화 작업을 위한 일괄 파일을 만듭니다. 본 파일을 더블 클릭하거나 시스템 태스크 플래너에 다음과 같이 예약하세요 : FreeFileSync.exe <job name>.ffs_batch</target>
<source>Help</source>
<target>도움말</target>
@@ -573,21 +582,12 @@ The command line is executed each time:
<source>Maximum number of log files:</source>
<target>최대 로그파일 개수 :</target>
-<source>Select log file directory:</source>
-<target>로그파일 디렉토리 선택 :</target>
+<source>Select folder to save log files:</source>
+<target>로그 파일을 저장할 폴더를 선택 :</target>
<source>Batch settings</source>
<target>일괄 설정</target>
-<source>&Save</source>
-<target>저장(&S)</target>
-
-<source>&Load</source>
-<target>로드(&L)</target>
-
-<source>Cancel</source>
-<target>취소</target>
-
<source>Select variant:</source>
<target>옵션 선택 :</target>
@@ -612,29 +612,23 @@ The command line is executed each time:
<source>Configuration</source>
<target>구성 설정</target>
-<source>Category</source>
-<target>카테고리</target>
-
-<source>Action</source>
-<target>실행</target>
-
-<source>File/folder exists on left side only</source>
-<target>파일/폴더가 좌측에만 존재</target>
+<source>Item exists on left side only</source>
+<target>항목이 좌측에만 존재합니다.</target>
-<source>File/folder exists on right side only</source>
-<target>파일/폴더가 우측에만 존재</target>
+<source>Item exists on right side only</source>
+<target>항목이 우측에만 존재합니다.</target>
-<source>Left file is newer</source>
-<target>좌측 파일이 더 최신</target>
+<source>Left side is newer</source>
+<target>좌측이 더 신규입니다.</target>
-<source>Right file is newer</source>
-<target>우측 파일이 더 최신</target>
+<source>Right side is newer</source>
+<target>우측이 더 신규입니다.</target>
-<source>Files have different content</source>
-<target>파일 내용이 다름</target>
+<source>Items have different content</source>
+<target>항목 내용이 서로 다릅니다.</target>
-<source>Conflict/file cannot be categorized</source>
-<target>충돌/파일 분류 불가능</target>
+<source>Conflict/item cannot be categorized</source>
+<target>충돌 / 항목을 분류할 수 없음</target>
<source>OK</source>
<target>OK</target>
@@ -711,9 +705,6 @@ is the same
<source>&Ignore</source>
<target>무시(&I)</target>
-<source>&Retry</source>
-<target>다시 시도(&R)</target>
-
<source>Do not show this dialog again</source>
<target>다음부터 표시하지 않음</target>
@@ -744,33 +735,6 @@ Note: File names must be relative to base directories!
참고 : 파일 이름은 기본 디렉토리와 상응해야 합니다!
</target>
-<source>Hints:</source>
-<target>힌트 :</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. 관련 파일이나 디렉토리 이름을 ';'로 구분하거나, 줄을 바꿔 입력하세요.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. 와일드카드 문자 '*' 및 '?' 을 사용합니다.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. 컨텍스트 메뉴에서 직접 파일을 제외합니다.</target>
-
-<source>Example</source>
-<target>보기/예</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-포함 : *.doc;*.zip;*.exe
-제외 : \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>서브폴더 "temp" 에 있는 파일들은 제외하고, 이외 모든 .doc, .zip, .exe 확장자 파일 동기화</target>
-
<source>Include</source>
<target>포함</target>
@@ -792,8 +756,8 @@ Exclude: \stuff\temp\*
<source>&Default</source>
<target>기본 설정/값(&D)</target>
-<source>Transactional file copy</source>
-<target>트랜잭션 파일 복사</target>
+<source>Fail-safe file copy</source>
+<target>실패 - 안전 파일 복사</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>임시 파일 (*.ffs_tmp)로 우선 작성 후, 파일명을 변경합니다. 이러면 치명적인 오류가 발생하더라도 일관된 상태를 보장할 수 있습니다.</target>
@@ -807,8 +771,8 @@ Exclude: \stuff\temp\*
<source>Copy file access permissions</source>
<target>파일 접근 권한 복사</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>파일 및 디렉토리 권한 전송 (관리자 권한이 필요함)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>파일 및 폴더 사용 권한 전송 (관리자 권한 필요)</target>
<source>Restore hidden dialogs</source>
<target>숨겨진 대화창 복원</target>
@@ -1112,11 +1076,11 @@ Exclude: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>외부 응용 프로그램을 Context Menu에 통합. 다음 매크로가 사용 가능합니다 :</target>
-<source>- full file or directory name</source>
-<target>- 전체 파일 또는 디렉토리 이름</target>
+<source>- full file or folder name</source>
+<target>- 전체 파일 또는 폴더 이름</target>
-<source>- directory part only</source>
-<target>- 디렉토리 부분만</target>
+<source>- folder part only</source>
+<target>- 폴더 부분만</target>
<source>- Other side's counterpart to %name</source>
<target>- %name 의 반대측 대상</target>
@@ -1158,8 +1122,8 @@ Exclude: \stuff\temp\*
<source>Versioning</source>
<target>버저닝</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>파일을 타임스탬프 된 서브 폴더로 이동</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>시간 기록이 남는 하위 폴더로 파일 이동</target>
<source>Files</source>
<target>파일</target>
@@ -1251,8 +1215,8 @@ Exclude: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>디렉토리 %x 을(를) 읽을 수 없습니다.</target>
-<source>Endless loop.</source>
-<target>무한 루프</target>
+<source>Detected endless directory recursion.</source>
+<target>삭제된 무한 디렉토리 재귀(반복)</target>
<source>Cannot set privilege %x.</source>
<target>권한 %x 을(를) 설정할 수 없습니다.</target>
@@ -1278,14 +1242,11 @@ Exclude: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>기본값 동기화 방향 설정 : 이전 파일들은 신규 파일들로 덮어 쓰여집니다.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>이 파일은 유효한 설정 값을 갖고 있지 않습니다 :</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>디렉토리가 비었다는 오류는 무시 가능합니다.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>폴더를 빈 상태로 가정할 경우, 이 오류는 무시될 수 있습니다.</target>
-<source>Cannot find directory %x.</source>
-<target>디렉토리 %x 을(를) 찾을 수 없습니다.</target>
+<source>Cannot find folder %x.</source>
+<target>폴더 %x 을(를) 찾을 수 없습니다.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>디렉토리가 의존 관계에 있습니다. 동기화 규칙 설정시 주의하십시오.</target>
@@ -1317,20 +1278,20 @@ Exclude: \stuff\temp\*
<source>Both sides are equal</source>
<target>양측이 같음</target>
-<source>Files/folders differ in attributes only</source>
-<target>파일/폴더가 속성만 다름</target>
+<source>Items have different attributes</source>
+<target>항목의 속성이 서로 다릅니다.</target>
-<source>Copy new file/folder to left</source>
-<target>신규 파일/폴더를 좌측으로 복사</target>
+<source>Copy new item to left</source>
+<target>좌측에 새 항목 복사</target>
-<source>Copy new file/folder to right</source>
-<target>신규 파일/폴더를 우측으로 복사</target>
+<source>Copy new item to right</source>
+<target>우측에 새 항목 복사</target>
-<source>Delete left file/folder</source>
-<target>남은 파일/폴더 삭제</target>
+<source>Delete left item</source>
+<target>좌측 항목 삭제</target>
-<source>Delete right file/folder</source>
-<target>우측 파일/폴더 삭제</target>
+<source>Delete right item</source>
+<target>우측 항목 삭제</target>
<source>Move file on left</source>
<target>좌측 파일 이동</target>
@@ -1338,20 +1299,20 @@ Exclude: \stuff\temp\*
<source>Move file on right</source>
<target>우측 파일 이동</target>
-<source>Overwrite left file/folder with right one</source>
-<target>우측 파일/폴더로 좌측 파일/폴더 덮어쓰기</target>
+<source>Overwrite left item</source>
+<target>좌측 항목 덮어쓰기</target>
-<source>Overwrite right file/folder with left one</source>
-<target>좌측 파일/폴더로 우측 파일/폴더 덮어쓰기</target>
+<source>Overwrite right item</source>
+<target>우측 항목 덮어쓰기</target>
<source>Do nothing</source>
<target>아무 것도 하지 않음</target>
-<source>Copy file attributes only to left</source>
-<target>파일 속성만 좌측으로 복사</target>
+<source>Update attributes on left</source>
+<target>좌측 속성 업데이트</target>
-<source>Copy file attributes only to right</source>
-<target>파일 속성만 우측으로 복사</target>
+<source>Update attributes on right</source>
+<target>우측 속성 업데이트</target>
<source>Multiple...</source>
<target>다중처리 (멀티플) 작업...</target>
@@ -1404,11 +1365,11 @@ Exclude: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>%x 속성 업데이트 중</target>
-<source>Target directory name must not be empty!</source>
-<target>대상 디렉토리 이름이 비어서는 안 됩니다!</target>
+<source>Target folder name must not be empty.</source>
+<target>대상 폴더 이름은 비워둘 수 없습니다.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>파일 버저닝을 위한 디렉토리가 제공되지 않았습니다!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>파일 버저닝을 위한 폴더 이름은 비워둘 수 없습니다.</target>
<source>Source directory %x not found.</source>
<target>소스 디렉토리 %x 을(를) 찾을 수 없습니다.</target>
@@ -1437,8 +1398,8 @@ Exclude: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>다음 경로로는 휴지통을 사용할 수 없습니다! 대신 파일을 영구적으로 삭제합니다 :</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>다중폴더 페어의 일부인 디렉토리가 변경됩니다. 동기화 설정을 재검토해 주세요.</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>다중 폴더 페어의 일부인 폴더가 변경됩니다. 동기화 설정을 재검토하세요.</target>
<source>Processing folder pair:</source>
<target>폴더 페어 처리 중 :</target>
diff --git a/BUILD/Languages/lithuanian.lng b/BUILD/Languages/lithuanian.lng
index 9506c48c..e30eb48c 100644
--- a/BUILD/Languages/lithuanian.lng
+++ b/BUILD/Languages/lithuanian.lng
@@ -7,8 +7,8 @@
<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>Searching for directory %x...</source>
-<target>Iškoma aplanko %x...</target>
+<source>Searching for folder %x...</source>
+<target>Ieškoma aplanko %x...</target>
<source>Show in Explorer</source>
<target>Rodyti naršyklėje</target>
@@ -17,7 +17,7 @@
<target>Atverti su numatyta programa</target>
<source>Browse directory</source>
-<target>Naršyti aplanką</target>
+<target>Naršyti katalogą</target>
<source>Abort requested: Waiting for current operation to finish...</source>
<target>Nutraukti: laukiama kol baigsis esama operacija...</target>
@@ -34,12 +34,12 @@
<source>Select alternate synchronization settings</source>
<target>Pasirinkite alternatyvius sinchronizavimo nustatymus</target>
-<source>No filter selected</source>
-<target>Nepažymėti jokie filtrai</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>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Bendri nustatymai</target>
-<source>Synchronization Preview</source>
-<target>Sinchronizavimo peržiūra</target>
+<source>Summary</source>
+<target>Suvestinė</target>
<source>Find</source>
<target>Rasti</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Naršyti</target>
-<source>Invalid command line: %x</source>
-<target>Netinkama komandinė eilutė: %x</target>
+<source>Invalid command line:</source>
+<target>Netinkama komandinė eilutė:</target>
<source>Info</source>
<target>Informacija</target>
@@ -172,10 +172,10 @@
<target>Nepavyksta gauti eigos informacijos.</target>
<source>Waiting while directory is locked (%x)...</source>
-<target>Laikiama kol aplankas bus užrakintas (%x)...</target>
+<target>Laikiama kol katalogas bus užrakintas (%x)...</target>
<source>Cannot set directory lock %x.</source>
-<target>Nepavyksta nustatyti aplanko užrakto %x.</target>
+<target>Nepavyksta nustatyti katalogo užrakto %x.</target>
<source>
<pluralform>1 sec</pluralform>
@@ -232,29 +232,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>Tomo pavadinimas %x nėra dalis failo pavadinimo %y!</target>
-<source>Cannot find file %x.</source>
-<target>Nepavyksta rasti failo %x.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Nepavyksta perskaityti sekančių XML elementų:</target>
-<source>S&ave configuration...</source>
-<target>Išs&augoti nustatymus...</target>
+<source>Cannot find file %x.</source>
+<target>Nepavyksta rasti failo %x.</target>
-<source>&Load configuration...</source>
-<target>Įke&lti nustatymus...</target>
+<source>&Open...</source>
+<target>&Atverti...</target>
+
+<source>&Save...</source>
+<target>&Išsaugoti...</target>
<source>&Quit</source>
<target>&Išeiti</target>
-<source>&File</source>
-<target>&Failas</target>
+<source>&Program</source>
+<target>&Programa</target>
<source>&Content</source>
<target>&Turinys</target>
-<source>&About...</source>
-<target>&Apie...</target>
+<source>&About</source>
+<target>&Apie</target>
<source>&Help</source>
<target>&Pagalba</target>
@@ -262,8 +262,8 @@
<source>Usage:</source>
<target>Naudojimas:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Pažymėti aplankus stebėjimui.</target>
+<source>1. Select folders to watch.</source>
+<target>1. Pasirinkite stebimus aplankus.</target>
<source>2. Enter a command line.</source>
<target>2. Įvesti komandinę eilutę.</target>
@@ -271,19 +271,11 @@
<source>3. Press 'Start'.</source>
<target>3. Spauskite „Pradėti“'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Komandinė eilutė yra įvykdoma kas kart:
-- visi aplankai tampa pasiekiamais (pvz. USB atmintukas įkišamas)
-- failai šiuose aplankuose ar poaplankiuose yra pakeisti
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Kad pradėti tiesiog importuokite .ffs_batch failą.</target>
-<source>Directories to watch</source>
-<target>Aplankai stebėjimui</target>
+<source>Folders to watch</source>
+<target>Stebimi aplankai</target>
<source>Add folder</source>
<target>Pridėti aplanką</target>
@@ -294,14 +286,25 @@ Komandinė eilutė yra įvykdoma kas kart:
<source>Select a folder</source>
<target>Pažymėti aplanką</target>
+<source>Delay [seconds]</source>
+<target>Atidėti [sekundės]</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>
+
<source>Command line</source>
<target>Komandinė eilutė</target>
-<source>Minimum Idle Time [seconds]</source>
-<target>Mažiausias neveikimo laikas [sekundės]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Neveikimo laikas tarp paskutinio pakeitimo nustatymo ir komandinės eilutės įvykdymo sekundėmis</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Komanda inicijuojama jei:
+- failai arba poaplankiai keičiasi
+- atsiranda nauji aplankai (pvz.: įkišamas USB raktas)
+</target>
<source>Start</source>
<target>Pradėti</target>
@@ -328,10 +331,10 @@ Komandinė eilutė yra įvykdoma kas kart:
<target>Stebėjimas aktyvus...</target>
<source>Waiting for missing directories...</source>
-<target>Laikiama trūkstamų aplankų...</target>
+<target>Laikiama trūkstamų katalogų...</target>
-<source>A directory input field is empty.</source>
-<target>Aplanko įvedimo laukelis yra tuščias.</target>
+<source>An input folder name is empty.</source>
+<target>Įvesties aplanko pavadinimas yra tuščias.</target>
<source>Logging</source>
<target>Užduoties duomenys</target>
@@ -417,8 +420,8 @@ Komandinė eilutė yra įvykdoma kas kart:
<source><Symlink></source>
<target><Simbolinė nuoroda></target>
-<source><Directory></source>
-<target><Aplankas></target>
+<source><Folder></source>
+<target><Aplankai></target>
<source>Full path</source>
<target>Pilnas kelias</target>
@@ -429,8 +432,8 @@ Komandinė eilutė yra įvykdoma kas kart:
<source>Relative path</source>
<target>Atitinkamas kelias</target>
-<source>Directory</source>
-<target>Aplankas</target>
+<source>Base folder</source>
+<target>Bazinis aplankas</target>
<source>Size</source>
<target>Dydis</target>
@@ -441,8 +444,11 @@ Komandinė eilutė yra įvykdoma kas kart:
<source>Extension</source>
<target>Plėtinys</target>
-<source>Comparison Result</source>
-<target>Sulyginimo rezultatas</target>
+<source>Action</source>
+<target>Veiksmas</target>
+
+<source>Category</source>
+<target>Kategorija</target>
<source>Drag && drop</source>
<target>Vilkti ir numesti</target>
@@ -450,14 +456,14 @@ Komandinė eilutė yra įvykdoma kas kart:
<source>Close progress dialog</source>
<target>Uždaryti eigos langą</target>
-<source>Shut down</source>
-<target>Išjungti kompiuterį</target>
+<source>Standby</source>
+<target>Stabdyti į diską</target>
<source>Log off</source>
<target>Atsijungti</target>
-<source>Standby</source>
-<target>Stabdyti į diską</target>
+<source>Shut down</source>
+<target>Išjungti kompiuterį</target>
<source>Hibernate</source>
<target>Stabdyti į operatyviąją atmintį</target>
@@ -465,15 +471,12 @@ Komandinė eilutė yra įvykdoma kas kart:
<source>1. &Compare</source>
<target>1. &Sulyginti</target>
-<source>2. &Synchronize...</source>
-<target>2. &Sinchronizuoti...</target>
+<source>2. &Synchronize</source>
+<target>2. &Sinchronizuoti</target>
<source>&New</source>
<target>&Naujas</target>
-<source>&Program</source>
-<target>&Programa</target>
-
<source>&Language</source>
<target>&Kalba</target>
@@ -501,8 +504,8 @@ Komandinė eilutė yra įvykdoma kas kart:
<source>&Abort</source>
<target>&Nutraukti</target>
-<source>Synchronize...</source>
-<target>Sinchronizuoti...</target>
+<source>Synchronize</source>
+<target>Sinchronizuoti</target>
<source>Start synchronization</source>
<target>Pradėti sinchronizavimą</target>
@@ -516,12 +519,12 @@ Komandinė eilutė yra įvykdoma kas kart:
<source>Swap sides</source>
<target>Sukeisti puses</target>
-<source>Save current configuration to file</source>
-<target>Išsaugoti esamus nustatymus į failą</target>
-
<source>Load configuration from file</source>
<target>Įkelti nustatymus iš failo</target>
+<source>Save current configuration to file</source>
+<target>Išsaugoti esamus nustatymus į failą</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Paskiausiai naudoti nustatymai (spauskite DEL, kad pašalinti iš sąrašo)</target>
@@ -531,14 +534,14 @@ Komandinė eilutė yra įvykdoma kas kart:
<source>Hide filtered or temporarily excluded files</source>
<target>Slėpti išfiltruotus ar laikinai neįtrauktus failus</target>
-<source>Number of files and directories that will be created</source>
-<target>Skaičius failų ir aplankų, kurie bus sukurti</target>
+<source>Number of files and folders that will be created</source>
+<target>Failų ir aplankų, kurie bus sukurti, skaičius</target>
<source>Number of files that will be overwritten</source>
<target>Skaičius failų, kurie bus perrašyti</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Skaičius failų ir aplankų, kurie bus ištrinti</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Failų ir aplankų, kurie bus ištrinti, skaičius</target>
<source>Total amount of data that will be transferred</source>
<target>Visas duomenų kiekis, kuris bus perduotas</target>
@@ -561,8 +564,8 @@ Komandinė eilutė yra įvykdoma kas kart:
<source>Batch job</source>
<target>Paketinė užduotis</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Sukurti paketinės užduoties failą ir automatizuoti sinchronizavimą. Kad paleisti paketinės užduoties veiksenoje tiesiog du kartus spustelėkite ant šio failo arba paleiskite komandą: FreeFileSync.exe SyncJob.ffs_batch. Tai taip pat gali būti įtraukta į Jūsų sistemos užduočių tvarkyklės planą.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Sukurkite paketinės užduoties failą, kad automatizuoti sinchronizaciją. Spragtelėkite du kartus šį failą arba nustatykite Jūsų sistemos užduočių planuoklėje: FreeFileSync.exe <užduoties pavadinimas>.ffs_batch</target>
<source>Help</source>
<target>Pagalba</target>
@@ -588,18 +591,12 @@ Komandinė eilutė yra įvykdoma kas kart:
<source>Maximum number of log files:</source>
<target>Didžiausias ataskaitų failų skaičius:</target>
-<source>Select log file directory:</source>
-<target>Pažymėti ataskaitos failų aplanką:</target>
+<source>Select folder to save log files:</source>
+<target>Pasirinkite aplanką, kuriame saugoti ataskaitų failus:</target>
<source>Batch settings</source>
<target>Paketinės užduoties nustatymai</target>
-<source>&Save</source>
-<target>&Išsaugoti</target>
-
-<source>&Load</source>
-<target>Į&kelti</target>
-
<source>Select variant:</source>
<target>Pažymėkite variantą:</target>
@@ -624,29 +621,23 @@ Komandinė eilutė yra įvykdoma kas kart:
<source>Configuration</source>
<target>Nustatymai</target>
-<source>Category</source>
-<target>Kategorija</target>
+<source>Item exists on left side only</source>
+<target>Elementas egzistuoja tik kairėje pusėje</target>
-<source>Action</source>
-<target>Veiksmas</target>
-
-<source>File/folder exists on left side only</source>
-<target>Failas/aplankas egzistuoja tik kairiame aplanke</target>
-
-<source>File/folder exists on right side only</source>
-<target>Failas/aplankas egzistuoja tik dešiniame aplanke</target>
+<source>Item exists on right side only</source>
+<target>Elementas egzistuoja tik dešinėje pusėje</target>
-<source>Left file is newer</source>
-<target>Kairysis failas yra naujesnis</target>
+<source>Left side is newer</source>
+<target>Kairė pusė yra naujesnė</target>
-<source>Right file is newer</source>
-<target>Dešinysis failas yra naujesnis</target>
+<source>Right side is newer</source>
+<target>Dešinė pusė yra naujesnė</target>
-<source>Files have different content</source>
-<target>Failai turi skirtingą turinį</target>
+<source>Items have different content</source>
+<target>Elementai turi skirtingą turinį</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Konfliktas/failo negalima kategorizuoti</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Konfliktas/elementas negali būti kategorizuojamas</target>
<source>OK</source>
<target>Gerai</target>
@@ -750,36 +741,9 @@ Note: File names must be relative to base directories!
</source>
<target>
Tik failai, kurie atitinka visus filtro nustatymus bus sinchronizuoti.
-Pastaba: Failų pavadinimai privalo atitikti bazinius aplankus!
-</target>
-
-<source>Hints:</source>
-<target>Patarimai:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Įveskite atitinkamus failo ar aplanko pavadinimus atskirtus su ';' ar naujoje eilutėje.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Naudokite pakaitos simbolius '*' ir '?'.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Išskirkite failus tiesiogiai pagrindiniame tinklelyje per kontekstinį meniu.</target>
-
-<source>Example</source>
-<target>Pavyzdys</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Įtraukti: *.doc;*.zip;*.exe
-Išsirti: \stuff\temp\*
+Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
</target>
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Sinchronizuoti visus .doc, .zip ir .exe failus iškyrus viską poaplankyje „temp“.</target>
-
<source>Include</source>
<target>Įtraukti</target>
@@ -801,8 +765,8 @@ Išsirti: \stuff\temp\*
<source>&Default</source>
<target>&Numatyta</target>
-<source>Transactional file copy</source>
-<target>Suderintas failų kopijavimas</target>
+<source>Fail-safe file copy</source>
+<target>Apsauginė failo kopija</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Pirmiausiai rašyti į laikinąjį failą (*.ffs_tmp), tada pervardinti jį. Tai garantuoja pastovumą net ir kritinės klaidos atveju.</target>
@@ -816,8 +780,8 @@ Išsirti: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Kopijuoti failo leidimus</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Perkelti failo ir aplanko leidimus (Reikalingos administratoriaus teisės)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Perkelti failo ir aplanko leidimus (Reikalauja administratoriaus teisų)</target>
<source>Restore hidden dialogs</source>
<target>Atstatyti paslėptus langus</target>
@@ -1006,7 +970,7 @@ Išsirti: \stuff\temp\*
<target>Rodyti failus, kurie ne bus kopijuojami</target>
<source>All directories in sync!</source>
-<target>Visi aplankai sinchronizavime!</target>
+<target>Visi katalogai sinchronizuoti!</target>
<source>Please run a Compare first before synchronizing!</source>
<target>Prašome paleisti sulyginimą prieš sinchronizavimą!</target>
@@ -1036,10 +1000,10 @@ Išsirti: \stuff\temp\*
<pluralform>%x directories</pluralform>
</source>
<target>
-<pluralform>1 aplankas</pluralform>
-<pluralform>%x aplankai</pluralform>
-<pluralform>%x aplankų</pluralform>
-<pluralform>%x aplankai</pluralform>
+<pluralform>1 katalogas</pluralform>
+<pluralform>%x katalogai</pluralform>
+<pluralform>%x katalogų</pluralform>
+<pluralform>%x katalogai</pluralform>
</target>
<source>
@@ -1133,10 +1097,10 @@ Išsirti: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Integruoti išorines programas į kontekstinį meniu. Sekantys makro galimi:</target>
-<source>- full file or directory name</source>
+<source>- full file or folder name</source>
<target>- pilnas failo ar aplanko pavadinimas</target>
-<source>- directory part only</source>
+<source>- folder part only</source>
<target>- tik aplanko dalis</target>
<source>- Other side's counterpart to %name</source>
@@ -1185,8 +1149,8 @@ Išsirti: \stuff\temp\*
<source>Versioning</source>
<target>Versijavimas</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Perkelti failus į laiku pažymėtą poaplankį</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Perkelti failus į laiku pažymėtus poaplankius</target>
<source>Files</source>
<target>Failai</target>
@@ -1237,7 +1201,7 @@ Išsirti: \stuff\temp\*
</target>
<source>Cannot monitor directory %x.</source>
-<target>Nepavyko stebėti aplanko %x.</target>
+<target>Nepavyko stebėti katalogo %x.</target>
<source>Conversion error:</source>
<target>Konvertavimo klaida:</target>
@@ -1252,7 +1216,7 @@ Išsirti: \stuff\temp\*
<target>Nepavyksta perkelti failo %x į %y.</target>
<source>Cannot delete directory %x.</source>
-<target>Nepavyksta ištrinti aplanko %x.</target>
+<target>Nepavyksta ištrinti katalogo %x.</target>
<source>Cannot write modification time of %x.</source>
<target>Nepavyksta šrašyti pakeitimo datos %x.</target>
@@ -1273,7 +1237,7 @@ Išsirti: \stuff\temp\*
<target>Nepavyksta įrašyti leidimų %x.</target>
<source>Cannot create directory %x.</source>
-<target>Nepavyksta sukurti aplanko %x.</target>
+<target>Nepavyksta sukurti katalogo %x.</target>
<source>Cannot copy symbolic link %x to %y.</source>
<target>Nepavyksta nukopijuoti simbolinės nuorodos %x į %y.</target>
@@ -1285,10 +1249,10 @@ Išsirti: \stuff\temp\*
<target>Nepavyksta nukopijuoti failo %x į %y.</target>
<source>Cannot read directory %x.</source>
-<target>Nepavyksta nuskaityti aplanko %x.</target>
+<target>Nepavyksta nuskaityti katalogo %x.</target>
-<source>Endless loop.</source>
-<target>Nesibaigiantis ciklas</target>
+<source>Detected endless directory recursion.</source>
+<target>Aptikri nesibaigiančią katalogo rekursiją.</target>
<source>Cannot set privilege %x.</source>
<target>Nepavyksta nustatyti privilegijos %x.</target>
@@ -1314,17 +1278,14 @@ Išsirti: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Nustatomos numatytos sinchronizavimo kryptys: Seni failai bus perrašyti naujesniais failais.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Failas neturi tinkamų nustatymų:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Jūs galite ignoruoti šią klaidą, kad laikyti aplanką tuščiu.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Galite ignoruoti šią klaidą, kad laikyti aplanką tuščiu.</target>
-<source>Cannot find directory %x.</source>
-<target>Nepavyksta rasti aplanko %x</target>
+<source>Cannot find folder %x.</source>
+<target>Nepavyksta rasti aplanko %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
-<target>Aplankai yra priklausomi! Būkite atsargūs nustatydami sinchronizavimo taisykles:</target>
+<target>Katalogai yra priklausomi! Būkite atsargūs nustatydami sinchronizavimo taisykles:</target>
<source>Preparing synchronization...</source>
<target>Ruošiamas sinchronizavimas...</target>
@@ -1353,20 +1314,20 @@ Išsirti: \stuff\temp\*
<source>Both sides are equal</source>
<target>Abi pusės yra lygios</target>
-<source>Files/folders differ in attributes only</source>
-<target>Failai/aplankai skiriasi tik pagal atributus</target>
+<source>Items have different attributes</source>
+<target>Elementai turi skirtingus atributus</target>
-<source>Copy new file/folder to left</source>
-<target>Kopijuoti naują failą/aplanką į kairę</target>
+<source>Copy new item to left</source>
+<target>Kopijuoti naują elementą į kairę</target>
-<source>Copy new file/folder to right</source>
-<target>Kopijuoti naują failą/aplanką į dešinę</target>
+<source>Copy new item to right</source>
+<target>Kopijuoti naują elementą į dešinę</target>
-<source>Delete left file/folder</source>
-<target>Trinti kairį failą/aplanką</target>
+<source>Delete left item</source>
+<target>Ištrinti kairįjį elementą</target>
-<source>Delete right file/folder</source>
-<target>Trinti dešinį failą/aplanką</target>
+<source>Delete right item</source>
+<target>Ištrinti dešinįjį elementą</target>
<source>Move file on left</source>
<target>Perkelti failą į kairę</target>
@@ -1374,20 +1335,20 @@ Išsirti: \stuff\temp\*
<source>Move file on right</source>
<target>Perkelti failą į dešinę</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Perrašyti kairį failą/aplanką su dešiniuoju</target>
+<source>Overwrite left item</source>
+<target>Perrašyti kairįjį elementą</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Perrašyti dešinįjį failą/aplanką su kairiuoju</target>
+<source>Overwrite right item</source>
+<target>Perrašyti dešinįjį elementą</target>
<source>Do nothing</source>
<target>Nieko nedaryti</target>
-<source>Copy file attributes only to left</source>
-<target>Kopijuoti failo atributus tik į kairę</target>
+<source>Update attributes on left</source>
+<target>Atnaujinti atributus kairėje</target>
-<source>Copy file attributes only to right</source>
-<target>Kopijuoti failo atributus tik į dešinę</target>
+<source>Update attributes on right</source>
+<target>Atnaujinti atributus dešinėje</target>
<source>Multiple...</source>
<target>Keletas...</target>
@@ -1440,14 +1401,14 @@ Išsirti: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Atnaujinami atributai %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Tikslo aplankas privalo būti ne tuščias!</target>
+<source>Target folder name must not be empty.</source>
+<target>Tikslo aplanko pavadinimas privalo nebūti tuščias.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Aplankas failo versijavimui nebuvo pateiktas!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Aplanko pavadinimas failų versionavimui privalo nebūti tuščias.</target>
<source>Source directory %x not found.</source>
-<target>Šaltinio aplankas %x nerastas.</target>
+<target>Šaltinio katalogas %x nerastas.</target>
<source>Unresolved conflicts existing!</source>
<target>Yra neišspręstų konfliktų!</target>
@@ -1473,8 +1434,8 @@ Išsirti: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Šiukšliadėžė nepasiekiama sekantiems keliams! Failai bus ištrinti visam laikui išskyrus:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Aplankas, kuris bus keičiamas yra dalis keletos aplankų porų! Prašome peržiūrėti sinchronizavimo nustatymus!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Aplankas, kuris yra dalis keletos aplankų porų, bus pakeistas. Prašome peržiūrėti sinchronizavimo nustatymus.</target>
<source>Processing folder pair:</source>
<target>Apdorojama aplankų pora:</target>
diff --git a/BUILD/Languages/norwegian.lng b/BUILD/Languages/norwegian.lng
index 31474eb8..89bac192 100644
--- a/BUILD/Languages/norwegian.lng
+++ b/BUILD/Languages/norwegian.lng
@@ -7,8 +7,8 @@
<plural definition>n == 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Søker etter mappe %x...</target>
+<source>Searching for folder %x...</source>
+<target></target>
<source>Show in Explorer</source>
<target>Vis i Utforsker</target>
@@ -34,12 +34,12 @@
<source>Select alternate synchronization settings</source>
<target>Velg alternative synkroniseringsinnstillinger</target>
-<source>No filter selected</source>
-<target>Ingen filter valgt</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>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Felles innstillinger</target>
-<source>Synchronization Preview</source>
-<target>Forhåndsvisning for synkronisering</target>
+<source>Summary</source>
+<target></target>
<source>Find</source>
<target>Søk</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Bla gjennom</target>
-<source>Invalid command line: %x</source>
-<target>Ugyldig kommando: %x</target>
+<source>Invalid command line:</source>
+<target>Ugyldig kommando:</target>
<source>Info</source>
<target>Info</target>
@@ -232,23 +232,23 @@
<source>Cannot read the following XML elements:</source>
<target>Kan ikke lese følgende XML-elementer:</target>
-<source>S&ave configuration...</source>
-<target>L&agre innstilling...</target>
+<source>&Open...</source>
+<target></target>
-<source>&Load configuration...</source>
-<target>&Last innstilling...</target>
+<source>&Save...</source>
+<target></target>
<source>&Quit</source>
<target>&Avslutt</target>
-<source>&File</source>
-<target>&Fil</target>
+<source>&Program</source>
+<target>&Program</target>
<source>&Content</source>
<target>&Innhold</target>
-<source>&About...</source>
-<target>&Om programmet...</target>
+<source>&About</source>
+<target>&Om programmet</target>
<source>&Help</source>
<target>&Hjelp</target>
@@ -256,8 +256,8 @@
<source>Usage:</source>
<target>Bruk:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Velg mapper å overvåke.</target>
+<source>1. Select folders to watch.</source>
+<target></target>
<source>2. Enter a command line.</source>
<target>2. Oppfør en kommandolinje.</target>
@@ -265,19 +265,11 @@
<source>3. Press 'Start'.</source>
<target>3. Trykk 'Start'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Kommandolinjen kjøres hver gang:
-- Alle mapper blir tilgjengelige (f.eks. ved innsetting av USB-minnepinne)
-- Filer i disse mapper eller undermapper endres
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target></target>
-<source>Directories to watch</source>
-<target>Mapper å overvåke</target>
+<source>Folders to watch</source>
+<target></target>
<source>Add folder</source>
<target>Legg til mappe</target>
@@ -288,14 +280,21 @@ Kommandolinjen kjøres hver gang:
<source>Select a folder</source>
<target>Velg en mappe</target>
+<source>Delay [seconds]</source>
+<target></target>
+
+<source>Idle time between last detected change and execution of command</source>
+<target></target>
+
<source>Command line</source>
<target>Kommandolinje</target>
-<source>Minimum Idle Time [seconds]</source>
-<target>Minimum pausetid [sekunder]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Uvirksom tid mellom oppdaging av siste endring og kjøring av kommandolinje i sekunder</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target></target>
<source>Start</source>
<target>Start</target>
@@ -324,8 +323,8 @@ Kommandolinjen kjøres hver gang:
<source>Waiting for missing directories...</source>
<target>Venter på manglende mapper...</target>
-<source>A directory input field is empty.</source>
-<target>Et inndatafelt for mappe er tomt.</target>
+<source>An input folder name is empty.</source>
+<target></target>
<source>Logging</source>
<target>Logging</target>
@@ -411,8 +410,8 @@ Kommandolinjen kjøres hver gang:
<source><Symlink></source>
<target><Symbolsk lenke></target>
-<source><Directory></source>
-<target><Mappe></target>
+<source><Folder></source>
+<target></target>
<source>Full path</source>
<target>Full bane</target>
@@ -423,8 +422,8 @@ Kommandolinjen kjøres hver gang:
<source>Relative path</source>
<target>Relativ bane</target>
-<source>Directory</source>
-<target>Mappe</target>
+<source>Base folder</source>
+<target></target>
<source>Size</source>
<target>Størrelse</target>
@@ -435,8 +434,11 @@ Kommandolinjen kjøres hver gang:
<source>Extension</source>
<target>Filendelse</target>
-<source>Comparison Result</source>
-<target>Sammenligningsresultat</target>
+<source>Action</source>
+<target>Handling</target>
+
+<source>Category</source>
+<target>Kategori</target>
<source>Drag && drop</source>
<target>Dra && slipp</target>
@@ -444,14 +446,14 @@ Kommandolinjen kjøres hver gang:
<source>Close progress dialog</source>
<target>Lukk framdriftsvindu</target>
-<source>Shut down</source>
-<target>Slå av maskinen</target>
+<source>Standby</source>
+<target>Standby</target>
<source>Log off</source>
<target>Logg av</target>
-<source>Standby</source>
-<target>Standby</target>
+<source>Shut down</source>
+<target>Slå av maskinen</target>
<source>Hibernate</source>
<target>Sett i dvalemodus</target>
@@ -459,15 +461,12 @@ Kommandolinjen kjøres hver gang:
<source>1. &Compare</source>
<target>1. Sammen&lign</target>
-<source>2. &Synchronize...</source>
-<target>2. &Synkroniser...</target>
+<source>2. &Synchronize</source>
+<target>2. &Synkroniser</target>
<source>&New</source>
<target>&Ny</target>
-<source>&Program</source>
-<target>&Program</target>
-
<source>&Language</source>
<target>&Språk</target>
@@ -495,8 +494,8 @@ Kommandolinjen kjøres hver gang:
<source>&Abort</source>
<target>&Avbryt</target>
-<source>Synchronize...</source>
-<target>Synkroniser...</target>
+<source>Synchronize</source>
+<target>Synkroniser</target>
<source>Start synchronization</source>
<target>Start synkronisering</target>
@@ -510,12 +509,12 @@ Kommandolinjen kjøres hver gang:
<source>Swap sides</source>
<target>Bytt sider</target>
-<source>Save current configuration to file</source>
-<target>Lagre gjeldende innstilling til fil</target>
-
<source>Load configuration from file</source>
<target>Last innstilling fra fil</target>
+<source>Save current configuration to file</source>
+<target>Lagre gjeldende innstilling til fil</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Sist brukte innstillinger (trykk DEL for å fjerne fra liste)</target>
@@ -525,14 +524,14 @@ Kommandolinjen kjøres hver gang:
<source>Hide filtered or temporarily excluded files</source>
<target>Skjul filtrerte eller midlertidig ekskluderte filer</target>
-<source>Number of files and directories that will be created</source>
-<target>Antall filer og mapper som blir opprettet</target>
+<source>Number of files and folders that will be created</source>
+<target></target>
<source>Number of files that will be overwritten</source>
<target>Antall filer som blir overskrevet</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Antal filer og mapper som blir slettet</target>
+<source>Number of files and folders that will be deleted</source>
+<target></target>
<source>Total amount of data that will be transferred</source>
<target>Totale antall data som blir overført</target>
@@ -555,8 +554,8 @@ Kommandolinjen kjøres hver gang:
<source>Batch job</source>
<target>Batch-jobb</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Opprett en batch-fil og automatiser synkronisering. For å starte i batch-modus dobbeltklikk denne filen eller kjør kommandoen: FreeFileSync.exe SyncJob.ffs_batch. Dette kan også planlegges i ditt systems oppgaveplanlegger.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target></target>
<source>Help</source>
<target>Hjelp</target>
@@ -582,18 +581,12 @@ Kommandolinjen kjøres hver gang:
<source>Maximum number of log files:</source>
<target>Maksimale antall loggfiler:</target>
-<source>Select log file directory:</source>
-<target>Velg loggfilmappe:</target>
+<source>Select folder to save log files:</source>
+<target></target>
<source>Batch settings</source>
<target>Batch-innstillinger</target>
-<source>&Save</source>
-<target>La&gre</target>
-
-<source>&Load</source>
-<target>&Last</target>
-
<source>Select variant:</source>
<target>Velg variant:</target>
@@ -618,29 +611,23 @@ Kommandolinjen kjøres hver gang:
<source>Configuration</source>
<target>Innstilling</target>
-<source>Category</source>
-<target>Kategori</target>
+<source>Item exists on left side only</source>
+<target></target>
-<source>Action</source>
-<target>Handling</target>
+<source>Item exists on right side only</source>
+<target></target>
-<source>File/folder exists on left side only</source>
-<target>Fil/mappe finnes bare på venstre side</target>
+<source>Left side is newer</source>
+<target></target>
-<source>File/folder exists on right side only</source>
-<target>Fil/mappe finnes bare på høyre side</target>
+<source>Right side is newer</source>
+<target></target>
-<source>Left file is newer</source>
-<target>Fil til venstre er nyere</target>
+<source>Items have different content</source>
+<target></target>
-<source>Right file is newer</source>
-<target>Fil til høyre er nyere</target>
-
-<source>Files have different content</source>
-<target>Filer har forskjellig innhold</target>
-
-<source>Conflict/file cannot be categorized</source>
-<target>Konflikt/filen kan ikke kategoriseres</target>
+<source>Conflict/item cannot be categorized</source>
+<target></target>
<source>OK</source>
<target>OK</target>
@@ -747,33 +734,6 @@ Synkroniserer kun filer som passer til alle filterinnstillinger.
Merk: Filnavn må være relative til basismapper!
</target>
-<source>Hints:</source>
-<target>Veiledninger:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Oppfør relative fil- eller mappenavn adskilt med ';' eller en ny linje.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Bruk jokertegn '*' og '?'.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Ekskluder filer direkte i hovedvindu via høyreklikkmeny.</target>
-
-<source>Example</source>
-<target>Eksempel</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Inkluder: *.doc;*.zip;*.exe
-Ekskluder: \ting\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Synkroniserer alle .doc, .zip og .exe-filer unntatt alt i undermappen "temp".</target>
-
<source>Include</source>
<target>Inkluder</target>
@@ -795,8 +755,8 @@ Ekskluder: \ting\temp\*
<source>&Default</source>
<target>&Standard</target>
-<source>Transactional file copy</source>
-<target>Transaksjonell filkopiering</target>
+<source>Fail-safe file copy</source>
+<target></target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Skriv til en midlertidig fil (*.ffs_tmp) først så endre navn på den. Dette garanterer en konsistent tilstand selv ved alvorlige feil.</target>
@@ -810,8 +770,8 @@ Ekskluder: \ting\temp\*
<source>Copy file access permissions</source>
<target>Kopier filadgangstillatelser</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Overfør fil- og mappetillatelser (Krever administratorrettigheter)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target></target>
<source>Restore hidden dialogs</source>
<target>Gjenopprett skjulte dialoger</target>
@@ -1119,11 +1079,11 @@ Ekskluder: \ting\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Integrer eksterne programmer i høyreklikkmeny. Følgende makroer er tilgjengelige:</target>
-<source>- full file or directory name</source>
-<target>- fullt fil- eller mappenavn</target>
+<source>- full file or folder name</source>
+<target></target>
-<source>- directory part only</source>
-<target>- bare mappedel</target>
+<source>- folder part only</source>
+<target></target>
<source>- Other side's counterpart to %name</source>
<target>- Andre sides motstykke til %name</target>
@@ -1167,8 +1127,8 @@ Ekskluder: \ting\temp\*
<source>Versioning</source>
<target>Versjonshåndtering</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Flytt filer til en datomerket undermappe</target>
+<source>Move files into a time-stamped subfolder</source>
+<target></target>
<source>Files</source>
<target>Filer</target>
@@ -1263,8 +1223,8 @@ Ekskluder: \ting\temp\*
<source>Cannot read directory %x.</source>
<target>Kan ikke lese mappen %x.</target>
-<source>Endless loop.</source>
-<target>Endeløs sløyfe.</target>
+<source>Detected endless directory recursion.</source>
+<target></target>
<source>Cannot set privilege %x.</source>
<target>Kan ikke sette privilegie %x.</target>
@@ -1290,14 +1250,11 @@ Ekskluder: \ting\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Stiller inn standard synkroniseringsretning: Gamle filer blir overskrevet med nyere filer.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Filen inneholder ingen gyldig innstilling:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Du kan ignorere denne feil og anse mappen som tom.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target></target>
-<source>Cannot find directory %x.</source>
-<target>Kan ikke finne mappen %x.</target>
+<source>Cannot find folder %x.</source>
+<target></target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>Mapper er avhengige av hverandre! Vær forsiktig når du setter opp synkroniseringsregler:</target>
@@ -1329,20 +1286,20 @@ Ekskluder: \ting\temp\*
<source>Both sides are equal</source>
<target>Begge sider er like</target>
-<source>Files/folders differ in attributes only</source>
-<target>Filer/mapper skiller bare i attributter</target>
+<source>Items have different attributes</source>
+<target></target>
-<source>Copy new file/folder to left</source>
-<target>Kopier ny fil/mappe til venstre</target>
+<source>Copy new item to left</source>
+<target></target>
-<source>Copy new file/folder to right</source>
-<target>Kopier ny fil/mappe til høyre</target>
+<source>Copy new item to right</source>
+<target></target>
-<source>Delete left file/folder</source>
-<target>Slett venstre fil/mappe</target>
+<source>Delete left item</source>
+<target></target>
-<source>Delete right file/folder</source>
-<target>Slett høyre fil/mappe</target>
+<source>Delete right item</source>
+<target></target>
<source>Move file on left</source>
<target>Flytt venstre fil</target>
@@ -1350,20 +1307,20 @@ Ekskluder: \ting\temp\*
<source>Move file on right</source>
<target>Flytt høyre fil</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Overskriv venstre fil/mappe med den til høyre</target>
+<source>Overwrite left item</source>
+<target></target>
-<source>Overwrite right file/folder with left one</source>
-<target>Overskriv høyre fil/mappe med den til venstre</target>
+<source>Overwrite right item</source>
+<target></target>
<source>Do nothing</source>
<target>Ikke gjør noe</target>
-<source>Copy file attributes only to left</source>
-<target>Kopier filattributter bare til venstre</target>
+<source>Update attributes on left</source>
+<target></target>
-<source>Copy file attributes only to right</source>
-<target>Kopier filattributter bare til høyre</target>
+<source>Update attributes on right</source>
+<target></target>
<source>Multiple...</source>
<target>Flere...</target>
@@ -1416,11 +1373,11 @@ Ekskluder: \ting\temp\*
<source>Updating attributes of %x</source>
<target>Oppdaterer attributter til %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Navn på målmappe må ikke være tomt!</target>
+<source>Target folder name must not be empty.</source>
+<target></target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Mappe for filversjonshåndtering ble ikke angitt!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target></target>
<source>Source directory %x not found.</source>
<target>Kildemappen %x ikke funnet.</target>
@@ -1449,8 +1406,8 @@ Ekskluder: \ting\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Papirkurv er ikke tilgjengelig for de følgende baner! Filer blir isteden slettet permanent:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>En mappe blir endret som er del av flere mappepar! Kontroller synkroniseringsinnstillinger!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target></target>
<source>Processing folder pair:</source>
<target>Behandler mappepar:</target>
diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng
index 74d572c5..255cd2ab 100644
--- a/BUILD/Languages/polish.lng
+++ b/BUILD/Languages/polish.lng
@@ -7,8 +7,8 @@
<plural definition>n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Szukanie katalogu %x...</target>
+<source>Searching for folder %x...</source>
+<target>Wyszukiwanie katalogu %x...</target>
<source>Show in Explorer</source>
<target>Wyświetl w Explorerze</target>
@@ -34,12 +34,12 @@
<source>Select alternate synchronization settings</source>
<target>Stwórz alternatywne reguły synchronizacji</target>
-<source>No filter selected</source>
-<target>Nie wybrano żadnego filtra</target>
-
<source>Filter is active</source>
<target>Filtr jest aktywny</target>
+<source>No filter selected</source>
+<target>Nie wybrano żadnego filtra</target>
+
<source>Remove alternate settings</source>
<target>Usuń alternatywne ustawienia</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Ustawienia programu</target>
-<source>Synchronization Preview</source>
-<target>Podgląd synchronizacji</target>
+<source>Summary</source>
+<target>Podsumowanie</target>
<source>Find</source>
<target>Znajdź</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Przeglądaj</target>
-<source>Invalid command line: %x</source>
-<target>Nieprawidłowa komenda: %x</target>
+<source>Invalid command line:</source>
+<target>Nieprawidłowa komenda:</target>
<source>Info</source>
<target>Info</target>
@@ -229,29 +229,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>Dysk %x nie jest częścią pliku %y!</target>
-<source>Cannot find file %x.</source>
-<target>Nie można znaleźć pliku %x.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Nie można odczytać elementu XML:</target>
-<source>S&ave configuration...</source>
-<target>Z&apisz konfigurację...</target>
+<source>Cannot find file %x.</source>
+<target>Nie można znaleźć pliku %x.</target>
-<source>&Load configuration...</source>
-<target>&Wczytaj konfigurację...</target>
+<source>&Open...</source>
+<target>&Otwórz...</target>
+
+<source>&Save...</source>
+<target>&Zapisz</target>
<source>&Quit</source>
<target>&Zamknij</target>
-<source>&File</source>
-<target>&Plik</target>
+<source>&Program</source>
+<target>&Program</target>
<source>&Content</source>
<target>&Zawartość</target>
-<source>&About...</source>
-<target>&O Programie...</target>
+<source>&About</source>
+<target>&O Programie</target>
<source>&Help</source>
<target>&Pomoc</target>
@@ -259,8 +259,8 @@
<source>Usage:</source>
<target>Użycie:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Wprowadź katalogi do nadzorowania</target>
+<source>1. Select folders to watch.</source>
+<target>1. Określ obserwowane katalogi.</target>
<source>2. Enter a command line.</source>
<target>2. Wprowadź komendę.</target>
@@ -268,19 +268,11 @@
<source>3. Press 'Start'.</source>
<target>3. Wciśnij 'Start'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Komenda jest wykonywana za każdym razem gdy:
-- wszystkie katalogi będą dostępne (np. włożenie USB)
-- pliki w obrębie tych katalogów i podkatalogów ulegną zmianie
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Aby rozpocząć po prostu zaimportuj plik .ffs_batch</target>
-<source>Directories to watch</source>
-<target>Katalogi do obserwacji</target>
+<source>Folders to watch</source>
+<target>Obserwowane katalogi</target>
<source>Add folder</source>
<target>Dodaj folder</target>
@@ -291,14 +283,25 @@ Komenda jest wykonywana za każdym razem gdy:
<source>Select a folder</source>
<target>Wybierz folder</target>
+<source>Delay [seconds]</source>
+<target>Opóźnienie [sekundy]</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>Minimum Idle Time [seconds]</source>
-<target>Minimalny czas bezczynności [sekundy]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Odstęp czasu w sekundach pomiędzy ostatnią wykrytą zmianą, a wykonaniem komendy</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Komenda jest wykonywana gdy:
+- pliki lub podkatalogi ulegną zmianie
+- zostaną utworzony nowe katalogi (n.p włożenie pamięci USB)
+</target>
<source>Start</source>
<target>Rozpocznij</target>
@@ -327,8 +330,8 @@ Komenda jest wykonywana za każdym razem gdy:
<source>Waiting for missing directories...</source>
<target>Oczekiwanie na brakujące katalogi...</target>
-<source>A directory input field is empty.</source>
-<target>Pole ze ścieżką katalogu jest puste.</target>
+<source>An input folder name is empty.</source>
+<target>Nazwa katalogu jest pusta.</target>
<source>Logging</source>
<target>Tworzenie logów</target>
@@ -414,7 +417,7 @@ Komenda jest wykonywana za każdym razem gdy:
<source><Symlink></source>
<target><Dowiązanie symboliczne></target>
-<source><Directory></source>
+<source><Folder></source>
<target><Katalog></target>
<source>Full path</source>
@@ -426,8 +429,8 @@ Komenda jest wykonywana za każdym razem gdy:
<source>Relative path</source>
<target>Relatywna ścieżka</target>
-<source>Directory</source>
-<target>Katalog</target>
+<source>Base folder</source>
+<target>Katalog bazowy</target>
<source>Size</source>
<target>Rozmiar</target>
@@ -438,8 +441,11 @@ Komenda jest wykonywana za każdym razem gdy:
<source>Extension</source>
<target>Rozszerzenie</target>
-<source>Comparison Result</source>
-<target>Rezultat porównywania</target>
+<source>Action</source>
+<target>Akcja</target>
+
+<source>Category</source>
+<target>Kategoria</target>
<source>Drag && drop</source>
<target>Drag && Drop</target>
@@ -447,14 +453,14 @@ Komenda jest wykonywana za każdym razem gdy:
<source>Close progress dialog</source>
<target>Zamknij okno postępu</target>
-<source>Shut down</source>
-<target>Wyłącz komputer</target>
+<source>Standby</source>
+<target>Przejdź w stan uśpienia</target>
<source>Log off</source>
<target>Wyloguj użytkownika</target>
-<source>Standby</source>
-<target>Przejdź w stan uśpienia</target>
+<source>Shut down</source>
+<target>Wyłącz komputer</target>
<source>Hibernate</source>
<target>Przejdź w stan hibernacji</target>
@@ -462,15 +468,12 @@ Komenda jest wykonywana za każdym razem gdy:
<source>1. &Compare</source>
<target>1. &Porównaj</target>
-<source>2. &Synchronize...</source>
-<target>2. &Synchronizuj...</target>
+<source>2. &Synchronize</source>
+<target>2. &Synchronizuj</target>
<source>&New</source>
<target>&Nowy</target>
-<source>&Program</source>
-<target>&Program</target>
-
<source>&Language</source>
<target>&Język</target>
@@ -498,8 +501,8 @@ Komenda jest wykonywana za każdym razem gdy:
<source>&Abort</source>
<target>&Przerwij</target>
-<source>Synchronize...</source>
-<target>Synchronizuj...</target>
+<source>Synchronize</source>
+<target>Synchronizuj</target>
<source>Start synchronization</source>
<target>Rozpocznij synchronizację</target>
@@ -513,12 +516,12 @@ Komenda jest wykonywana za każdym razem gdy:
<source>Swap sides</source>
<target>Zamień stronami</target>
-<source>Save current configuration to file</source>
-<target>Zapisz aktualny plik konfiguracyjny</target>
-
<source>Load configuration from file</source>
<target>Wczytaj konfigurację z pliku</target>
+<source>Save current configuration to file</source>
+<target>Zapisz aktualny plik konfiguracyjny</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Ostatnio użyta konfiguracja (naciśnij DEL żeby usunąć z listy)</target>
@@ -528,13 +531,13 @@ Komenda jest wykonywana za każdym razem gdy:
<source>Hide filtered or temporarily excluded files</source>
<target>Ukryj pliki filtrowane lub tymczasowo wykluczone</target>
-<source>Number of files and directories that will be created</source>
+<source>Number of files and folders that will be created</source>
<target>Liczba plików i katalogów, które zostaną utworzone</target>
<source>Number of files that will be overwritten</source>
<target>Liczba plików, które zostaną nadpisane</target>
-<source>Number of files and directories that will be deleted</source>
+<source>Number of files and folders that will be deleted</source>
<target>Liczba plików i katalogów, które zostaną usunięte</target>
<source>Total amount of data that will be transferred</source>
@@ -558,8 +561,8 @@ Komenda jest wykonywana za każdym razem gdy:
<source>Batch job</source>
<target>Plik wsadowy</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Utwórz plik wsadowy aby zautomatyzować proces synchronizacji. Aby uruchomić synchronizację w trybie wsadowym kliknij dwa razy kliknij na ten plik lub wykonaj komendę: FreeFileSync.exe SyncJob.ffs_batch. Możesz to również wykorzystać w swoim harmonogramie zadań.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Utwórz plik wsadowy aby zautomatyzować proces synchronizacji. Kliknij dwa razy na ten plik lub dodaj go do menadżera zadań w swoim systemie: FreeFileSync.exe <nazwa_pliku>.ffs_batch</target>
<source>Help</source>
<target>Pomoc</target>
@@ -585,18 +588,12 @@ Komenda jest wykonywana za każdym razem gdy:
<source>Maximum number of log files:</source>
<target>Maksymalna liczba plików z logami:</target>
-<source>Select log file directory:</source>
-<target>Wybierz katalog z logami:</target>
+<source>Select folder to save log files:</source>
+<target>Wybierz katalog, do które będą zapisywane logi:</target>
<source>Batch settings</source>
<target>Ustawienia trybu wsadowego</target>
-<source>&Save</source>
-<target>&Zapisz</target>
-
-<source>&Load</source>
-<target>&Wczytaj</target>
-
<source>Select variant:</source>
<target>Wybierz wariant:</target>
@@ -621,29 +618,23 @@ Komenda jest wykonywana za każdym razem gdy:
<source>Configuration</source>
<target>Konfiguracja</target>
-<source>Category</source>
-<target>Kategoria</target>
-
-<source>Action</source>
-<target>Akcja</target>
-
-<source>File/folder exists on left side only</source>
-<target>Plik/folder istnieje tylko po lewej stronie</target>
+<source>Item exists on left side only</source>
+<target>Element istnieje tylko po lewej stronie</target>
-<source>File/folder exists on right side only</source>
-<target>Plik/folder istnieje tylko po prawej stronie</target>
+<source>Item exists on right side only</source>
+<target>Element istnieje tylko po prawej stronie</target>
-<source>Left file is newer</source>
-<target>Lewy plik jest nowszy</target>
+<source>Left side is newer</source>
+<target>Lewa strona jest nowsza</target>
-<source>Right file is newer</source>
-<target>Prawy plik jest nowszy</target>
+<source>Right side is newer</source>
+<target>Prawa strona jest nowsza</target>
-<source>Files have different content</source>
-<target>Pliki różnią się zawartością</target>
+<source>Items have different content</source>
+<target><Elementy różnią się zawartością</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Konflikt/plik nie może zostać skategoryzowany</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Konflikt/element nie może zostać skategoryzowany</target>
<source>OK</source>
<target>OK</target>
@@ -750,33 +741,6 @@ Tylko pliki pasujące do wszystkich filtrów będą synchronizowane.
Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowego.
</target>
-<source>Hints:</source>
-<target>Wskazówki:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Wprowadź relatywne scieżki do plików lub katalogów oddzielone ';' lub nową linią.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Użyj wieloznacznika (wildcard) '*' i '?'.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Wyklucz pliki i foldery używając prawego przycisku myszki.</target>
-
-<source>Example</source>
-<target>Przykład</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Uwzględnik: *.doc;*zip*.exe
-Wyklucz: \moje\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Synchronizuj wszystkie pliki .doc, .zip i exe z wyjątkiem folderu "temp"</target>
-
<source>Include</source>
<target>Dołącz</target>
@@ -798,8 +762,8 @@ Wyklucz: \moje\temp\*
<source>&Default</source>
<target>&Domyślne</target>
-<source>Transactional file copy</source>
-<target>Transakcyjne kopiowanie pliku</target>
+<source>Fail-safe file copy</source>
+<target>Bezpieczne kopiowanie</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Stwórz tymczasowy plik (*.ffs_tmp) następnie zamień jego nazwę. Gwarantuje to spójność nawet po wystąpieniu błędu.</target>
@@ -813,8 +777,8 @@ Wyklucz: \moje\temp\*
<source>Copy file access permissions</source>
<target>Kopiuj uprawnienia plików</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Transfer uprawnień plików i katalogów (Wymaga uprawnień Administratora)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Kopiuj uprawnienia plików i katalogów (Wymaga uprawnień Administratora)</target>
<source>Restore hidden dialogs</source>
<target>Przywróc ukryte dialogi</target>
@@ -1126,10 +1090,10 @@ Wyklucz: \moje\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Dołącz zewnętrzną aplikację do menu kontekstowego. Dostępne macra:</target>
-<source>- full file or directory name</source>
+<source>- full file or folder name</source>
<target>- pełna nazwa pliku lub katalogu</target>
-<source>- directory part only</source>
+<source>- folder part only</source>
<target>- tylko część katalogu</target>
<source>- Other side's counterpart to %name</source>
@@ -1176,8 +1140,8 @@ Wyklucz: \moje\temp\*
<source>Versioning</source>
<target>Wersjonowanie</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Przenieś pliki do oznaczonego podkatalogu</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Przenieś pliki do podkatalogu ze zmodyfikowanym czasem.</target>
<source>Files</source>
<target>Pliki</target>
@@ -1275,8 +1239,8 @@ Wyklucz: \moje\temp\*
<source>Cannot read directory %x.</source>
<target>Nie można odczytać katalogu %x.</target>
-<source>Endless loop.</source>
-<target>Nieskończona pętla.</target>
+<source>Detected endless directory recursion.</source>
+<target>Wykryto nieskończoną pętlę katalogów</target>
<source>Cannot set privilege %x.</source>
<target>Nie można ustawić uprawnień %x.</target>
@@ -1302,13 +1266,10 @@ Wyklucz: \moje\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Ustawianie domyślnego kierunku synchronizacji: Stare pliki zostaną nadpisane nowszymi.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Nieprawidłowy format pliku:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Możesz zignorować ten błąd uznająć jeden z katalogów jako pusty.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Możesz zignorować ten błąd traktując katalog jako pusty.</target>
-<source>Cannot find directory %x.</source>
+<source>Cannot find folder %x.</source>
<target>Nie można znaleźć katalogu %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
@@ -1341,20 +1302,20 @@ Wyklucz: \moje\temp\*
<source>Both sides are equal</source>
<target>Obie strony są równe</target>
-<source>Files/folders differ in attributes only</source>
-<target>Pliki/foldery różnią się tylko atrybutami</target>
+<source>Items have different attributes</source>
+<target>Elementy mają różne atrybuty</target>
-<source>Copy new file/folder to left</source>
-<target>Skopiuj nowy plik/katalog na lewą stroną</target>
+<source>Copy new item to left</source>
+<target>Kopiuj nowy element na lewą stronę</target>
-<source>Copy new file/folder to right</source>
-<target>Skopiuj nowy plik/katalog na prawą stroną</target>
+<source>Copy new item to right</source>
+<target>Kopiuj nowy element na prawą stronę</target>
-<source>Delete left file/folder</source>
-<target>Usuń plik/katalog po lewej stronie</target>
+<source>Delete left item</source>
+<target>Usuń lewy element</target>
-<source>Delete right file/folder</source>
-<target>Usuń plik/katalog po prawej stronie</target>
+<source>Delete right item</source>
+<target>Usuń prawy element</target>
<source>Move file on left</source>
<target>Przenieś plik na lewą stronę</target>
@@ -1362,20 +1323,20 @@ Wyklucz: \moje\temp\*
<source>Move file on right</source>
<target>Przenieś plik na prawą stronę</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Nadpisz plik/katalog po lewej stronie tym po prawej</target>
+<source>Overwrite left item</source>
+<target>Nadpisz lewy element</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Nadpisz plik/katalog po prawej stronie tym po lewej</target>
+<source>Overwrite right item</source>
+<target>Nadpisz prawy element</target>
<source>Do nothing</source>
<target>Nic nie rób</target>
-<source>Copy file attributes only to left</source>
-<target>Kopiuj atrybuty plików tylko na lewą stronę</target>
+<source>Update attributes on left</source>
+<target>Aktualizuj atrybuty po lewej stronie</target>
-<source>Copy file attributes only to right</source>
-<target>Kopiuj atrybuty plików tylko na prawą stronę</target>
+<source>Update attributes on right</source>
+<target>Aktualizuj atrybuty po prawej stronie</target>
<source>Multiple...</source>
<target>Wiele...</target>
@@ -1428,11 +1389,11 @@ Wyklucz: \moje\temp\*
<source>Updating attributes of %x</source>
<target>Aktualizowanie atrybutów %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Katalog docelowy nie może być pusty!</target>
+<source>Target folder name must not be empty.</source>
+<target>Katalog docelowy nie może być pusty.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Nie określono katalogu do wersjonowania plików!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Nazwa katalogu do wersjonowania plików nie może być pusta.</target>
<source>Source directory %x not found.</source>
<target>Katalog źródłowy %x nie istnieje.</target>
@@ -1461,8 +1422,8 @@ Wyklucz: \moje\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Kosz nie jest dostępny dla określonych ścieżek! Pliki zostaną nieodwracalnie usuniętę:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Katalog zostanie zmodyfikowany w efekcie synchronizacji wielu par folderów! Zweryfikuj ustawienia synchronizacji!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Katalog zostanie zmodyfikowany w związku z synchronizacją wielu katalogów. Zweryfikuj ustawienia synchronizacji.</target>
<source>Processing folder pair:</source>
<target>Przetwarzanie folderów:</target>
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index a3a07ba4..70530ccb 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -7,8 +7,8 @@
<plural definition>n == 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>A procurar o directório %x...</target>
+<source>Searching for folder %x...</source>
+<target>À procura da pasta %x...</target>
<source>Show in Explorer</source>
<target>Mostrar no Explorer</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSync - Sincronização Automatizada</target>
+<source>Error</source>
+<target>Erro</target>
+
<source>Select alternate comparison settings</source>
<target>Selecionar opções alternativas de comparação</target>
<source>Select alternate synchronization settings</source>
<target>Selecionar opções alternativas de sincronização</target>
-<source>No filter selected</source>
-<target>Nenhum filtro selecionado</target>
-
<source>Filter is active</source>
<target>Filtro activo</target>
+<source>No filter selected</source>
+<target>Nenhum filtro selecionado</target>
+
<source>Remove alternate settings</source>
<target>Remover opções alternativas</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>Sobre</target>
-<source>Error</source>
-<target>Erro</target>
-
<source>Warning</source>
<target>Atenção</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Opções</target>
-<source>Synchronization Preview</source>
-<target>Previsualizar sincronização</target>
+<source>Summary</source>
+<target>Sumário</target>
<source>Find</source>
<target>Procurar</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Procurar</target>
-<source>Invalid command line: %x</source>
-<target>Linha de comando inválida: %x</target>
+<source>Invalid command line:</source>
+<target>Linha de comando inválida:</target>
<source>Info</source>
<target>Info</target>
@@ -226,29 +226,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>Nome do volume %x não faz parte do ficheiro %y!</target>
-<source>Cannot find file %x.</source>
-<target>Não é possível encontrar o ficheiro %x.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Não é possível ler os elementos XML:</target>
-<source>S&ave configuration...</source>
-<target>G&uardar a configuração...</target>
+<source>Cannot find file %x.</source>
+<target>Não é possível encontrar o ficheiro %x.</target>
-<source>&Load configuration...</source>
-<target>&Carregar configuração...</target>
+<source>&Open...</source>
+<target>&Abrir...</target>
+
+<source>&Save...</source>
+<target>&Guardar...</target>
<source>&Quit</source>
<target>S&air</target>
-<source>&File</source>
-<target>&Ficheiro</target>
+<source>&Program</source>
+<target>&Programa</target>
<source>&Content</source>
<target>C&onteúdo</target>
-<source>&About...</source>
-<target>&Sobre...</target>
+<source>&About</source>
+<target>&Sobre</target>
<source>&Help</source>
<target>A&juda</target>
@@ -256,8 +256,8 @@
<source>Usage:</source>
<target>Uso:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Selecionar directórios a monitorizar.</target>
+<source>1. Select folders to watch.</source>
+<target>1. Selecionar pastas para observar.</target>
<source>2. Enter a command line.</source>
<target>2. Inserir a linha de comando.</target>
@@ -265,19 +265,11 @@
<source>3. Press 'Start'.</source>
<target>3. Pressionar 'Iniciar'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-A linha de comandos é executada cada vez que:
-- os directórios ficam disponíveis (i.e. pen USB)
-- ficheiros nos directórios ou subdirectórios são modificados
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Para começar basta importar um ficheiro .ffs_batch.</target>
-<source>Directories to watch</source>
-<target>Directórios a observar</target>
+<source>Folders to watch</source>
+<target>Pastas a observar</target>
<source>Add folder</source>
<target>Adicionar pasta</target>
@@ -288,18 +280,35 @@ A linha de comandos é executada cada vez que:
<source>Select a folder</source>
<target>Selecione uma pasta</target>
+<source>Delay [seconds]</source>
+<target>Atraso [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>Minimum Idle Time [seconds]</source>
-<target>Tempo de espera [segundos]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Tempo de espera entre a última alteração e a execução do comando, em segundos</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+O comando é executado se:
+- ficheiros ou subpastas forem alterados
+- 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>(Build: %x)</source>
<target>(Build: %x)</target>
@@ -318,8 +327,8 @@ A linha de comandos é executada cada vez que:
<source>Waiting for missing directories...</source>
<target>A aguardar pelos directórios em falta...</target>
-<source>A directory input field is empty.</source>
-<target>Um campo de directório está vazio.</target>
+<source>An input folder name is empty.</source>
+<target>Um dos campos de comparação está vazio.</target>
<source>Logging</source>
<target>A escrever em log</target>
@@ -405,8 +414,8 @@ A linha de comandos é executada cada vez que:
<source><Symlink></source>
<target><Link Simbólico></target>
-<source><Directory></source>
-<target><Directório></target>
+<source><Folder></source>
+<target><Pasta></target>
<source>Full path</source>
<target>Caminho completo</target>
@@ -417,8 +426,8 @@ A linha de comandos é executada cada vez que:
<source>Relative path</source>
<target>Caminho</target>
-<source>Directory</source>
-<target>Directório</target>
+<source>Base folder</source>
+<target>Pasta principal</target>
<source>Size</source>
<target>Tamanho</target>
@@ -429,8 +438,11 @@ A linha de comandos é executada cada vez que:
<source>Extension</source>
<target>Extensão</target>
-<source>Comparison Result</source>
-<target>Resultados da comparação</target>
+<source>Action</source>
+<target>Ação</target>
+
+<source>Category</source>
+<target>Categoria</target>
<source>Drag && drop</source>
<target>Arrastar && Largar</target>
@@ -438,14 +450,14 @@ A linha de comandos é executada cada vez que:
<source>Close progress dialog</source>
<target>Fechar diálogo de progresso</target>
-<source>Shut down</source>
-<target>Desligar</target>
+<source>Standby</source>
+<target>Standby</target>
<source>Log off</source>
<target>Terminar sessão</target>
-<source>Standby</source>
-<target>Standby</target>
+<source>Shut down</source>
+<target>Desligar</target>
<source>Hibernate</source>
<target>Hibernar</target>
@@ -453,15 +465,12 @@ A linha de comandos é executada cada vez que:
<source>1. &Compare</source>
<target>1. &Comparar</target>
-<source>2. &Synchronize...</source>
-<target>2. &Sincronizar...</target>
+<source>2. &Synchronize</source>
+<target>2. &Sincronizar</target>
<source>&New</source>
<target>&Novo</target>
-<source>&Program</source>
-<target>&Programa</target>
-
<source>&Language</source>
<target>&Língua</target>
@@ -489,8 +498,8 @@ A linha de comandos é executada cada vez que:
<source>&Abort</source>
<target>&Abortar</target>
-<source>Synchronize...</source>
-<target>Sincronizar...</target>
+<source>Synchronize</source>
+<target>Sincronizar</target>
<source>Start synchronization</source>
<target>Iniciar a sincronização</target>
@@ -504,12 +513,12 @@ A linha de comandos é executada cada vez que:
<source>Swap sides</source>
<target>Trocar lados</target>
-<source>Save current configuration to file</source>
-<target>Guardar configuração actual para ficheiro</target>
-
<source>Load configuration from file</source>
<target>Carregar configuração do ficheiro</target>
+<source>Save current configuration to file</source>
+<target>Guardar configuração actual para ficheiro</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Última configuração utilizada (pressione DEL para remover da lista)</target>
@@ -519,14 +528,14 @@ A linha de comandos é executada cada vez que:
<source>Hide filtered or temporarily excluded files</source>
<target>Ocultar ficheiros filtrados ou temporariamente excluidos</target>
-<source>Number of files and directories that will be created</source>
-<target>Número de itens a ser criados</target>
+<source>Number of files and folders that will be created</source>
+<target>Número de ficheiros e pastas a ser criados</target>
<source>Number of files that will be overwritten</source>
<target>Número de ficheiros substituidos</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Número de itens a ser eliminados</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Número de ficheiros e pastas a ser eliminados</target>
<source>Total amount of data that will be transferred</source>
<target>Volume de dados a ser transferido</target>
@@ -549,8 +558,8 @@ A linha de comandos é executada cada vez que:
<source>Batch job</source>
<target>Ficheiro Batch</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Criar um ficheiro batch e automatizar a sincronização. Para iniciar o batch, fazer duplo-clique no ficheiro ou correr o comando: FreeFileSync.exe SyncJob.ffs_batch. Também pode ser adicionado no planeador de tarefas do sistema.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Criar ficheiro batch para automatizar a sincronização. Faça duplo-clique no ficheiro ou adicione ao planeador de tarefas do sistema: FreeFileSync.exe <nome>.ffs_batch</target>
<source>Help</source>
<target>Ajuda</target>
@@ -576,21 +585,12 @@ A linha de comandos é executada cada vez que:
<source>Maximum number of log files:</source>
<target>Número máximo de ficheiros log:</target>
-<source>Select log file directory:</source>
-<target>Selecione directório para ficheiro log:</target>
+<source>Select folder to save log files:</source>
+<target>Selecionar pasta onde guardar os logs:</target>
<source>Batch settings</source>
<target>Opções do batch</target>
-<source>&Save</source>
-<target>&Guardar</target>
-
-<source>&Load</source>
-<target>C&arregar</target>
-
-<source>Cancel</source>
-<target>Cancelar</target>
-
<source>Select variant:</source>
<target>Selecione uma variante:</target>
@@ -615,29 +615,23 @@ A linha de comandos é executada cada vez que:
<source>Configuration</source>
<target>Configuração</target>
-<source>Category</source>
-<target>Categoria</target>
-
-<source>Action</source>
-<target>Ação</target>
-
-<source>File/folder exists on left side only</source>
-<target>Ficheiro/pasta existe apenas à esquerda</target>
+<source>Item exists on left side only</source>
+<target>Item existe apenas à esquerda</target>
-<source>File/folder exists on right side only</source>
-<target>Ficheiro/pasta existe apenas à direita</target>
+<source>Item exists on right side only</source>
+<target>Item existe apenas à direita</target>
-<source>Left file is newer</source>
-<target>Ficheiro mais recente à esquerda</target>
+<source>Left side is newer</source>
+<target>Esquerda é mais recente</target>
-<source>Right file is newer</source>
-<target>Ficheiro mais recente à direita</target>
+<source>Right side is newer</source>
+<target>Direita é mais recente</target>
-<source>Files have different content</source>
-<target>Ficheiros são diferentes</target>
+<source>Items have different content</source>
+<target>Itens tem conteúdo diferente</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Ficheiro/conflito não pode ser categorizado</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Conflito/item não pode ser categorizado</target>
<source>OK</source>
<target>OK</target>
@@ -713,9 +707,6 @@ Os ficheiros são considerados iguais se
<source>&Ignore</source>
<target>&Ignorar</target>
-<source>&Retry</source>
-<target>&Tentar de Novo</target>
-
<source>Do not show this dialog again</source>
<target>Não mostrar este diálogo novamente</target>
@@ -746,33 +737,6 @@ Apenas ficheiros que condigam com todos os filtros serão sincronizados.
Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
</target>
-<source>Hints:</source>
-<target>Dicas:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Inserir caminhos dos ficheiros ou pastas separados por ';' ou numa nova linha.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Usar '*' e '?' como caracteres de procura.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Excluir ficheiros directamente da grelha através do menu de contexto.</target>
-
-<source>Example</source>
-<target>Exemplo</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Incluir: *.doc;*.zip;*.exe
-Excluir: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Sincronizar todos os ficheiros .doc, .zip e .exe, excepto os da pasta "temp".</target>
-
<source>Include</source>
<target>Incluir</target>
@@ -794,8 +758,8 @@ Excluir: \stuff\temp\*
<source>&Default</source>
<target>&Config. Iniciais</target>
-<source>Transactional file copy</source>
-<target>Cópia de ficheiro transacional</target>
+<source>Fail-safe file copy</source>
+<target>Cópia à prova de falhas</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Escrever para um ficheiro temporário (*.ffs_tmp) primeiro e depois renomear. Isto garante consistência mesmo em caso de erro fatal.</target>
@@ -809,8 +773,8 @@ Excluir: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Copiar permissões de acesso do ficheiro</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Transferir ficheiro e permissões (Requer direitos de administrador)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Transferir ficheiro e permissões (precisa de direitos de Administrador)</target>
<source>Restore hidden dialogs</source>
<target>Restaurar diálogos escondidos</target>
@@ -1118,11 +1082,11 @@ Excluir: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Integrar aplicações externas no menu de contexto. As seguintes macros estão disponíveis:</target>
-<source>- full file or directory name</source>
-<target>- nome completo do ficheiro ou directório</target>
+<source>- full file or folder name</source>
+<target>- nome completo de ficheiro ou pasta</target>
-<source>- directory part only</source>
-<target>- apenas parte do directório</target>
+<source>- folder part only</source>
+<target>- nome da pasta parcial</target>
<source>- Other side's counterpart to %name</source>
<target>- Contrapartida de %name</target>
@@ -1166,8 +1130,8 @@ Excluir: \stuff\temp\*
<source>Versioning</source>
<target>Manter versões anteriores</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Mover ficheiros para uma subpasta datada</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Mover ficheiros para uma subpasta com hora e data</target>
<source>Files</source>
<target>Ficheiros</target>
@@ -1262,8 +1226,8 @@ Excluir: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>Não é possível ler o directório %x.</target>
-<source>Endless loop.</source>
-<target>Loop infinito.</target>
+<source>Detected endless directory recursion.</source>
+<target>Recursão infinita detetada no directório</target>
<source>Cannot set privilege %x.</source>
<target>Não é possível definir o privilégio %x.</target>
@@ -1289,14 +1253,11 @@ Excluir: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Escolher direcção de sincronização por defeito: Os ficheiros antigos serão substituídos pelos novos.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>O ficheiro não contém uma configuração válida:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Pode ignorar este erro para considerar o directório como vazio.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Pode ignorar este erro para considerar a pasta como vazia.</target>
-<source>Cannot find directory %x.</source>
-<target>Não é possível encontrar o directório %x.</target>
+<source>Cannot find folder %x.</source>
+<target>Não consigo encontrar a pasta %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>Directórios são dependentes! Cuidado ao definir as regras de sincronização:</target>
@@ -1328,20 +1289,20 @@ Excluir: \stuff\temp\*
<source>Both sides are equal</source>
<target>Ambos os lados iguais</target>
-<source>Files/folders differ in attributes only</source>
-<target>Ficheiros/pastas diferem apenas nos atributos</target>
+<source>Items have different attributes</source>
+<target>Itens tem diferentes atributos</target>
-<source>Copy new file/folder to left</source>
-<target>Copiar novo ficheiro/pasta para a esquerda</target>
+<source>Copy new item to left</source>
+<target>Copiar novo item para a esquerda</target>
-<source>Copy new file/folder to right</source>
-<target>Copiar novo ficheiro/pasta para a direita</target>
+<source>Copy new item to right</source>
+<target>Copiar novo item para a direita</target>
-<source>Delete left file/folder</source>
-<target>Eliminar ficheiro/pasta à esquerda</target>
+<source>Delete left item</source>
+<target>Apagar item esquerdo</target>
-<source>Delete right file/folder</source>
-<target>Eliminar ficheiro/pasta à direita</target>
+<source>Delete right item</source>
+<target>Apagar item direito</target>
<source>Move file on left</source>
<target>Mover ficheiro à esquerda</target>
@@ -1349,20 +1310,20 @@ Excluir: \stuff\temp\*
<source>Move file on right</source>
<target>Mover ficheiro à direita</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Substituir ficheiro/pasta da esquerda (pelo da direita)</target>
+<source>Overwrite left item</source>
+<target>Substituir item da esquerda</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Substituir ficheiro/pasta da direita (pelo da esquerda)</target>
+<source>Overwrite right item</source>
+<target>Substituir item da direita</target>
<source>Do nothing</source>
<target>Não fazer nada</target>
-<source>Copy file attributes only to left</source>
-<target>Copiar apenas atributos de ficheiro para a esquerda</target>
+<source>Update attributes on left</source>
+<target>Actualizar atributos à esquerda</target>
-<source>Copy file attributes only to right</source>
-<target>Copiar apenas atributos de ficheiro para a direita</target>
+<source>Update attributes on right</source>
+<target>Actualizar atributos à direita</target>
<source>Multiple...</source>
<target>Multiplo...</target>
@@ -1415,11 +1376,11 @@ Excluir: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Actualizar atributos de %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Nome do directório de destino não pode estar vazio!</target>
+<source>Target folder name must not be empty.</source>
+<target>Nome da pasta de destino não pode estar vazio.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Diretório para armazenar versões não foi definido!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Nome da pasta para manter versões não pode estar vazio.</target>
<source>Source directory %x not found.</source>
<target>Directório fonte %x não encontrado.</target>
@@ -1448,8 +1409,8 @@ Excluir: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Reciclagem não disponível para os seguintes caminhos! Os ficheiros serão apagados permanentemente:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Um directório que pertencente a um conjunto de vários directórios vai ser alterado! Verifique as opções de sincronização!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Uma pasta que faz parte de vários pares vai ser modificada. Por favor, reveja os parametros de sincronização.</target>
<source>Processing folder pair:</source>
<target>A processar o par do directorio:</target>
diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng
index 0e14cfe7..a6e83355 100644
--- a/BUILD/Languages/portuguese_br.lng
+++ b/BUILD/Languages/portuguese_br.lng
@@ -7,8 +7,8 @@
<plural definition>n <= 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Procurando pelo diretório %x...</target>
+<source>Searching for folder %x...</source>
+<target>Buscando pela pasta %x...</target>
<source>Show in Explorer</source>
<target>Mostrar no Explorer</target>
@@ -17,7 +17,7 @@
<target>Abrir com aplicativo padrão</target>
<source>Browse directory</source>
-<target>Navegar pelo diretório</target>
+<target>Procurar diretório</target>
<source>Abort requested: Waiting for current operation to finish...</source>
<target>Cancelar solicitado: Esperando fim da operação...</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSync - Sincronização Automatizada</target>
+<source>Error</source>
+<target>Erro</target>
+
<source>Select alternate comparison settings</source>
-<target>Selecionar configuração de comparação alternativa</target>
+<target>Selecionar configurações alternativas de comparação</target>
<source>Select alternate synchronization settings</source>
-<target>Selecionar configuração de sincronização alternativa</target>
-
-<source>No filter selected</source>
-<target>Nenhum filtro selecionado</target>
+<target>Selecionar configurações alternativas de sincronização</target>
<source>Filter is active</source>
<target>Filtro está ativo</target>
+<source>No filter selected</source>
+<target>Nenhum filtro selecionado</target>
+
<source>Remove alternate settings</source>
<target>Remover configurações alternativas</target>
@@ -50,14 +53,11 @@
<target>Parâmetros de sincronização</target>
<source>Comparison settings</source>
-<target>Configurações da comparação</target>
+<target>Parâmetros da comparação</target>
<source>About</source>
<target>Sobre</target>
-<source>Error</source>
-<target>Erro</target>
-
<source>Warning</source>
<target>Avisos</target>
@@ -73,29 +73,29 @@
<source>Global settings</source>
<target>Configurações</target>
-<source>Synchronization Preview</source>
-<target>Pré-visualização da Sincronização</target>
+<source>Summary</source>
+<target>Resumo</target>
<source>Find</source>
<target>Localizar</target>
<source>Select time span</source>
-<target>Selecionar período de tempo</target>
+<target>Selecionar intervalo de tempo</target>
<source>Show pop-up</source>
<target>Mostrar pop-up</target>
<source>Show pop-up on errors or warnings</source>
-<target>Mostrar pop-up em erros e avisos</target>
+<target>Mostrar pop-up em caso de erros ou avisos</target>
<source>Ignore errors</source>
<target>Ignorar erros</target>
<source>Hide all error and warning messages</source>
-<target>Ocultar todas as mensagens de erro ou aviso</target>
+<target>Ocultar todas as mensagens de erro e aviso</target>
<source>Exit instantly</source>
-<target>Sair instantaneamente</target>
+<target>Sair imediatamente</target>
<source>Abort synchronization immediately</source>
<target>Cancelar a sincronização imediatamente</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Procurar</target>
-<source>Invalid command line: %x</source>
-<target>Linha de comando inválida: %x</target>
+<source>Invalid command line:</source>
+<target>Linha de comando inválida:</target>
<source>Info</source>
<target>Informações</target>
@@ -158,7 +158,7 @@
<target>Falta de memória!</target>
<source>Database files do not share a common session.</source>
-<target>Os arquivos de banco de dados não compartilham uma sessão comum.</target>
+<target>Os arquivos de banco de dados são de sessões diferentes.</target>
<source>An exception occurred!</source>
<target>Ocorreu uma exceção!</target>
@@ -170,10 +170,10 @@
<target>Não foi possível obter as informações do processo.</target>
<source>Waiting while directory is locked (%x)...</source>
-<target>Esperando enquanto o diretório é travado (%x)...</target>
+<target>Esperando enquanto o diretório é bloqueado (%x)...</target>
<source>Cannot set directory lock %x.</source>
-<target>Não foi possível ajustar o bloqueio no diretório %x.</target>
+<target>Não foi possível bloquear o diretório %x.</target>
<source>
<pluralform>1 sec</pluralform>
@@ -181,7 +181,7 @@
</source>
<target>
<pluralform>1 seg</pluralform>
-<pluralform>%x seg</pluralform>
+<pluralform>%x segs</pluralform>
</target>
<source>Error parsing file %x, row %y, column %z.</source>
@@ -209,7 +209,7 @@
<target>O arquivo %x não contém uma configuração válida.</target>
<source>Configuration file %x loaded partially only.</source>
-<target>O arquivo de configuração %x foi lido parcialmente apenas.</target>
+<target>O arquivo de configuração %x foi carregado parcialmente.</target>
<source>Cannot access Volume Shadow Copy Service.</source>
<target>Não foi possível acessar o Serviço Cópia de Sombra de Volume.</target>
@@ -232,32 +232,32 @@
<source>Cannot read the following XML elements:</source>
<target>Não foi possível ler os seguintes elementos XML:</target>
-<source>S&ave configuration...</source>
-<target>S&alvar configuração...</target>
+<source>&Open...</source>
+<target>&Abrir...</target>
-<source>&Load configuration...</source>
-<target>&Carregar configuração...</target>
+<source>&Save...</source>
+<target>&Salvar...</target>
<source>&Quit</source>
-<target>&Sair</target>
+<target>Sai&r</target>
-<source>&File</source>
-<target>&Arquivo</target>
+<source>&Program</source>
+<target>&Programa</target>
<source>&Content</source>
<target>&Conteúdo</target>
-<source>&About...</source>
-<target>&Sobre...</target>
+<source>&About</source>
+<target>&Sobre</target>
<source>&Help</source>
-<target>&Ajuda</target>
+<target>A&juda</target>
<source>Usage:</source>
<target>Uso:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Selecione os diretórios para monitorar.</target>
+<source>1. Select folders to watch.</source>
+<target>1. Selecione as pastas para monitorar.</target>
<source>2. Enter a command line.</source>
<target>2. Entre uma linha de comando.</target>
@@ -265,19 +265,11 @@
<source>3. Press 'Start'.</source>
<target>3. Pressione 'Iniciar'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-A linha de comando é executada cada vez que:
-- todos os diretórios ficam disponíveis (ex.: inserção de uma Pen Drive)
-- arquivos dentro desses diretórios ou subdiretórios são modificados
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Para iniciar importe um arquivo .ffs_batch.</target>
-<source>Directories to watch</source>
-<target>Diretórios para monitorar</target>
+<source>Folders to watch</source>
+<target>Pastas para comparar</target>
<source>Add folder</source>
<target>Adicionar pasta</target>
@@ -288,18 +280,35 @@ A linha de comando é executada cada vez que:
<source>Select a folder</source>
<target>Selecionar uma pasta</target>
+<source>Delay [seconds]</source>
+<target>Atraso [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>Minimum Idle Time [seconds]</source>
-<target>Mínimo Tempo Ocioso [segundos]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Tempo ocioso entre detecção da última mudança e da execução da linha de comando em segundos</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+O comando é disparado se:
+- arquivos ou subpastas são alterados
+- novas pastas aparecem (p. ex. Uma pendrive é inserida)
+</target>
<source>Start</source>
<target>Iniciar</target>
+<source>&Retry</source>
+<target>&Tentar Novamente</target>
+
+<source>Cancel</source>
+<target>Cancelar</target>
+
<source>(Build: %x)</source>
<target>(Versão: %x)</target>
@@ -318,8 +327,8 @@ A linha de comando é executada cada vez que:
<source>Waiting for missing directories...</source>
<target>Esperando por diretórios faltantes...</target>
-<source>A directory input field is empty.</source>
-<target>Um campo de entrada de diretório está vazio.</target>
+<source>An input folder name is empty.</source>
+<target>Um nome de pasta de entrada está em branco.</target>
<source>Logging</source>
<target>Ver Log</target>
@@ -397,7 +406,7 @@ A linha de comando é executada cada vez que:
<target>FreeFileSync está atualizado!</target>
<source>Do you want FreeFileSync to automatically check for updates every week?</source>
-<target>Deseja que o FreeFileSync procure automaticamente novas versões toda semana?</target>
+<target>Deseja que o FreeFileSync procure automaticamente novas versões todas as semanas?</target>
<source>(Requires an Internet connection!)</source>
<target>(Requer conexão com a Internet!)</target>
@@ -405,8 +414,8 @@ A linha de comando é executada cada vez que:
<source><Symlink></source>
<target><Link Simbólico></target>
-<source><Directory></source>
-<target><Diretório></target>
+<source><Folder></source>
+<target><Pasta></target>
<source>Full path</source>
<target>Caminho completo</target>
@@ -417,8 +426,8 @@ A linha de comando é executada cada vez que:
<source>Relative path</source>
<target>Caminho relativo</target>
-<source>Directory</source>
-<target>Diretório</target>
+<source>Base folder</source>
+<target>Pasta base</target>
<source>Size</source>
<target>Tamanho</target>
@@ -429,8 +438,11 @@ A linha de comando é executada cada vez que:
<source>Extension</source>
<target>Extensão</target>
-<source>Comparison Result</source>
-<target>Resultado da Comparação</target>
+<source>Action</source>
+<target>Ação</target>
+
+<source>Category</source>
+<target>Categoria</target>
<source>Drag && drop</source>
<target>Arrastar && Soltar</target>
@@ -438,30 +450,27 @@ A linha de comando é executada cada vez que:
<source>Close progress dialog</source>
<target>Fechar indicador de progresso</target>
-<source>Shut down</source>
-<target>Desligar</target>
+<source>Standby</source>
+<target>Em espera</target>
<source>Log off</source>
<target>Fazer logoff</target>
-<source>Standby</source>
-<target>Em espera</target>
+<source>Shut down</source>
+<target>Desligar</target>
<source>Hibernate</source>
<target>Hibernar</target>
<source>1. &Compare</source>
-<target>1. C&omparar</target>
+<target>1. &Comparar</target>
-<source>2. &Synchronize...</source>
-<target>2. S&incronizar...</target>
+<source>2. &Synchronize</source>
+<target>2. S&incronizar</target>
<source>&New</source>
<target>&Novo</target>
-<source>&Program</source>
-<target>&Programa</target>
-
<source>&Language</source>
<target>&Idioma</target>
@@ -489,27 +498,27 @@ A linha de comando é executada cada vez que:
<source>&Abort</source>
<target>&Abortar</target>
-<source>Synchronize...</source>
-<target>Sincronizar...</target>
+<source>Synchronize</source>
+<target>Sincronizar</target>
<source>Start synchronization</source>
-<target>Iniciar sincronização</target>
+<target>Iniciar a sincronização</target>
<source>Add folder pair</source>
-<target>Adicionar par de pastas</target>
+<target>Adicionar um par de pastas</target>
<source>Remove folder pair</source>
-<target>Remover par de pastas</target>
+<target>Remover o par de pastas</target>
<source>Swap sides</source>
<target>Inverter lados</target>
-<source>Save current configuration to file</source>
-<target>Salvar configuração atual para arquivo</target>
-
<source>Load configuration from file</source>
<target>Carregar configuração do arquivo</target>
+<source>Save current configuration to file</source>
+<target>Salvar configuração atual para arquivo</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Últimas configurações usadas (pressione DEL para remover da lista)</target>
@@ -519,14 +528,14 @@ A linha de comando é executada cada vez que:
<source>Hide filtered or temporarily excluded files</source>
<target>Ocultar arquivos filtrados ou temporariamente excluídos</target>
-<source>Number of files and directories that will be created</source>
-<target>Número de arquivos e diretórios que serão criados</target>
+<source>Number of files and folders that will be created</source>
+<target>Número de arquivos e pastas que serão criados</target>
<source>Number of files that will be overwritten</source>
<target>Número de arquivos que serão substituídos</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Número de arquivos e diretórios que serão apagados</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Número de arquivos e pastas que serão apagados</target>
<source>Total amount of data that will be transferred</source>
<target>Volume total de dados que será transferido</target>
@@ -549,8 +558,8 @@ A linha de comando é executada cada vez que:
<source>Batch job</source>
<target>Tarefa em lote</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Cria um arquivo de lote e automatiza a sincronização. Para iniciar em modo de lote, simplesmente dê um clique-duplo neste arquivo ou execute o comando: FreeFileSync.exe SyncJob.ffs_batch. Também pode ser agendado pelo Agendador de Tarefas do sistema operacional.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Cria um arquivo de lote para automatizar a sincronização. Dê um clique duplo ou agende no Agendador de Tarefas do sistema operacional: FreeFileSync.exe <nome>.ffs_batch</target>
<source>Help</source>
<target>Ajuda</target>
@@ -576,21 +585,12 @@ A linha de comando é executada cada vez que:
<source>Maximum number of log files:</source>
<target>Número máximo de arquivos de log:</target>
-<source>Select log file directory:</source>
-<target>Escolha um diretório para salvar o arquivo de log:</target>
+<source>Select folder to save log files:</source>
+<target>Selecione a pasta para salvar os arquivos de log:</target>
<source>Batch settings</source>
<target>Configurações da tarefa em lote</target>
-<source>&Save</source>
-<target>&Salvar</target>
-
-<source>&Load</source>
-<target>&Carregar</target>
-
-<source>Cancel</source>
-<target>Cancelar</target>
-
<source>Select variant:</source>
<target>Selecione um modo:</target>
@@ -615,29 +615,23 @@ A linha de comando é executada cada vez que:
<source>Configuration</source>
<target>Configuração</target>
-<source>Category</source>
-<target>Categoria</target>
-
-<source>Action</source>
-<target>Ação</target>
+<source>Item exists on left side only</source>
+<target>Item existe apenas no lado esquerdo</target>
-<source>File/folder exists on left side only</source>
-<target>Arquivo/pasta existente somente no lado esquerdo</target>
+<source>Item exists on right side only</source>
+<target>Item existe apenas no lado direito</target>
-<source>File/folder exists on right side only</source>
-<target>Arquivo/pasta existente somente no lado direito</target>
+<source>Left side is newer</source>
+<target>Lado esquerdo é novo</target>
-<source>Left file is newer</source>
-<target>O arquivo à esquerda é mais novo</target>
+<source>Right side is newer</source>
+<target>Lado direito é novo</target>
-<source>Right file is newer</source>
-<target>O arquivo à direita é mais novo</target>
+<source>Items have different content</source>
+<target>Itens têm conteúdos diferentes</target>
-<source>Files have different content</source>
-<target>Os arquivos possuem conteúdos diferentes</target>
-
-<source>Conflict/file cannot be categorized</source>
-<target>O conflito/arquivo não pode ser categorizado</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Conflito/item não pode ser categorizado</target>
<source>OK</source>
<target>OK</target>
@@ -714,9 +708,6 @@ Os arquivos são considerados iguais se
<source>&Ignore</source>
<target>&Ignorar</target>
-<source>&Retry</source>
-<target>&Tentar Novamente</target>
-
<source>Do not show this dialog again</source>
<target>Não mostrar este diálogo novamente</target>
@@ -747,33 +738,6 @@ Apenas arquivos que correspondem a todas as configurações do filtro serão sin
Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
</target>
-<source>Hints:</source>
-<target>Dicas:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Entre os nomes dos arquivos ou diretórios relativos separados por ';' ou uma nova linha.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Use '*' e '?' como caracteres coringa.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Exclua arquivos diretamente do grid principal através do menu de contexto.</target>
-
-<source>Example</source>
-<target>Exemplo</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Incluir: *.doc;*.zip;*.exe
-Excluir: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Sincronizar todos arquivos .doc, .zip e .exe exceto tudo que estiver na subpasta "temp".</target>
-
<source>Include</source>
<target>Incluir</target>
@@ -795,8 +759,8 @@ Excluir: \stuff\temp\*
<source>&Default</source>
<target>&Config. Padrão</target>
-<source>Transactional file copy</source>
-<target>Cópia de arquivo transacional</target>
+<source>Fail-safe file copy</source>
+<target>Cópia de arquivos a prova de falha</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Escreve para um arquivo temporário primeiro (*.ffs_tmp) e depois o renomeia. Isto garante um estado consistente mesmo em caso de erro fatal.</target>
@@ -810,8 +774,8 @@ Excluir: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Copiar permissões de acesso aos arquivos</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Transfere as permissões de arquivos e diretórios (Requer direitos de Administrador)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Tranfere as permissões dos arquivos e pastas (requer direitos de Administrador)</target>
<source>Restore hidden dialogs</source>
<target>Restaurar diálogos ocultados</target>
@@ -889,7 +853,7 @@ Excluir: \stuff\temp\*
<target>Grande</target>
<source>Select time span...</source>
-<target>Selecionar período de tempo...</target>
+<target>Selecionar intervalo de tempo...</target>
<source>Default view</source>
<target>Visualização padrão</target>
@@ -1006,7 +970,7 @@ Excluir: \stuff\temp\*
<target>Por favor execute primeiro a Comparação antes de sincronizar!</target>
<source>Comma separated list</source>
-<target>Lista de itens separada por vírgula</target>
+<target>Lista de itens separados por vírgulas</target>
<source>Legend</source>
<target>Legenda</target>
@@ -1108,7 +1072,7 @@ Excluir: \stuff\temp\*
<target>Filtro</target>
<source>Direct</source>
-<target>Direcionar</target>
+<target>Direto</target>
<source>Follow</source>
<target>Seguir</target>
@@ -1119,11 +1083,11 @@ Excluir: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Integrar aplicações externas no menu de contexto. As seguintes macros estão disponíveis:</target>
-<source>- full file or directory name</source>
-<target>- nome completo do arquivo ou diretório</target>
+<source>- full file or folder name</source>
+<target>- nome completo do arquivo ou pasta</target>
-<source>- directory part only</source>
-<target>- apenas a parte do diretório</target>
+<source>- folder part only</source>
+<target>- apenas parte da pasta</target>
<source>- Other side's counterpart to %name</source>
<target>- Correspondente do outro lado a %name</target>
@@ -1167,8 +1131,8 @@ Excluir: \stuff\temp\*
<source>Versioning</source>
<target>Controle de versões</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Mover arquivos para um subdiretório com carimbo de tempo</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Move os arquivos para uma subpasta com estampa de tempo</target>
<source>Files</source>
<target>Arquivos</target>
@@ -1191,7 +1155,7 @@ Excluir: \stuff\temp\*
</source>
<target>
<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
+<pluralform>%x mins</pluralform>
</target>
<source>
@@ -1263,8 +1227,8 @@ Excluir: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>Não foi possível ler o diretório %x.</target>
-<source>Endless loop.</source>
-<target>Loop infinito.</target>
+<source>Detected endless directory recursion.</source>
+<target>Detectada recursão de diretório infinita.</target>
<source>Cannot set privilege %x.</source>
<target>Não foi possível estabelecer o privilégio %x.</target>
@@ -1290,14 +1254,11 @@ Excluir: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Configurando direções padrões de sincronização: Arquivos antigos serão substituídos por arquivos mais novos.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>O arquivo não contém uma configuração válida:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Você pode ignorar esse erro para considerar o diretório como vazio.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Você pode ignorar este erro para considerar a pasta como vazia.</target>
-<source>Cannot find directory %x.</source>
-<target>Não foi possível encontrar o diretório %x.</target>
+<source>Cannot find folder %x.</source>
+<target>Não foi possível encontrar a pasta %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>Os diretórios são dependentes! Cuidado ao definir as regras de sincronização:</target>
@@ -1329,44 +1290,44 @@ Excluir: \stuff\temp\*
<source>Both sides are equal</source>
<target>Ambos os lados são iguais</target>
-<source>Files/folders differ in attributes only</source>
-<target>Os arquivos/pastas se diferenciam apenas nos atributos</target>
+<source>Items have different attributes</source>
+<target>Itens têm atributos diferentes</target>
-<source>Copy new file/folder to left</source>
-<target>Copiar arquivos/pastas novos para a esquerda</target>
+<source>Copy new item to left</source>
+<target>Copiar novo item para a esquerda</target>
-<source>Copy new file/folder to right</source>
-<target>Copiar arquivos/pastas novos para a direita</target>
+<source>Copy new item to right</source>
+<target>Copiar novo item para a direita</target>
-<source>Delete left file/folder</source>
-<target>Apagar arquivos/pastas da esquerda</target>
+<source>Delete left item</source>
+<target>Deletar item à esquerda</target>
-<source>Delete right file/folder</source>
-<target>Apagar arquivos/pastas da direita</target>
+<source>Delete right item</source>
+<target>Deletar item à direita</target>
<source>Move file on left</source>
-<target>Mover arquivo da esquerda</target>
+<target>Mover arquivo à esquerda</target>
<source>Move file on right</source>
-<target>Mover arquivo da direita</target>
+<target>Mover arquivo à direita</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Substituir arquivos/pastas da esquerda pelos da direita</target>
+<source>Overwrite left item</source>
+<target>Sobrescrever item à esquerda</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Substituir arquivos/pastas da direita pelos da esquerda</target>
+<source>Overwrite right item</source>
+<target>Sobrescrever item à esquerda</target>
<source>Do nothing</source>
<target>Não fazer nada</target>
-<source>Copy file attributes only to left</source>
-<target>Copiar apenas os atributos do arquivo para a esquerda</target>
+<source>Update attributes on left</source>
+<target>Atualizar atributos à esquerda</target>
-<source>Copy file attributes only to right</source>
-<target>Copiar apenas os atributos do arquivo para a direita</target>
+<source>Update attributes on right</source>
+<target>Atualizar atributos à direita</target>
<source>Multiple...</source>
-<target>Múltiplos...</target>
+<target>Múltiplo...</target>
<source>Deleting file %x</source>
<target>Apagando arquivo %x</target>
@@ -1416,11 +1377,11 @@ Excluir: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Atualizando atributos de %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Nome do diretório de destino não pode estar vazio!</target>
+<source>Target folder name must not be empty.</source>
+<target>O nome da pasta de destino não pode estar em branco.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>O diretório para controle de versões não foi fornecido!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>O nome da pasta para o controle de versões não pode estar em branco.</target>
<source>Source directory %x not found.</source>
<target>O diretório de origem %x não foi encontrado.</target>
@@ -1449,8 +1410,8 @@ Excluir: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>A Lixeira não está disponível para os seguintes caminhos! Os arquivos serão apagados permanentemente:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Um diretório que faz parte de múltiplos pares de pastas será modificado! Por favor revise suas configurações de sincronização!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Uma pasta que é parte de múltiplos pares de pasta será modificada. Por favor, revise as configurações de sincronização.</target>
<source>Processing folder pair:</source>
<target>Processando par de pastas:</target>
diff --git a/BUILD/Languages/romanian.lng b/BUILD/Languages/romanian.lng
index c49c9158..1e526883 100644
--- a/BUILD/Languages/romanian.lng
+++ b/BUILD/Languages/romanian.lng
@@ -7,7 +7,7 @@
<plural definition>n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2</plural definition>
</header>
-<source>Searching for directory %x...</source>
+<source>Searching for folder %x...</source>
<target>Caut dosarul %x...</target>
<source>Show in Explorer</source>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSync - Sincronizare Inteligentă</target>
+<source>Error</source>
+<target>Eroare</target>
+
<source>Select alternate comparison settings</source>
<target>Selectează setările alternative de comparare</target>
<source>Select alternate synchronization settings</source>
<target>Selectează o altă configurație a sincronizării</target>
+<source>Filter is active</source>
+<target>Filtrul de elemente este activ</target>
+
<source>No filter selected</source>
<target>Nu a fost selectat nici un filtru</target>
-<source>Filter is active</source>
-<target>Filtrul este activ</target>
-
<source>Remove alternate settings</source>
<target>Înlătură setările alternative</target>
@@ -44,7 +47,7 @@
<target>Curăță Setările Filtrului</target>
<source>Create a batch job</source>
-<target>Creează o Sarcină Set</target>
+<target>Creează o Sarcină Set [Batch Job]</target>
<source>Synchronization settings</source>
<target>Setările Sincronizării</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>Despre</target>
-<source>Error</source>
-<target>Eroare</target>
-
<source>Warning</source>
<target>Atenție</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Setări Globale</target>
-<source>Synchronization Preview</source>
-<target>Previzionarea Sincronizării</target>
+<source>Summary</source>
+<target>Sumar</target>
<source>Find</source>
<target>Găsește</target>
@@ -83,13 +83,13 @@
<target>Selectează intervalul de timp</target>
<source>Show pop-up</source>
-<target>Este arătat un popîc</target>
+<target>Arată un popîc</target>
<source>Show pop-up on errors or warnings</source>
<target>Va fi afișată o fereastră popîc [popup] la erori sau avertizări</target>
<source>Ignore errors</source>
-<target>Erorile sînt ignorate</target>
+<target>Ignoră erorile</target>
<source>Hide all error and warning messages</source>
<target>Sînt ascunse toate mesajele de eroare și de avertizare</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Explorează</target>
-<source>Invalid command line: %x</source>
-<target>Linie de comandă nevalidă: %x</target>
+<source>Invalid command line:</source>
+<target>Linie de comandă nevalidă:</target>
<source>Info</source>
<target>Informații</target>
@@ -229,29 +229,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>Numele volumului %x nu face parte din numele filei %y !</target>
-<source>Cannot find file %x.</source>
-<target>Nu pot găsi fila %x.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Nu pot citi următoarele elemente XML:</target>
-<source>S&ave configuration...</source>
-<target>S&alvează Configurația...</target>
+<source>Cannot find file %x.</source>
+<target>Nu pot găsi fila %x.</target>
+
+<source>&Open...</source>
+<target>&Deschide...</target>
-<source>&Load configuration...</source>
-<target>&Deschide Configurația...</target>
+<source>&Save...</source>
+<target>&Salvează...</target>
<source>&Quit</source>
<target>&Ieși</target>
-<source>&File</source>
-<target>&Filă</target>
+<source>&Program</source>
+<target>&Program</target>
<source>&Content</source>
<target>&Conținut</target>
-<source>&About...</source>
-<target>&Despre...</target>
+<source>&About</source>
+<target>&Despre</target>
<source>&Help</source>
<target>&Ajutor</target>
@@ -259,7 +259,7 @@
<source>Usage:</source>
<target>Utilizare:</target>
-<source>1. Select directories to monitor.</source>
+<source>1. Select folders to watch.</source>
<target>1. Selectează dosarele de monitorizat.</target>
<source>2. Enter a command line.</source>
@@ -268,19 +268,11 @@
<source>3. Press 'Start'.</source>
<target>3. Apasă 'Pornește'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Linia de comandă este executată de fiecare dată cînd:
-- toate dosarele devin disponibile (de ex. se introduce un dispozitiv USB)
-- filele conținute în aceste dosare sau subdosare sînt modificate
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Pentru a începe, importă o filă de tipul .ffs_batch.</target>
-<source>Directories 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>
@@ -291,18 +283,35 @@ Linia de comandă este executată de fiecare dată cînd:
<source>Select a folder</source>
<target>Selectează un Dosar</target>
+<source>Delay [seconds]</source>
+<target>Întîrziere [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>Minimum Idle Time [seconds]</source>
-<target>Timp Minim de Inactivitate [secunde]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Timp de inactivitate (în secunde) între detectarea ultimei modificări și executarea liniei de comandă</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Comanda este declanșată dacă:
+- sînt modificate filele sau subdosarele
+- apar dosare noi (de ex. prin atașarea unui dispozitiv USB)
+</target>
<source>Start</source>
<target>Pornește</target>
+<source>&Retry</source>
+<target>&Reîncearcă</target>
+
+<source>Cancel</source>
+<target>Anulează</target>
+
<source>(Build: %x)</source>
<target>(Compilația: %x)</target>
@@ -321,8 +330,8 @@ Linia de comandă este executată de fiecare dată cînd:
<source>Waiting for missing directories...</source>
<target>Aștept ca dosarele lipsă să devină disponibile...</target>
-<source>A directory input field is empty.</source>
-<target>Cel puțin unul din dosarele de comparat este nespecificat.</target>
+<source>An input folder name is empty.</source>
+<target>Un cîmp de introducere a numelui de dosar este gol.</target>
<source>Logging</source>
<target>Jurnal</target>
@@ -346,7 +355,7 @@ Linia de comandă este executată de fiecare dată cînd:
<target>Sincronizare Personalizată</target>
<source>FreeFileSync batch file</source>
-<target>Filă cu set de comenzi FreeFileSync</target>
+<target>Filă Set FreeFileSync</target>
<source>FreeFileSync configuration</source>
<target>Configurație FreeFileSync</target>
@@ -408,7 +417,7 @@ Linia de comandă este executată de fiecare dată cînd:
<source><Symlink></source>
<target><Simlegătură></target>
-<source><Directory></source>
+<source><Folder></source>
<target><Dosar></target>
<source>Full path</source>
@@ -420,8 +429,8 @@ Linia de comandă este executată de fiecare dată cînd:
<source>Relative path</source>
<target>Cale Relativă</target>
-<source>Directory</source>
-<target>Dosar</target>
+<source>Base folder</source>
+<target>Dosar Bază (Rădăcină)</target>
<source>Size</source>
<target>Mărime</target>
@@ -432,8 +441,11 @@ Linia de comandă este executată de fiecare dată cînd:
<source>Extension</source>
<target>Extensie</target>
-<source>Comparison Result</source>
-<target>Rezultatul Comparării</target>
+<source>Action</source>
+<target>Acțiune</target>
+
+<source>Category</source>
+<target>Categorie</target>
<source>Drag && drop</source>
<target>Trage și pune un dosar mai jos sau explorează către el</target>
@@ -441,14 +453,14 @@ Linia de comandă este executată de fiecare dată cînd:
<source>Close progress dialog</source>
<target>Închide Fereastra cu Progresul Sincronizării</target>
-<source>Shut down</source>
-<target>Închide Calculatorul [Shut down]</target>
+<source>Standby</source>
+<target>Pune Calculatorul în Stare de Veghe [Stand-by]</target>
<source>Log off</source>
<target>Deloghează Utilizatorul [Log off]</target>
-<source>Standby</source>
-<target>Pune Calculatorul în Stare de Veghe [Stand-by]</target>
+<source>Shut down</source>
+<target>Închide Calculatorul [Shut down]</target>
<source>Hibernate</source>
<target>Pune Calculatorul în Hibernare</target>
@@ -456,15 +468,12 @@ Linia de comandă este executată de fiecare dată cînd:
<source>1. &Compare</source>
<target>1. &Compară</target>
-<source>2. &Synchronize...</source>
-<target>2. &Sincronizează...</target>
+<source>2. &Synchronize</source>
+<target>2. &Sincronizează</target>
<source>&New</source>
<target>Configurație &Nouă</target>
-<source>&Program</source>
-<target>&Program</target>
-
<source>&Language</source>
<target>&Limbă</target>
@@ -492,7 +501,7 @@ Linia de comandă este executată de fiecare dată cînd:
<source>&Abort</source>
<target>&Anulează</target>
-<source>Synchronize...</source>
+<source>Synchronize</source>
<target>Sincronizează</target>
<source>Start synchronization</source>
@@ -507,12 +516,12 @@ Linia de comandă este executată de fiecare dată cînd:
<source>Swap sides</source>
<target>Schimbă compartimentele stîng și drept între ele</target>
-<source>Save current configuration to file</source>
-<target>Salvează într-o filă modificările configurației curente</target>
-
<source>Load configuration from file</source>
<target>Deschide configurația dintr-o filă</target>
+<source>Save current configuration to file</source>
+<target>Salvează într-o filă modificările configurației curente</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Ultimele configurații utilizate (apasă tasta DEL pentru a înlătura din listă)</target>
@@ -522,13 +531,13 @@ Linia de comandă este executată de fiecare dată cînd:
<source>Hide filtered or temporarily excluded files</source>
<target>Ascunde elementele (file/dosare) filtrate sau excluse temporar</target>
-<source>Number of files and directories that will be created</source>
+<source>Number of files and folders that will be created</source>
<target>Numărul de file și dosare care vor fi create</target>
<source>Number of files that will be overwritten</source>
<target>Numărul de file care vor fi suprascrise</target>
-<source>Number of files and directories that will be deleted</source>
+<source>Number of files and folders that will be deleted</source>
<target>Numărul de file și dosare care vor fi șterse</target>
<source>Total amount of data that will be transferred</source>
@@ -552,14 +561,14 @@ Linia de comandă este executată de fiecare dată cînd:
<source>Batch job</source>
<target>Sarcină Set</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Creează o filă set [batch] și automatizează sincronizarea. Pentru a porni în modul set dublu-clichează această filă sau rulează comanda: FreeFileSync.exe SyncJob.ffs_batch. Operația poate fi de asemenea planificată folosind planificatorul de sarcini al sistemului.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Automatizează sincronizarea prin crearea unei file set [batch file]. Pentru efectuarea sincronizării, dublu-clichează această filă sau programează sarcina următoare în Planificatorul de Sarcini [Task Scheduler] al SO: FreeFileSync.exe <numele filei>.ffs_batch</target>
<source>Help</source>
<target>Ajutor</target>
<source>Filter files</source>
-<target>Filtru de Elemente</target>
+<target>Filtru</target>
<source>Left</source>
<target>Stînga</target>
@@ -571,7 +580,7 @@ Linia de comandă este executată de fiecare dată cînd:
<target>Afișarea Stării</target>
<source>Show progress dialog</source>
-<target>Arată caseta de dialog cu progresul</target>
+<target>Arată progresul sincronizării</target>
<source>Error handling</source>
<target>Gestionarea Erorilor</target>
@@ -579,20 +588,11 @@ Linia de comandă este executată de fiecare dată cînd:
<source>Maximum number of log files:</source>
<target>Numărul maxim de file jurnal:</target>
-<source>Select log file directory:</source>
-<target>Selectează un dosar pentru fila .log:</target>
+<source>Select folder to save log files:</source>
+<target>Selectează dosarul unde să fie salvate filele jurnal [log files]</target>
<source>Batch settings</source>
-<target>Setările Setului de Comenzi</target>
-
-<source>&Save</source>
-<target>&Salvează</target>
-
-<source>&Load</source>
-<target>&Deschide</target>
-
-<source>Cancel</source>
-<target>Anulează</target>
+<target>Setările Setului</target>
<source>Select variant:</source>
<target>Selectează Varianta de Sincronizare:</target>
@@ -618,29 +618,23 @@ Linia de comandă este executată de fiecare dată cînd:
<source>Configuration</source>
<target>Configurație</target>
-<source>Category</source>
-<target>Categorie</target>
-
-<source>Action</source>
-<target>Acțiune</target>
+<source>Item exists on left side only</source>
+<target>Elementul există doar în partea stîngă</target>
-<source>File/folder exists on left side only</source>
-<target>Fila/Dosarul există doar în partea stîngă</target>
+<source>Item exists on right side only</source>
+<target>Elementul există doar în partea dreaptă</target>
-<source>File/folder exists on right side only</source>
-<target>Fila/Dosarul există doar în partea dreaptă</target>
+<source>Left side is newer</source>
+<target>Elementul din partea stîngă e mai nou</target>
-<source>Left file is newer</source>
-<target>Fila stîngă e mai nouă</target>
+<source>Right side is newer</source>
+<target>Elementul din partea dreaptă e mai nou</target>
-<source>Right file is newer</source>
-<target>Fila dreaptă e mai nouă</target>
+<source>Items have different content</source>
+<target>Elementele au conținut diferit</target>
-<source>Files have different content</source>
-<target>Filele au conținut diferit</target>
-
-<source>Conflict/file cannot be categorized</source>
-<target>Conflictul de file nu poate fi inclus într-o anumită categorie</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Conflictul/elementul nu poate fi inclus într-o anumită categorie</target>
<source>OK</source>
<target>OK</target>
@@ -673,7 +667,7 @@ este același
</target>
<source>Symbolic Link handling</source>
-<target>Prelucrarea Legăturilor Simbolice (Simlegături)</target>
+<target>Gestionarea Legăturilor Simbolice (Simleg.)</target>
<source>Synchronizing...</source>
<target>Sincronizare Aflată în Curs...</target>
@@ -714,8 +708,8 @@ este același
<source>Hide further error messages during the current process</source>
<target>Ascunde mesajele de eroare apărute ulterior în timpul acestui proces</target>
-<source>&Retry</source>
-<target>&Reîncearcă</target>
+<source>&Ignore</source>
+<target>&Ignoră</target>
<source>Do not show this dialog again</source>
<target>Nu arăta acest dialog din nou</target>
@@ -730,7 +724,7 @@ este același
<target>&Nu</target>
<source>Use Recycle Bin</source>
-<target>Mutare în Reciclator</target>
+<target>Mută în Reciclator</target>
<source>Delete on both sides</source>
<target>Șterge din ambele părți</target>
@@ -747,33 +741,6 @@ Doar filele care se potrivesc cu toate setările de filtrare vor fi sincronizate
Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
</target>
-<source>Hints:</source>
-<target>Sfaturi:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Scrie numele relative ale filelor sau dosarelor, separate de semnul ';' sau de un rînd nou.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Folosește metacaracterele '*' și '?' (asterisc și semn de întrebare).</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Exclude filele și dosarele direct de pe grila principală, cu ajutorul meniului contextual.</target>
-
-<source>Example</source>
-<target>Exemplu</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Incluse: *.doc;*.zip;*.exe
-Excluse: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Sincronizează filele .doc, .zip și .exe, cu excepția celor din subdosarul "temp".</target>
-
<source>Include</source>
<target>Incluse</target>
@@ -795,8 +762,8 @@ Excluse: \stuff\temp\*
<source>&Default</source>
<target>Coloanele &Implicite</target>
-<source>Transactional file copy</source>
-<target>Copiază filele în mod tranzacțional</target>
+<source>Fail-safe file copy</source>
+<target>Copiază filele în modul protejat la eșec [fail-safe]</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Scrierea 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>
@@ -810,7 +777,7 @@ Excluse: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Copiază permisiunile de acces ale filelor</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<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>Restore hidden dialogs</source>
@@ -1109,7 +1076,7 @@ Excluse: \stuff\temp\*
<target>MB</target>
<source>Filter</source>
-<target>Filtrează</target>
+<target>Filtru</target>
<source>Direct</source>
<target>Direcționează</target>
@@ -1123,11 +1090,11 @@ Excluse: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Comenzi pentru aplicații externe incluse în meniul contextual al softului. Sînt disponibile următoarele macrocomenzi:</target>
-<source>- full file or directory name</source>
+<source>- full file or folder name</source>
<target>- numele complet al filei sau dosarului</target>
-<source>- directory part only</source>
-<target>- doar dosarele</target>
+<source>- folder part only</source>
+<target>- doar pentru partea dosarului</target>
<source>- Other side's counterpart to %name</source>
<target>- corespondentul din partea opusă al lui %name</target>
@@ -1162,7 +1129,7 @@ Excluse: \stuff\temp\*
<target>Lasă ca Conflict Nerezolvat</target>
<source>Delete permanently</source>
-<target>Ștergere definitivă</target>
+<target>Șterge definitiv</target>
<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>
@@ -1171,10 +1138,10 @@ Excluse: \stuff\temp\*
<target>Filele șterse sau suprascrise sînt puse în Reciclator [Recycle Bin], de unde pot fi recuperate la nevoie</target>
<source>Versioning</source>
-<target>Versionare</target>
+<target>Versionează</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Filele sînt mutate într-un subdosar special cu marcaj de timp</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Filele sînt mutate într-un subdosar cu marcaj de timp</target>
<source>Files</source>
<target>File</target>
@@ -1272,8 +1239,8 @@ Excluse: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>Nu pot citi dosarul %x.</target>
-<source>Endless loop.</source>
-<target>Buclă infinită.</target>
+<source>Detected endless directory recursion.</source>
+<target>A fost detectată o recursivitate infinită a dosarului.</target>
<source>Cannot set privilege %x.</source>
<target>Nu pot seta privilegiul %x.</target>
@@ -1299,13 +1266,10 @@ Excluse: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Baza de date existentă va fi făcută compatibilă cu versiunea softului și apoi va fi setat sensul implicit de sincronizare: Filele vechi vor fi suprascrise de cele noi.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Fila nu conține o configurație validă:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
+<source>You can ignore this error to consider the folder as empty.</source>
<target>Poți ignora această eroare dacă vrei ca dosarul să fie considerat gol.</target>
-<source>Cannot find directory %x.</source>
+<source>Cannot find folder %x.</source>
<target>Nu pot găsi dosarul %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
@@ -1338,19 +1302,19 @@ Excluse: \stuff\temp\*
<source>Both sides are equal</source>
<target>Ambele părți sînt identice</target>
-<source>Files/folders differ in attributes only</source>
-<target>File/Dosarele diferă doar prin atributele lor</target>
+<source>Items have different attributes</source>
+<target>Elementele au atribute diferite</target>
-<source>Copy new file/folder to left</source>
+<source>Copy new item to left</source>
<target>Copiază elementul nou în stînga</target>
-<source>Copy new file/folder to right</source>
+<source>Copy new item to right</source>
<target>Copiază elementul nou în dreapta</target>
-<source>Delete left file/folder</source>
+<source>Delete left item</source>
<target>Șterge elementul stîng</target>
-<source>Delete right file/folder</source>
+<source>Delete right item</source>
<target>Șterge elementul drept</target>
<source>Move file on left</source>
@@ -1359,20 +1323,20 @@ Excluse: \stuff\temp\*
<source>Move file on right</source>
<target>Mută fila în dreapta</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Suprascrie elementul stîng (fila/dosarul) cu cel drept</target>
+<source>Overwrite left item</source>
+<target>Suprascrie elementul stîng cu cel drept</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Suprascrie elementul drept (fila/dosarul) cu cel stîng</target>
+<source>Overwrite right item</source>
+<target>Suprascrie elementul drept cu cel stîng</target>
<source>Do nothing</source>
<target>Nici o Acțiune</target>
-<source>Copy file attributes only to left</source>
-<target>Copiază atributele filelor doar înspre stînga</target>
+<source>Update attributes on left</source>
+<target>Actualizează atributele în partea stîngă</target>
-<source>Copy file attributes only to right</source>
-<target>Copiază atributele filelor doar înspre dreapta</target>
+<source>Update attributes on right</source>
+<target>Actualizează atributele în partea dreaptă</target>
<source>Multiple...</source>
<target>Multiplu...</target>
@@ -1425,11 +1389,11 @@ Excluse: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Actualizez atributele lui %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Numele dosarului țintă nu poate să lipsească!</target>
+<source>Target folder name must not be empty.</source>
+<target>Numele dosarului țintă nu poate să lipsească.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Dosarul pentru versionarea filelor n-a fost specificat!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Numele dosarului pentru versionarea filelor nu poate să lipsească.</target>
<source>Source directory %x not found.</source>
<target>Dosarul sursă %x nu a fost găsit.</target>
@@ -1458,7 +1422,7 @@ Excluse: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Reciclatorul nu este disponibil pentru căile următoare! Filele vor fi deci șterse definitiv:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
<target>Va fi modificat un dosar care face parte din mai multe perechi de dosare! Reverifică setările de sincronizare!</target>
<source>Processing folder pair:</source>
diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng
index a5008215..79b98c07 100644
--- a/BUILD/Languages/russian.lng
+++ b/BUILD/Languages/russian.lng
@@ -7,7 +7,7 @@
<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>Searching for directory %x...</source>
+<source>Searching for folder %x...</source>
<target>Поиск папки %x...</target>
<source>Show in Explorer</source>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSync - Автоматическая синхронизация</target>
+<source>Error</source>
+<target>Ошибка</target>
+
<source>Select alternate comparison settings</source>
<target>Выбрать альтернативные настройки сравнения</target>
<source>Select alternate synchronization settings</source>
<target>Выбрать альтернативные настройки синхронизации</target>
-<source>No filter selected</source>
-<target>Ни один фильтр не выбран</target>
-
<source>Filter is active</source>
<target>Фильтр активен</target>
+<source>No filter selected</source>
+<target>Ни один фильтр не выбран</target>
+
<source>Remove alternate settings</source>
<target>Удалить альтернативные настройки</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>О программе</target>
-<source>Error</source>
-<target>Ошибка</target>
-
<source>Warning</source>
<target>Внимание</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Глобальные настройки</target>
-<source>Synchronization Preview</source>
-<target>Предпросмотр синхронизации</target>
+<source>Summary</source>
+<target>Сводка</target>
<source>Find</source>
<target>Найти</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Обзор</target>
-<source>Invalid command line: %x</source>
-<target>Неверная командная строка: %x</target>
+<source>Invalid command line:</source>
+<target>Неверная командная строка:</target>
<source>Info</source>
<target>Информация</target>
@@ -229,29 +229,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>Имя тома %x не является частью имени файла %y!</target>
-<source>Cannot find file %x.</source>
-<target>Не удается найти файл %x.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Невозможно прочитать следующие XML элементы:</target>
-<source>S&ave configuration...</source>
-<target>Сохранить настройки синхронизации...</target>
+<source>Cannot find file %x.</source>
+<target>Не удается найти файл %x.</target>
+
+<source>&Open...</source>
+<target>&Открыть...</target>
-<source>&Load configuration...</source>
-<target>&Загрузить настройки синхронизации...</target>
+<source>&Save...</source>
+<target>&Сохранить...</target>
<source>&Quit</source>
<target>&Выход</target>
-<source>&File</source>
-<target>&Файл</target>
+<source>&Program</source>
+<target>&Программа</target>
<source>&Content</source>
<target>&Справка</target>
-<source>&About...</source>
-<target>&О программе...</target>
+<source>&About</source>
+<target>&О программе</target>
<source>&Help</source>
<target>&Помощь</target>
@@ -259,7 +259,7 @@
<source>Usage:</source>
<target>Инструкция:</target>
-<source>1. Select directories to monitor.</source>
+<source>1. Select folders to watch.</source>
<target>1. Выберите папки для наблюдения;</target>
<source>2. Enter a command line.</source>
@@ -268,18 +268,10 @@
<source>3. Press 'Start'.</source>
<target>3. Нажмите 'Старт'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Командная строка выполняется каждый раз, когда:
-- все папки становятся доступны (например, подключение переносного носителя)
-- файлы в папках или подпапках изменены
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Для запуска просто импортируйте файл .ffs_batch.</target>
-<source>Directories to watch</source>
+<source>Folders to watch</source>
<target>Папки для наблюдения</target>
<source>Add folder</source>
@@ -291,23 +283,40 @@ The command line is executed each time:
<source>Select a folder</source>
<target>Выбрать папку</target>
+<source>Delay [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>Minimum Idle Time [seconds]</source>
-<target>Минимальное время простоя [секунд]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Время простоя между обнаружением последнего изменения и выполнением командной строки в секундах</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Команда выполняется, если:
+- файлы или подпапки изменены
+- появились новые папки (например, подключение переносного носителя)
+</target>
<source>Start</source>
<target>Старт</target>
+<source>&Retry</source>
+<target>&Повторить</target>
+
+<source>Cancel</source>
+<target>Отмена</target>
+
<source>(Build: %x)</source>
<target>(сборка %x)</target>
-<source>RealtimeSync configuration</source>
-<target>Настройка RealtimeSync</target>
+<source>All files</source>
+<target></target>
<source>&Restore</source>
<target>&Восстановить</target>
@@ -321,8 +330,8 @@ The command line is executed each time:
<source>Waiting for missing directories...</source>
<target>Ожидание пропущенных папок...</target>
-<source>A directory input field is empty.</source>
-<target>Поле ввода пути папки пустое.</target>
+<source>An input folder name is empty.</source>
+<target>Поле ввода имени папки пустое.</target>
<source>Logging</source>
<target>Лог-файлы</target>
@@ -348,9 +357,6 @@ The command line is executed each time:
<source>FreeFileSync batch file</source>
<target>Файл пакетного задания FreeFileSync</target>
-<source>FreeFileSync configuration</source>
-<target>Настройка FreeFileSync</target>
-
<source>Batch execution</source>
<target>Выполнение пакетного задания</target>
@@ -393,12 +399,12 @@ The command line is executed each time:
<source>Download now?</source>
<target>Загрузить сейчас?</target>
-<source>Information</source>
-<target>Информация</target>
-
<source>FreeFileSync is up to date!</source>
<target>У Вас самая последняя версия FreeFileSync!</target>
+<source>Information</source>
+<target>Информация</target>
+
<source>Do you want FreeFileSync to automatically check for updates every week?</source>
<target>Вы хотите, чтобы FreeFileSync автоматически проверял наличие обновлений каждую неделю?</target>
@@ -408,7 +414,7 @@ The command line is executed each time:
<source><Symlink></source>
<target><Символьная ссылка></target>
-<source><Directory></source>
+<source><Folder></source>
<target><Папка></target>
<source>Full path</source>
@@ -420,8 +426,8 @@ The command line is executed each time:
<source>Relative path</source>
<target>Относительный путь</target>
-<source>Directory</source>
-<target>Папка</target>
+<source>Base folder</source>
+<target>Основная папка</target>
<source>Size</source>
<target>Размер</target>
@@ -432,8 +438,11 @@ The command line is executed each time:
<source>Extension</source>
<target>Расширение</target>
-<source>Comparison Result</source>
-<target>Результаты сравнения</target>
+<source>Action</source>
+<target>Действие</target>
+
+<source>Category</source>
+<target>Категория</target>
<source>Drag && drop</source>
<target>Drag && drop</target>
@@ -441,14 +450,14 @@ The command line is executed each time:
<source>Close progress dialog</source>
<target>Закрыть окно процесса</target>
-<source>Shut down</source>
-<target>Выключить компьютер</target>
+<source>Standby</source>
+<target>Перейти в оджидание</target>
<source>Log off</source>
<target>Выйти из системы (разлогиниться)</target>
-<source>Standby</source>
-<target>Перейти в оджидание</target>
+<source>Shut down</source>
+<target>Выключить компьютер</target>
<source>Hibernate</source>
<target>Гибернация</target>
@@ -456,15 +465,12 @@ The command line is executed each time:
<source>1. &Compare</source>
<target>1. &Сравнить</target>
-<source>2. &Synchronize...</source>
+<source>2. &Synchronize</source>
<target>2. &Синхронизировать</target>
<source>&New</source>
<target>&Новая</target>
-<source>&Program</source>
-<target>&Программа</target>
-
<source>&Language</source>
<target>&Язык</target>
@@ -492,7 +498,7 @@ The command line is executed each time:
<source>&Abort</source>
<target>&Отмена</target>
-<source>Synchronize...</source>
+<source>Synchronize</source>
<target>Синхронизировать</target>
<source>Start synchronization</source>
@@ -507,12 +513,12 @@ The command line is executed each time:
<source>Swap sides</source>
<target>Поменять направление</target>
-<source>Save current configuration to file</source>
-<target>Сохранить текущие настройки синхронизации в файл</target>
-
<source>Load configuration from file</source>
<target>Загрузить настройки синхронизации из файла</target>
+<source>Save current configuration to file</source>
+<target>Сохранить текущие настройки синхронизации в файл</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>
Последние использованные настройки синхронизации
@@ -520,26 +526,23 @@ The command line is executed each time:
</target>
<source>Hide excluded items</source>
-<target>Скрыть исключенные пункты</target>
+<target>Скрыть исключенные элементы</target>
<source>Hide filtered or temporarily excluded files</source>
<target>Скрыть отфильтрованные или временно исключенные файлы</target>
-<source>Number of files and directories that will be created</source>
-<target>Число файлов и папок, которые будут созданы</target>
+<source>Number of files and folders that will be created</source>
+<target>Количество файлов и папок, которые будут созданы</target>
<source>Number of files that will be overwritten</source>
-<target>Число файлов, которые будут перезаписаны</target>
+<target>Количество файлов, которые будут перезаписаны</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Число файлов и папок, которые будут удалены</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Количество файлов и папок, которые будут удалены</target>
<source>Total amount of data that will be transferred</source>
<target>Общий объем данных, который будет передаваться</target>
-<source>Operation:</source>
-<target>Операция:</target>
-
<source>Items found:</source>
<target>Элементов найдено:</target>
@@ -555,8 +558,8 @@ The command line is executed each time:
<source>Batch job</source>
<target>Пакетное задание</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Создайте файл пакетного задания для автоматической синхронизации. Для запуска в пакетном режиме просто дважды щелкните по файлу или выполните командную строку: FreeFileSync.exe SyncJob.ffs_batch. Также запуск можно запланировать в планировщике задач операционной системы.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Создайте файл пакетного задания для автоматической синхронизации. Для запуска дважды кликните на файле или создайте расписание в планировщике вашей системы: FreeFileSync.exe <название>.ffs_batch</target>
<source>Help</source>
<target>Помощь</target>
@@ -582,21 +585,12 @@ The command line is executed each time:
<source>Maximum number of log files:</source>
<target>Максимальное количество лог-файлов:</target>
-<source>Select log file directory:</source>
-<target>Выберите папку для лог-файлов:</target>
+<source>Select folder to save log files:</source>
+<target>Выберите папку для сохранения лог-файлов:</target>
<source>Batch settings</source>
<target>Настройки пакетного задания</target>
-<source>&Save</source>
-<target>&Сохранить</target>
-
-<source>&Load</source>
-<target>&Загрузить</target>
-
-<source>Cancel</source>
-<target>Отмена</target>
-
<source>Select variant:</source>
<target>Варианты синхронизации</target>
@@ -621,29 +615,23 @@ The command line is executed each time:
<source>Configuration</source>
<target>Настройки</target>
-<source>Category</source>
-<target>Категория</target>
+<source>Item exists on left side only</source>
+<target>Элемент существует только на левой стороне</target>
-<source>Action</source>
-<target>Действие</target>
-
-<source>File/folder exists on left side only</source>
-<target>Файл/папка существует только на левой стороне</target>
-
-<source>File/folder exists on right side only</source>
-<target>Файл/папка существует только на правой стороне</target>
+<source>Item exists on right side only</source>
+<target>Элемент существует только на правой стороне</target>
-<source>Left file is newer</source>
-<target>Файл на левой стороне новее</target>
+<source>Left side is newer</source>
+<target>На левой стороне новее</target>
-<source>Right file is newer</source>
-<target>Файл на правой стороне новее</target>
+<source>Right side is newer</source>
+<target>На правой стороне новее</target>
-<source>Files have different content</source>
-<target>Файлы имеют различное содержание</target>
+<source>Items have different content</source>
+<target>Элемент имеют различное содержание</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Конфликт/файл не может быть отнесен к какой-либо категории</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Конфликт/элемент не могут быть отнесены к какой-либо категории</target>
<source>OK</source>
<target>OK</target>
@@ -715,9 +703,6 @@ is the same
<source>&Ignore</source>
<target>&Игнорировать</target>
-<source>&Retry</source>
-<target>&Повторить</target>
-
<source>Do not show this dialog again</source>
<target>Больше не показывать это окно</target>
@@ -748,33 +733,6 @@ Note: File names must be relative to base directories!
Примечание: Файлы должны относиться к синхронизируемым папкам!
</target>
-<source>Hints:</source>
-<target>Подсказка:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Введите имена файлов или папок, разделяя знаком ';' или с новой строки.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Используйте символы '*' и '?' для замены неизвестных.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Исключите файлы прямо в главном окне через контекстное меню.</target>
-
-<source>Example</source>
-<target>Пример</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Включая: *.doc;*.zip;*.exe
-Исключая: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Синхронизировать все .doc, .zip и .exe файлы, за исключением всех файлов из подпапки "temp"</target>
-
<source>Include</source>
<target>Включить</target>
@@ -796,8 +754,8 @@ Exclude: \stuff\temp\*
<source>&Default</source>
<target>&По-умолчанию</target>
-<source>Transactional file copy</source>
-<target>Безопасное копирование файлов</target>
+<source>Fail-safe file copy</source>
+<target>Отказоустойчивое копирование файла</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Сначала копировать во временные файлы (*.ffs_tmp), затем переименовывать их. Это гарантирует целостность заменяемых файлов в случае возникновения фатальной ошибки копирования.</target>
@@ -811,7 +769,7 @@ Exclude: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Копирование прав доступа к файлам</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
<target>Передача прав доступа к файлам/папкам (требуются права Администратора)</target>
<source>Restore hidden dialogs</source>
@@ -1127,10 +1085,10 @@ Exclude: \stuff\temp\*
Доступны следующие команды:
</target>
-<source>- full file or directory name</source>
+<source>- full file or folder name</source>
<target>- полный путь файла или папки</target>
-<source>- directory part only</source>
+<source>- folder part only</source>
<target>- часть пути папки</target>
<source>- Other side's counterpart to %name</source>
@@ -1177,7 +1135,7 @@ Exclude: \stuff\temp\*
<source>Versioning</source>
<target>Перемещать старые версии файлов в заданную папку</target>
-<source>Move files into a time-stamped subdirectory</source>
+<source>Move files into a time-stamped subfolder</source>
<target>Перемещать файлы в заданную папку (можно создавать архивные версии удаленных файлов)</target>
<source>Files</source>
@@ -1246,6 +1204,9 @@ Exclude: \stuff\temp\*
<source>Cannot write modification time of %x.</source>
<target>Не удается записать время модификации файла %x.</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Не удается записать атрибуты файла %x.</target>
+
<source>Cannot find system function %x.</source>
<target>Не удается найти системную функцию %x.</target>
@@ -1267,17 +1228,14 @@ Exclude: \stuff\temp\*
<source>Cannot copy symbolic link %x to %y.</source>
<target>Не удается скопировать символьную ссылку %x в %y.</target>
-<source>Cannot write file attributes of %x.</source>
-<target>Не удается записать атрибуты файла %x.</target>
-
<source>Cannot copy file %x to %y.</source>
<target>Не удается скопировать файл %x в %y.</target>
<source>Cannot read directory %x.</source>
<target>Не удается прочесть папку %x.</target>
-<source>Endless loop.</source>
-<target>Бесконечный цикл.</target>
+<source>Detected endless directory recursion.</source>
+<target>Обнаружена бесконечная рекурсия папок.</target>
<source>Cannot set privilege %x.</source>
<target>Не удается установить привелегии %x.</target>
@@ -1306,13 +1264,10 @@ Exclude: \stuff\temp\*
Старые файлы будут заменены более новыми файлами.
</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Файл не содержит действительных настроек синхронизации:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
+<source>You can ignore this error to consider the folder as empty.</source>
<target>Вы можете проигнорировать ошибку, приняв папку за пустую.</target>
-<source>Cannot find directory %x.</source>
+<source>Cannot find folder %x.</source>
<target>Не удается найти папку %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
@@ -1345,20 +1300,20 @@ Exclude: \stuff\temp\*
<source>Both sides are equal</source>
<target>Обе стороны равны</target>
-<source>Files/folders differ in attributes only</source>
-<target>Файлы/папки разнятся только атрибутами</target>
+<source>Items have different attributes</source>
+<target>Элементы имеют разные атрибуты</target>
-<source>Copy new file/folder to left</source>
-<target>Скопировать новый файл/папку налево</target>
+<source>Copy new item to left</source>
+<target>Скопировать новый элемент налево</target>
-<source>Copy new file/folder to right</source>
-<target>Скопировать новый файл/папку направо</target>
+<source>Copy new item to right</source>
+<target>Скопировать новый элемент направо</target>
-<source>Delete left file/folder</source>
-<target>Удалить файл/папку слева</target>
+<source>Delete left item</source>
+<target>Удалить элемент слева</target>
-<source>Delete right file/folder</source>
-<target>Удалить файл/папку справа</target>
+<source>Delete right item</source>
+<target>Удалить элемент справа</target>
<source>Move file on left</source>
<target>Переместить файл налево</target>
@@ -1366,20 +1321,20 @@ Exclude: \stuff\temp\*
<source>Move file on right</source>
<target>Переместить файл направо</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Перезаписать файл/папку слева на аналогичную из правой части</target>
+<source>Overwrite left item</source>
+<target>Перезаписать элемент слева</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Перезаписать файл/папку справа на аналогичную из левой части</target>
+<source>Overwrite right item</source>
+<target>Перезаписать элемент справа</target>
<source>Do nothing</source>
<target>Ничего не делать</target>
-<source>Copy file attributes only to left</source>
-<target>Скопировать только атрибуты файла налево</target>
+<source>Update attributes on left</source>
+<target>Обновление атрибутов слева</target>
-<source>Copy file attributes only to right</source>
-<target>Скопировать только атрибуты файла направо</target>
+<source>Update attributes on right</source>
+<target>Обновление атрибутов справа</target>
<source>Multiple...</source>
<target>Различные варианты синхронизации</target>
@@ -1432,11 +1387,11 @@ Exclude: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Обновление атрибутов %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Путь целевой папки не должен быть пустым!</target>
+<source>Target folder name must not be empty.</source>
+<target>Путь целевой папки не должен быть пустым.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Папка для старых версий файлов не была указана!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Путь папки для старых версий файлов не должен быть пустым.</target>
<source>Source directory %x not found.</source>
<target>Исходная папка %x не найдена.</target>
@@ -1465,8 +1420,8 @@ Exclude: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Для этого пути "Корзина" не доступна! Файлы будут удалены безвозвратно:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Папка, входящая в несколько пар папок, будет изменена. Пожалуйста, проверьте настройки синхронизации!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Папка, входящая в несколько пар папок, будет изменена. Пожалуйста, проверьте настройки синхронизации.</target>
<source>Processing folder pair:</source>
<target>Обработка пары папок:</target>
diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index 975074be..49461187 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -7,8 +7,8 @@
<plural definition>n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Iščem imenik %x...</target>
+<source>Searching for folder %x...</source>
+<target>Iskanje mape %x...</target>
<source>Show in Explorer</source>
<target>Prikaži v Raziskovalcu</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSync - Avtomatizirana sinhronizacija</target>
+<source>Error</source>
+<target>Napaka</target>
+
<source>Select alternate comparison settings</source>
<target>Izberite alternativne nastavitve primerjanja</target>
<source>Select alternate synchronization settings</source>
<target>Izberite nadomestne nastavitve sinhronizacije</target>
-<source>No filter selected</source>
-<target>Noben filter ni izbran</target>
-
<source>Filter is active</source>
<target>Filter je aktiven</target>
+<source>No filter selected</source>
+<target>Noben filter ni izbran</target>
+
<source>Remove alternate settings</source>
<target>Odstrani nadomestne nastavitve</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>O programu(1)</target>
-<source>Error</source>
-<target>Napaka</target>
-
<source>Warning</source>
<target>Pozor</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Globalne nastavitve</target>
-<source>Synchronization Preview</source>
-<target>Predogled sinhronizacije</target>
+<source>Summary</source>
+<target>Povzetek</target>
<source>Find</source>
<target>Najdi</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Brskaj</target>
-<source>Invalid command line: %x</source>
-<target>Napačna ukazna vrstica: %x</target>
+<source>Invalid command line:</source>
+<target>Napačna ukazna vrstica:</target>
<source>Info</source>
<target>Info</target>
@@ -232,29 +232,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>Ime volumna %x ni del imena datoteke %y!</target>
-<source>Cannot find file %x.</source>
-<target>Ne morem najti datoteke %x.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Ne morem brati naslednje XML elemente:</target>
-<source>S&ave configuration...</source>
-<target>Shr&ani konfiguracijo...</target>
+<source>Cannot find file %x.</source>
+<target>Ne morem najti datoteke %x.</target>
-<source>&Load configuration...</source>
-<target>Na&loži konfiguracijo...</target>
+<source>&Open...</source>
+<target>&Odpri...</target>
+
+<source>&Save...</source>
+<target>&Shrani...</target>
<source>&Quit</source>
<target>&Zapri</target>
-<source>&File</source>
-<target>&Datoteka</target>
+<source>&Program</source>
+<target>&Program</target>
<source>&Content</source>
<target>&Vsebina</target>
-<source>&About...</source>
-<target>&O programu...</target>
+<source>&About</source>
+<target>&O programu</target>
<source>&Help</source>
<target>&Pomoč</target>
@@ -262,8 +262,8 @@
<source>Usage:</source>
<target>Uporaba:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Izberite imenike za nadziranje</target>
+<source>1. Select folders to watch.</source>
+<target>1. Izberite mape za opazovanje</target>
<source>2. Enter a command line.</source>
<target>2. Vnesite ukazno-vrstico.</target>
@@ -271,19 +271,11 @@
<source>3. Press 'Start'.</source>
<target>3. Pritisnite 'Začni'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Ukazna vrstica se izvrši vsakič ko:
-- vsi imeniki postanejo dostopni (npr. ob vstavitvi USB ključa)
-- so datoteke znotraj teh imenikov in podimenikov spremenjene
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Da začnete uvozite datoteko .ffs_batch</target>
-<source>Directories to watch</source>
-<target>Imenika za nadzorovanje</target>
+<source>Folders to watch</source>
+<target>Mape za opazovanje</target>
<source>Add folder</source>
<target>Dodaj mapo</target>
@@ -294,18 +286,35 @@ Ukazna vrstica se izvrši vsakič ko:
<source>Select a folder</source>
<target>Izberite mapo</target>
+<source>Delay [seconds]</source>
+<target>Zakasnitev [sekunde]</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>Minimum Idle Time [seconds]</source>
-<target>Minimalen čas nedejavnosti [sekunde]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Čas nedejavnosti med zaznavanjem zadnje spremembe in izvršitvijo ukazne vrstice v sekundah</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Ukaz se sproži če:
+- se spremenijo datoteke ali podmape
+- 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>(Build: %x)</source>
<target>(Izgradnja: %x)</target>
@@ -324,8 +333,8 @@ Ukazna vrstica se izvrši vsakič ko:
<source>Waiting for missing directories...</source>
<target>Čakam na manjkajoče imenike...</target>
-<source>A directory input field is empty.</source>
-<target>Vpisno polje za imenik je prazno.</target>
+<source>An input folder name is empty.</source>
+<target>Vhodno ime mape je prazno.</target>
<source>Logging</source>
<target>Beleženje</target>
@@ -411,8 +420,8 @@ Ukazna vrstica se izvrši vsakič ko:
<source><Symlink></source>
<target><Simbolična povezava></target>
-<source><Directory></source>
-<target><Imenik></target>
+<source><Folder></source>
+<target><Mapa></target>
<source>Full path</source>
<target>Polna pot</target>
@@ -423,8 +432,8 @@ Ukazna vrstica se izvrši vsakič ko:
<source>Relative path</source>
<target>Relativna pot</target>
-<source>Directory</source>
-<target>Imenik</target>
+<source>Base folder</source>
+<target>Osnovna mapa</target>
<source>Size</source>
<target>Velikost</target>
@@ -435,8 +444,11 @@ Ukazna vrstica se izvrši vsakič ko:
<source>Extension</source>
<target>Razširitev</target>
-<source>Comparison Result</source>
-<target>Rezultati primerjave</target>
+<source>Action</source>
+<target>Ukrep</target>
+
+<source>Category</source>
+<target>Kategorija</target>
<source>Drag && drop</source>
<target>Povleci && spusti</target>
@@ -444,14 +456,14 @@ Ukazna vrstica se izvrši vsakič ko:
<source>Close progress dialog</source>
<target>Zapri pogovorno okno z napredkom</target>
-<source>Shut down</source>
-<target>Ugasni</target>
+<source>Standby</source>
+<target>V pripravljenost</target>
<source>Log off</source>
<target>Odjavi</target>
-<source>Standby</source>
-<target>V pripravljenost</target>
+<source>Shut down</source>
+<target>Ugasni</target>
<source>Hibernate</source>
<target>Hibernacija</target>
@@ -459,15 +471,12 @@ Ukazna vrstica se izvrši vsakič ko:
<source>1. &Compare</source>
<target>1. &Primerjaj</target>
-<source>2. &Synchronize...</source>
-<target>2. &Sinhroniziraj...</target>
+<source>2. &Synchronize</source>
+<target>2. &Sinhroniziraj</target>
<source>&New</source>
<target>&Novo</target>
-<source>&Program</source>
-<target>&Program</target>
-
<source>&Language</source>
<target>&Jezik</target>
@@ -495,8 +504,8 @@ Ukazna vrstica se izvrši vsakič ko:
<source>&Abort</source>
<target>&Prekini</target>
-<source>Synchronize...</source>
-<target>Sinhroniziraj...</target>
+<source>Synchronize</source>
+<target>Sinhroniziraj</target>
<source>Start synchronization</source>
<target>Začni sinhronizacijo</target>
@@ -510,12 +519,12 @@ Ukazna vrstica se izvrši vsakič ko:
<source>Swap sides</source>
<target>Zamenjaj strani</target>
-<source>Save current configuration to file</source>
-<target>Shrani trenutno konfiguracijo v datoteko</target>
-
<source>Load configuration from file</source>
<target>Naloži konfiguracijo iz datoteke</target>
+<source>Save current configuration to file</source>
+<target>Shrani trenutno konfiguracijo v datoteko</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Zadnje uporabljene konfiguracije (pritisite DEL za odstranitev s seznama)</target>
@@ -525,17 +534,17 @@ Ukazna vrstica se izvrši vsakič ko:
<source>Hide filtered or temporarily excluded files</source>
<target>Skrij filtrirane ali začasno izključene datoteke</target>
-<source>Number of files and directories that will be created</source>
-<target>Število datotek in imenikov, ki bodo ustvarjeni</target>
+<source>Number of files and folders that will be created</source>
+<target>Število datotek in map, ki bodo ustvarjene</target>
<source>Number of files that will be overwritten</source>
<target>Število datotek, ki bodo prepisane</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Število datotek in imenikov, ki bodo izbrisani</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Število datotek in map, ki bodo izbrisane</target>
<source>Total amount of data that will be transferred</source>
-<target>Količina podatkov, ki bo prenešena</target>
+<target>Količina podatkov, ki bo prenesena</target>
<source>Operation:</source>
<target>Operacija:</target>
@@ -555,8 +564,8 @@ Ukazna vrstica se izvrši vsakič ko:
<source>Batch job</source>
<target>Paketno opravilo</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Ustvari paketno datoteko in avtomatiziraj sinhronizacijo. Da začnete v paketnem načinu preprosto dvokliknite to datoteko ali poženite ukaz: FreeFileSync.exe SyncJob.ffs_batch. To se lahko nastavi v vaš sistemski načrtovalec opravil.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Ustvari paketno datoteko za avtomatiziranje sinhronizacije. Dvokliknite to datoteko ali jo nastavite v razpored opravil vašega sistema: FreeFileSync.exe <ime opravila>.ffs_batch</target>
<source>Help</source>
<target>Pomoč</target>
@@ -582,21 +591,12 @@ Ukazna vrstica se izvrši vsakič ko:
<source>Maximum number of log files:</source>
<target>Maksimalno število datotek beleženja:</target>
-<source>Select log file directory:</source>
-<target>Izberite imenik za datoteko beleženja:</target>
+<source>Select folder to save log files:</source>
+<target>Izberite mapo za shranjevanje datotek beleženja:</target>
<source>Batch settings</source>
<target>Paketne nastavitve</target>
-<source>&Save</source>
-<target>&Shrani</target>
-
-<source>&Load</source>
-<target>&Naloži</target>
-
-<source>Cancel</source>
-<target>Prekliči</target>
-
<source>Select variant:</source>
<target>Izberite varianto:</target>
@@ -621,29 +621,23 @@ Ukazna vrstica se izvrši vsakič ko:
<source>Configuration</source>
<target>Konfiguracija</target>
-<source>Category</source>
-<target>Kategorija</target>
-
-<source>Action</source>
-<target>Ukrep</target>
-
-<source>File/folder exists on left side only</source>
-<target>Datoteka/mapa obstaja samo na levi strani</target>
+<source>Item exists on left side only</source>
+<target>Element obstaja samo na levi strani</target>
-<source>File/folder exists on right side only</source>
-<target>Datoteka/mapa obstaja samo na desni strani</target>
+<source>Item exists on right side only</source>
+<target>Element obstaja samo na desni strani</target>
-<source>Left file is newer</source>
-<target>Leva datoteka je novejša</target>
+<source>Left side is newer</source>
+<target>Leva stran je novejša</target>
-<source>Right file is newer</source>
-<target>Desna datoteka je novejša</target>
+<source>Right side is newer</source>
+<target>Desna stran je novejša</target>
-<source>Files have different content</source>
-<target>Datoteki imata različno vsebino</target>
+<source>Items have different content</source>
+<target>Elementi imajo različno vsebino</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Spor/datoteka ne more biti kategorizirana</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Spor/element ne more biti kategoriziran</target>
<source>OK</source>
<target>V redu</target>
@@ -720,9 +714,6 @@ enaka
<source>&Ignore</source>
<target>&Ignoriraj</target>
-<source>&Retry</source>
-<target>&Ponovi</target>
-
<source>Do not show this dialog again</source>
<target>Ne prikaži več tega pogovornega okna</target>
@@ -753,33 +744,6 @@ Samo datoteke, ki ustrezajo vsem nastavitvam filtra bodo sinhronizirane.
Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
</target>
-<source>Hints:</source>
-<target>Namigi:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Vnesite relativna imena datotek ali imenikov ločenih s ';' ali novo vrstico.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Uporabite lahko tudi znake '*' in '?'.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Izključite datoteke neposredno na glavni mreži s kontekstnim menujem.</target>
-
-<source>Example</source>
-<target>Primer</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Vključi: *.doc;*.zip;*.exe
-Izključi: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Sinhroniziraj vse .doc, .zip in .exe datoteke, razen iz podmape "temp".</target>
-
<source>Include</source>
<target>Vključi</target>
@@ -801,8 +765,8 @@ Izključi: \stuff\temp\*
<source>&Default</source>
<target>&Privzeto</target>
-<source>Transactional file copy</source>
-<target>Transakcijsko kopiranje datotek</target>
+<source>Fail-safe file copy</source>
+<target>Kopiranje datotek varno pred odpovedjo</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Najprej zapisuj v začasno datoteko (*.ffs_tmp) in nato preimenuj. To zagotavlja dosledno stanje celo v primeru usodne napake.</target>
@@ -816,8 +780,8 @@ Izključi: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Kopiraj dovoljenja dostopov datoteke</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Prenesi dovoljenja datotek in imenikov (Zahteva pravice skrbnika)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Prenesi dovoljenja datotek in map (Zahteva pravice Skrbnika)</target>
<source>Restore hidden dialogs</source>
<target>Obnovi skrite pogovore</target>
@@ -1133,11 +1097,11 @@ Izključi: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Integriraj zunanje aplikacije v kontekstni menu. Na voljo so naslednji makri:</target>
-<source>- full file or directory name</source>
-<target>- polno ime datoteke ali imenika</target>
+<source>- full file or folder name</source>
+<target>- polno ime datoteke ali mape</target>
-<source>- directory part only</source>
-<target>- del, ki zajema samo imenike</target>
+<source>- folder part only</source>
+<target>- samo del glede mape</target>
<source>- Other side's counterpart to %name</source>
<target>- Duplikat z druge strani od %name</target>
@@ -1185,8 +1149,8 @@ Izključi: \stuff\temp\*
<source>Versioning</source>
<target>Ustvarjanje različič</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Premakni datoteke v časovno-označen podimenik</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Premakni datoteke v časovno-ožigosano podmapo</target>
<source>Files</source>
<target>Datoteke</target>
@@ -1287,8 +1251,8 @@ Izključi: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>Ne morem prebrati imenika %x.</target>
-<source>Endless loop.</source>
-<target>Neskončno zazankano</target>
+<source>Detected endless directory recursion.</source>
+<target>Zaznana neskončna imeniška rekurzija</target>
<source>Cannot set privilege %x.</source>
<target>Ne morem nastaviti privilegija %x.</target>
@@ -1314,14 +1278,11 @@ Izključi: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Nastavljanje privzetih smeri sinhronizacije: Stare datoteke bodo prepisane z novimi datotekami.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Datoteka ne vsebuje veljavne konfiguracije:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>To napako z obravnavanjem imenika kot praznega lahko ignorirate.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>To napako, da upoštevate mapo kot prazno, lahko ignorirate</target>
-<source>Cannot find directory %x.</source>
-<target>Ne morem najti imenika %x.</target>
+<source>Cannot find folder %x.</source>
+<target>Ne morem najti mape %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>Imeniki so v odvisnosti! Bodite pozorni, ko nastavljate sinhronizacijska pravila:</target>
@@ -1353,20 +1314,20 @@ Izključi: \stuff\temp\*
<source>Both sides are equal</source>
<target>Obe strani sta enaki</target>
-<source>Files/folders differ in attributes only</source>
-<target>Datoteke/mape se razlikujejo samo v atributih</target>
+<source>Items have different attributes</source>
+<target>Elementi imajo različne atribute</target>
-<source>Copy new file/folder to left</source>
-<target>Kopiraj novo datoteko/mapo na levo</target>
+<source>Copy new item to left</source>
+<target>Kopiraj nov element na levo</target>
-<source>Copy new file/folder to right</source>
-<target>Kopiraj novo datoteko/mapo na desno</target>
+<source>Copy new item to right</source>
+<target>Kopiraj nov element na desno</target>
-<source>Delete left file/folder</source>
-<target>Izbriši levo datoteko/mapo</target>
+<source>Delete left item</source>
+<target>Izbriši levi element</target>
-<source>Delete right file/folder</source>
-<target>Izbriši desno datoteko/mapo</target>
+<source>Delete right item</source>
+<target>Izbriše desni element</target>
<source>Move file on left</source>
<target>Premakni datoteko na levo</target>
@@ -1374,20 +1335,20 @@ Izključi: \stuff\temp\*
<source>Move file on right</source>
<target>Premakni datoteko na desno</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Prepiši levo datoteko/mapo s tisto na desni</target>
+<source>Overwrite left item</source>
+<target>Prepiši levi element</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Prepiši desno datoteko/mapo s tisto na levi</target>
+<source>Overwrite right item</source>
+<target>Prepiši desni element</target>
<source>Do nothing</source>
<target>Ne naredi ničesar</target>
-<source>Copy file attributes only to left</source>
-<target>Kopiraj atribute datoteke samo na levo</target>
+<source>Update attributes on left</source>
+<target>Posodobi atribute na levi</target>
-<source>Copy file attributes only to right</source>
-<target>Kopiraj atribute datoteke samo na desno</target>
+<source>Update attributes on right</source>
+<target>Posodobi atribute na desni</target>
<source>Multiple...</source>
<target>Večkratno...</target>
@@ -1440,11 +1401,11 @@ Izključi: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Posodabljam atribute od %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Ime ciljnega imenika ne sme biti prazno!</target>
+<source>Target folder name must not be empty.</source>
+<target>Ime ciljne mape ne sme biti prazno.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Imenik za upravljanje z datotečnimi raličicami ni bil podan!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Ime mape za ustvarjanje različic ne sme biti prazno.</target>
<source>Source directory %x not found.</source>
<target>Izvorni imenik %x ni bil najden.</target>
@@ -1473,8 +1434,8 @@ Izključi: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Koš ni na voljo za naslednje poti! Namesto tega bodo datoteke trajno izbrisane:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Imenik bo spremenjen, kar je del večkratnih parov map! Prosimo preglejte nastavitve sinhronizacije!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Spremenjena bo mapa, ki je del večkratnih parov map. Prosim preglejte nastavitve sinhronizacije.</target>
<source>Processing folder pair:</source>
<target>Obdelujem par map:</target>
diff --git a/BUILD/Languages/spanish.lng b/BUILD/Languages/spanish.lng
index f7ceb578..39f6db69 100644
--- a/BUILD/Languages/spanish.lng
+++ b/BUILD/Languages/spanish.lng
@@ -7,8 +7,8 @@
<plural definition>n == 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Buscando directorio %x...</target>
+<source>Searching for folder %x...</source>
+<target>Buscando carpeta %x...</target>
<source>Show in Explorer</source>
<target>Mostrar en Explorer</target>
@@ -34,12 +34,12 @@
<source>Select alternate synchronization settings</source>
<target>Seleccione opciones alternativas de sincronización</target>
-<source>No filter selected</source>
-<target>Ningún filtro seleccionado</target>
-
<source>Filter is active</source>
<target>Filtro activo</target>
+<source>No filter selected</source>
+<target>Ningún filtro seleccionado</target>
+
<source>Remove alternate settings</source>
<target>Eliminar opciones alternativas</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Opciones globales</target>
-<source>Synchronization Preview</source>
-<target>Previsualización de la sincronización</target>
+<source>Summary</source>
+<target>Resumen</target>
<source>Find</source>
<target>Buscar</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Examinar</target>
-<source>Invalid command line: %x</source>
-<target>Línea de comandos errónea: %x</target>
+<source>Invalid command line:</source>
+<target>Línea de comandos errónea:</target>
<source>Info</source>
<target>Info</target>
@@ -226,29 +226,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>El nombre del volumen %x no es una parte del nombre de archivo %y</target>
-<source>Cannot find file %x.</source>
-<target>No se puede encontrar el archivo %x.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Incapaz de leer los siguientes elementos XML:</target>
-<source>S&ave configuration...</source>
-<target>G&uardar configuración...</target>
+<source>Cannot find file %x.</source>
+<target>No se puede encontrar el archivo %x.</target>
-<source>&Load configuration...</source>
-<target>&Cargar configuración...</target>
+<source>&Open...</source>
+<target>&Abrir...</target>
+
+<source>&Save...</source>
+<target>&Guardar...</target>
<source>&Quit</source>
<target>&Salir</target>
-<source>&File</source>
-<target>&Archivo</target>
+<source>&Program</source>
+<target>&Programa</target>
<source>&Content</source>
<target>&Contenido</target>
-<source>&About...</source>
-<target>&Acerca de...</target>
+<source>&About</source>
+<target>&Acerca de</target>
<source>&Help</source>
<target>&Ayuda</target>
@@ -256,8 +256,8 @@
<source>Usage:</source>
<target>Uso:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Seleccione los directorios a visualizar.</target>
+<source>1. Select folders to watch.</source>
+<target>1. Seleccionar carpetar para ver.</target>
<source>2. Enter a command line.</source>
<target>2. Introduzca una línea de comandos.</target>
@@ -265,19 +265,11 @@
<source>3. Press 'Start'.</source>
<target>3. Presione 'Inicio'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-La línea de comandos se ejecuta cada vez:
-- todos los directorios estan disponibles (ej. inserción de un lápiz USB)
-- archivos dentro de directorios o subdirectorios son modificados
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Para empezar, importe un archivo .ffs_batch</target>
-<source>Directories to watch</source>
-<target>Directorios a visualizar</target>
+<source>Folders to watch</source>
+<target>Carpetas para ver</target>
<source>Add folder</source>
<target>Añadir carpeta</target>
@@ -288,14 +280,25 @@ La línea de comandos se ejecuta cada vez:
<source>Select a folder</source>
<target>Seleccione una carpeta</target>
+<source>Delay [seconds]</source>
+<target>Retraso [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>Minimum Idle Time [seconds]</source>
-<target>Tiempo mínimo de espera [segundos]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Tiempo de inactividad entre la detección del último cambio y la ejecución de la línea de comandos en segundos</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+El comando es disparado si::
+- hay cambios en los archivos o subcarpetas
+- aparecen nuevas carpetas (Insertando una memoria USB, por ejemplo)
+</target>
<source>Start</source>
<target>Iniciar</target>
@@ -324,8 +327,8 @@ La línea de comandos se ejecuta cada vez:
<source>Waiting for missing directories...</source>
<target>Esperando directorios faltantes...</target>
-<source>A directory input field is empty.</source>
-<target>Un campo de directorio está vacío.</target>
+<source>An input folder name is empty.</source>
+<target>Un nombre de carpeta de entrada está vacío.</target>
<source>Logging</source>
<target>Registro</target>
@@ -411,8 +414,8 @@ La línea de comandos se ejecuta cada vez:
<source><Symlink></source>
<target><Enlace simbólico></target>
-<source><Directory></source>
-<target><Directorio></target>
+<source><Folder></source>
+<target><Carpeta></target>
<source>Full path</source>
<target>Ruta completa</target>
@@ -423,8 +426,8 @@ La línea de comandos se ejecuta cada vez:
<source>Relative path</source>
<target>Ruta relativa</target>
-<source>Directory</source>
-<target>Directorio</target>
+<source>Base folder</source>
+<target>Carpeta base</target>
<source>Size</source>
<target>Tamaño</target>
@@ -435,8 +438,11 @@ La línea de comandos se ejecuta cada vez:
<source>Extension</source>
<target>Extensión</target>
-<source>Comparison Result</source>
-<target>Resultado de la comparación</target>
+<source>Action</source>
+<target>Acción</target>
+
+<source>Category</source>
+<target>Categoría</target>
<source>Drag && drop</source>
<target>Arrastrar y soltar</target>
@@ -444,14 +450,14 @@ La línea de comandos se ejecuta cada vez:
<source>Close progress dialog</source>
<target>Cerrar diálogo de progreso</target>
-<source>Shut down</source>
-<target>Apagar</target>
+<source>Standby</source>
+<target>Suspender</target>
<source>Log off</source>
<target>Finalizar sesión</target>
-<source>Standby</source>
-<target>Suspender</target>
+<source>Shut down</source>
+<target>Apagar</target>
<source>Hibernate</source>
<target>Hibernar</target>
@@ -459,15 +465,12 @@ La línea de comandos se ejecuta cada vez:
<source>1. &Compare</source>
<target>1. &Comparar</target>
-<source>2. &Synchronize...</source>
-<target>2. &Sincronizar...</target>
+<source>2. &Synchronize</source>
+<target>2. &Sincronizar</target>
<source>&New</source>
<target>&Nuevo</target>
-<source>&Program</source>
-<target>&Programa</target>
-
<source>&Language</source>
<target>&Idioma</target>
@@ -495,8 +498,8 @@ La línea de comandos se ejecuta cada vez:
<source>&Abort</source>
<target>&Abortar</target>
-<source>Synchronize...</source>
-<target>Sincronizar...</target>
+<source>Synchronize</source>
+<target>Sincronizar</target>
<source>Start synchronization</source>
<target>Iniciar sincronización</target>
@@ -510,12 +513,12 @@ La línea de comandos se ejecuta cada vez:
<source>Swap sides</source>
<target>Intercambiar lados</target>
-<source>Save current configuration to file</source>
-<target>Guardar configuración actual en un archivo</target>
-
<source>Load configuration from file</source>
<target>Cargar configuración desde archivo</target>
+<source>Save current configuration to file</source>
+<target>Guardar configuración actual en un archivo</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Últimas configuraciones usadas (Pulsar DEL para quitar de la lista)</target>
@@ -525,14 +528,14 @@ La línea de comandos se ejecuta cada vez:
<source>Hide filtered or temporarily excluded files</source>
<target>Ocultar archivos filtrados o temporalmente excluidos</target>
-<source>Number of files and directories that will be created</source>
-<target>Número de archivos y directorios que serán creados</target>
+<source>Number of files and folders that will be created</source>
+<target>Número de archivos y carpetas que serán creados</target>
<source>Number of files that will be overwritten</source>
<target>Número de archivos que serán sobreescritos</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Número de archivos y directorios que serán eliminados</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Número de archivos y carpetas que serán eliminados</target>
<source>Total amount of data that will be transferred</source>
<target>Cantidad total de datos que serán transferidos</target>
@@ -555,8 +558,8 @@ La línea de comandos se ejecuta cada vez:
<source>Batch job</source>
<target>Tarea por lotes</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Crear un archivo por lotes y automatizar la sincronización. Para empezar en modo por lotes, hacer doble clic en el archivo o ejecutar el comando: FreeFileSync.exe SyncJob.ffs_batch. Esto también puede ser programado en el planificador de tareas del sistema.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Crear archivo batch para sincronización automática. Haga doble clic en este archivo o prográmelo en el planificador de tareas del sistema: FreeFileSync.exe <job name>.ffs_batch</target>
<source>Help</source>
<target>Ayuda</target>
@@ -582,18 +585,12 @@ La línea de comandos se ejecuta cada vez:
<source>Maximum number of log files:</source>
<target>Número máximo de archivos de registro:</target>
-<source>Select log file directory:</source>
-<target>Seleccione directorio para el archivo de registro:</target>
+<source>Select folder to save log files:</source>
+<target>Seleccionar carpeta para guardar archivos de registro:</target>
<source>Batch settings</source>
<target>Opciones de lotes</target>
-<source>&Save</source>
-<target>&Guardar</target>
-
-<source>&Load</source>
-<target>&Cargar</target>
-
<source>Select variant:</source>
<target>Seleccione un tipo:</target>
@@ -618,29 +615,23 @@ La línea de comandos se ejecuta cada vez:
<source>Configuration</source>
<target>Configuración</target>
-<source>Category</source>
-<target>Categoría</target>
+<source>Item exists on left side only</source>
+<target>El elemento existe sólo en el lado izquierdo</target>
-<source>Action</source>
-<target>Acción</target>
-
-<source>File/folder exists on left side only</source>
-<target>Archivo/carpeta existe sólo en el lado izquierdo</target>
-
-<source>File/folder exists on right side only</source>
-<target>Archivo/carpeta existe sólo en el lado derecho</target>
+<source>Item exists on right side only</source>
+<target>El elemento existe sólo en el lado derecho</target>
-<source>Left file is newer</source>
-<target>El archivo de la izquierda es más reciente</target>
+<source>Left side is newer</source>
+<target>El lado izquierdo es más nuevo</target>
-<source>Right file is newer</source>
-<target>El archivo de la derecha es más reciente</target>
+<source>Right side is newer</source>
+<target>El lado derecho es más nuevo</target>
-<source>Files have different content</source>
-<target>Los archivos tienen contenido diferentes</target>
+<source>Items have different content</source>
+<target>Los elementos tienen contenido distinto</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Conflicto/el achivo no puede ser categorizado</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Conflicto</target>
<source>OK</source>
<target>OK</target>
@@ -747,33 +738,6 @@ Sólo archivos en que coincidan todos los filtros serán sincronizados.
Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
</target>
-<source>Hints:</source>
-<target>Consejos:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Introduzca los nombres de los archivos o directorios relativos separados por ';' o una nueva línea.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Usar caracteres comodín '*' y '?'.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Excluir directamente archivos sobre las celdas a través del menú de contexto.</target>
-
-<source>Example</source>
-<target>Ejemplo</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Incluir: *.doc;*.zip;*.exe
-Excluir: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Sincronizar todos los archivos .doc, .zip y .exe excepto el contenido de la subcarpeta "temp".</target>
-
<source>Include</source>
<target>Incluir</target>
@@ -795,8 +759,8 @@ Excluir: \stuff\temp\*
<source>&Default</source>
<target>&Configuración por defecto</target>
-<source>Transactional file copy</source>
-<target>Copia de archivos transaccionales</target>
+<source>Fail-safe file copy</source>
+<target>Copia de archivo a prueba de fallos</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of 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>
@@ -810,8 +774,8 @@ Excluir: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Copiar permisos de acceso al archivo</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Transferir permisos de archivo y directorio (Requiere derechos de administrador)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Transferir permisos de archivo y carpeta (Requiere derechos de Administrador)</target>
<source>Restore hidden dialogs</source>
<target>Restaurar diálogos ocultos</target>
@@ -1119,11 +1083,11 @@ Excluir: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Integrar aplicaciones externas en el menú de contexto. Los siguientes macros están disponibles:</target>
-<source>- full file or directory name</source>
-<target>- nombre completo del archivo o directorio</target>
+<source>- full file or folder name</source>
+<target>- nombre completo de archivo o carpeta</target>
-<source>- directory part only</source>
-<target>- sólo parte del directorio</target>
+<source>- folder part only</source>
+<target>- sólo parte de la carpeta</target>
<source>- Other side's counterpart to %name</source>
<target>- El otro lado equivale a %name</target>
@@ -1167,8 +1131,8 @@ Excluir: \stuff\temp\*
<source>Versioning</source>
<target>Control de versiones</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Mover archivos a un subdirectorio con marca de tiempo</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Mover archivo a una subcarpeta con marca de tiempo</target>
<source>Files</source>
<target>Archivos</target>
@@ -1263,11 +1227,11 @@ Excluir: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>No se puede leer el directorio %x.</target>
-<source>Endless loop.</source>
-<target>Bucle infinito.</target>
+<source>Detected endless directory recursion.</source>
+<target>Detectada recursividad de directorios sin fin.</target>
<source>Cannot set privilege %x.</source>
-<target>No se puede</target>
+<target>No se puede asignar el privilegio %x.</target>
<source>Unable to move %x to the Recycle Bin!</source>
<target>¡Incapaz de mover %x a la Papelera de reciclaje!</target>
@@ -1290,14 +1254,11 @@ Excluir: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Fijando direcciones de sincronización por defecto: Los archivos viejos serán sobreescritos por los archivos nuevos.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>El archivo no contiene una configuración válida:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Puede ignorar este error al considerar el directorio como vacío.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Puede ignorar este error al considerar vacía la carpeta.</target>
-<source>Cannot find directory %x.</source>
-<target>No se puede encontrar el directorio %x.</target>
+<source>Cannot find folder %x.</source>
+<target>No se puede encontrar la carpeta %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>¡Los directorios son dependientes! Tenga cuidado al establecer las reglas de sincronización:</target>
@@ -1329,20 +1290,20 @@ Excluir: \stuff\temp\*
<source>Both sides are equal</source>
<target>Ambos lados son iguales</target>
-<source>Files/folders differ in attributes only</source>
-<target>Archivos/carpetas se diferencia sólo en los atributos</target>
+<source>Items have different attributes</source>
+<target>Los elementos tienen distintos atributos</target>
-<source>Copy new file/folder to left</source>
-<target>Copiar nuevo archivo/carpeta a la izquierda</target>
+<source>Copy new item to left</source>
+<target>Copiar nuevo elemento a la izquierda</target>
-<source>Copy new file/folder to right</source>
-<target>Copiar nuevo archivo/carpeta a la derecha</target>
+<source>Copy new item to right</source>
+<target>Copiar nuevo elemento a la derecha</target>
-<source>Delete left file/folder</source>
-<target>Eliminar archivo/carpeta de la izquierda</target>
+<source>Delete left item</source>
+<target>Eliminar elemento izquierdo</target>
-<source>Delete right file/folder</source>
-<target>Eliminar archivo/carpeta de la derecha</target>
+<source>Delete right item</source>
+<target>Eliminar elemento derecho</target>
<source>Move file on left</source>
<target>Mover archivo a la izquierda</target>
@@ -1350,20 +1311,20 @@ Excluir: \stuff\temp\*
<source>Move file on right</source>
<target>Mover archivo a la derecha</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Sobreescribir archivo/carpeta de la izquierda por el de la derecha</target>
+<source>Overwrite left item</source>
+<target>Sobreescribir elemento izquierdo</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Sobreescribir archivo/carpeta de la derecha por el de la izquierda</target>
+<source>Overwrite right item</source>
+<target>Sobreescribir elemento derecho</target>
<source>Do nothing</source>
<target>No hacer nada</target>
-<source>Copy file attributes only to left</source>
-<target>Copiar sólo atributos del archivo a la izquierda</target>
+<source>Update attributes on left</source>
+<target>Actualizar atributos en la izquierda</target>
-<source>Copy file attributes only to right</source>
-<target>Copiar sólo atributos del archivo a la derecha</target>
+<source>Update attributes on right</source>
+<target>Actualizar atributos en la derecha</target>
<source>Multiple...</source>
<target>Múltiple...</target>
@@ -1416,11 +1377,11 @@ Excluir: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Actualizar atributos de %x</target>
-<source>Target directory name must not be empty!</source>
-<target>¡El nombre del directorio de destino no debe estar vacío!</target>
+<source>Target folder name must not be empty.</source>
+<target>El nombre de la carpeta de destino no debe estar vacío.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>¡El directorio para el versionamiento de archivo no ha sido especificado!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>El nombre de la carpeta de versiones de archivos no debe estar vacío.</target>
<source>Source directory %x not found.</source>
<target>Directorio fuente %x no encontrado.</target>
@@ -1449,8 +1410,8 @@ Excluir: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>¡La papelera de reciclaje no está disponible para las siguientes rutas! Los archivos serán eliminados permanentemente:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Un directorio será modificado, el cual es parte de mútiples pares de carpetas. ¡Por favor, revise la configuración de la sincronización!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Una carpeta, que es parte de múltiple pares de carpetas, será modificada. Por favor, revise las opciones de sincronización.</target>
<source>Processing folder pair:</source>
<target>Procesar un par de carpetas:</target>
diff --git a/BUILD/Languages/swedish.lng b/BUILD/Languages/swedish.lng
index 06a0b627..85364f34 100644
--- a/BUILD/Languages/swedish.lng
+++ b/BUILD/Languages/swedish.lng
@@ -7,8 +7,8 @@
<plural definition>n == 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>Söker efter katalogen</target>
+<source>Searching for folder %x...</source>
+<target>Söker efter mappen %x...</target>
<source>Show in Explorer</source>
<target>Visa i Utforskaren</target>
@@ -17,7 +17,7 @@
<target>Öppna med standardprogram</target>
<source>Browse directory</source>
-<target>Sök upp katalog</target>
+<target>Sök upp mapp</target>
<source>Abort requested: Waiting for current operation to finish...</source>
<target>Avbryter: Väntar på att aktuell process skall slutföras...</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSync - Automatiserad synkronisering</target>
+<source>Error</source>
+<target>Fel</target>
+
<source>Select alternate comparison settings</source>
<target>Välj alternativa jämförelseinställningar</target>
<source>Select alternate synchronization settings</source>
<target>Välj alternativa synkroniseringsinställningar</target>
-<source>No filter selected</source>
-<target>Inga filter aktiverade</target>
-
<source>Filter is active</source>
<target>Filter är aktiverat</target>
+<source>No filter selected</source>
+<target>Inga filter aktiverade</target>
+
<source>Remove alternate settings</source>
<target>Ta bort alternativa inställningar</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>Om</target>
-<source>Error</source>
-<target>Fel</target>
-
<source>Warning</source>
<target>Varning</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Allmäna inställningar</target>
-<source>Synchronization Preview</source>
-<target>Förhandsvisning</target>
+<source>Summary</source>
+<target>Sammanställning</target>
<source>Find</source>
<target>Sök</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Bläddra</target>
-<source>Invalid command line: %x</source>
-<target>Ogiltig kommandorad: %x</target>
+<source>Invalid command line:</source>
+<target>Ogiltig kommandorad:</target>
<source>Info</source>
<target>Info</target>
@@ -170,10 +170,10 @@
<target>Processinformation kan inte inhämtas</target>
<source>Waiting while directory is locked (%x)...</source>
-<target>Väntar medan katalogen låses (%x)...</target>
+<target>Väntar medan mappen låses (%x)...</target>
<source>Cannot set directory lock %x.</source>
-<target>Kan inte låsa katalogen %x.</target>
+<target>Kan inte låsa mappen %x.</target>
<source>
<pluralform>1 sec</pluralform>
@@ -232,23 +232,23 @@
<source>Cannot read the following XML elements:</source>
<target>Kan inte läsa följande XML-element:</target>
-<source>S&ave configuration...</source>
-<target>S&para inställningar...</target>
+<source>&Open...</source>
+<target>&Öppna...</target>
-<source>&Load configuration...</source>
-<target>&Hämta inställningar från fil...</target>
+<source>&Save...</source>
+<target>&Spara...</target>
<source>&Quit</source>
<target>&Avsluta</target>
-<source>&File</source>
-<target>&Arkiv</target>
+<source>&Program</source>
+<target>&Program</target>
<source>&Content</source>
<target>&Innehåll</target>
-<source>&About...</source>
-<target>&Om...</target>
+<source>&About</source>
+<target>&Om</target>
<source>&Help</source>
<target>&Hjälp</target>
@@ -256,8 +256,8 @@
<source>Usage:</source>
<target>Användning:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Välj kataloger att övervaka.</target>
+<source>1. Select folders to watch.</source>
+<target>1. Välj mapp att bevaka.</target>
<source>2. Enter a command line.</source>
<target>2. Mata in ett kommando.</target>
@@ -265,41 +265,50 @@
<source>3. Press 'Start'.</source>
<target>3. Tryck 'Start'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Kommandot verkställes när:
-- alla berörda kataloger blir tillgängliga (t.ex om USB-minne ansluts)
-- filer i berörda kataloger eller underkataloger ändras
-</target>
+<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>Directories to watch</source>
-<target>Kataloger att övervaka</target>
+<source>Folders to watch</source>
+<target>Mappar att bevaka</target>
<source>Add folder</source>
-<target>Lägg till katalog</target>
+<target>Lägg till mapp</target>
<source>Remove folder</source>
-<target>Ta bort katalog</target>
+<target>Ta bort mapp</target>
<source>Select a folder</source>
-<target>Markera en katalog</target>
+<target>Markera en mapp</target>
+
+<source>Delay [seconds]</source>
+<target>Fördröjning [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>Kommandofält</target>
-<source>Minimum Idle Time [seconds]</source>
-<target>Minsta ledig tid [sekunder]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Väntetid mellan upptäckt av senaste ändring och verkställande av kommando, i sekunder</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Kommandot triggas om:
+- filer eller undermappar förändras
+- nya mappar upptäcks (ex. USB-minne ansluts)
+</target>
<source>Start</source>
<target>Start</target>
+<source>&Retry</source>
+<target>&Försök igen</target>
+
+<source>Cancel</source>
+<target>Avbryt</target>
+
<source>(Build: %x)</source>
<target>(Bygge: %x)</target>
@@ -318,8 +327,8 @@ Kommandot verkställes när:
<source>Waiting for missing directories...</source>
<target>Väntar på saknade destinationer...</target>
-<source>A directory input field is empty.</source>
-<target>Ett katalogfält är tomt</target>
+<source>An input folder name is empty.</source>
+<target>Det saknas ett källmappsnamn</target>
<source>Logging</source>
<target>Loggar</target>
@@ -405,8 +414,8 @@ Kommandot verkställes när:
<source><Symlink></source>
<target><Symboliska länkar></target>
-<source><Directory></source>
-<target><Katalog></target>
+<source><Folder></source>
+<target>Mapp</target>
<source>Full path</source>
<target>Fullständig sökväg</target>
@@ -417,8 +426,8 @@ Kommandot verkställes när:
<source>Relative path</source>
<target>Sökväg</target>
-<source>Directory</source>
-<target>Katalog</target>
+<source>Base folder</source>
+<target>Basmapp</target>
<source>Size</source>
<target>Storlek</target>
@@ -429,8 +438,11 @@ Kommandot verkställes när:
<source>Extension</source>
<target>Filformat</target>
-<source>Comparison Result</source>
-<target>Jämförelseresultat</target>
+<source>Action</source>
+<target>Aktivitet</target>
+
+<source>Category</source>
+<target>Kategori</target>
<source>Drag && drop</source>
<target>Dra && släpp</target>
@@ -438,14 +450,14 @@ Kommandot verkställes när:
<source>Close progress dialog</source>
<target>Stäng förloppsindikator</target>
-<source>Shut down</source>
-<target>Stäng av datorn</target>
+<source>Standby</source>
+<target>Strömsparläge</target>
<source>Log off</source>
<target>Logga ut</target>
-<source>Standby</source>
-<target>Strömsparläge</target>
+<source>Shut down</source>
+<target>Stäng av datorn</target>
<source>Hibernate</source>
<target>Viloläge</target>
@@ -453,15 +465,12 @@ Kommandot verkställes när:
<source>1. &Compare</source>
<target>1. &Jämför</target>
-<source>2. &Synchronize...</source>
-<target>2. &Synkronisera...</target>
+<source>2. &Synchronize</source>
+<target>2. &Synkronisera</target>
<source>&New</source>
<target>&Nytt</target>
-<source>&Program</source>
-<target>&Program</target>
-
<source>&Language</source>
<target>&Språk</target>
@@ -489,27 +498,27 @@ Kommandot verkställes när:
<source>&Abort</source>
<target>&Avbryt</target>
-<source>Synchronize...</source>
+<source>Synchronize</source>
<target>Synkronisera</target>
<source>Start synchronization</source>
<target>Starta synkronisering</target>
<source>Add folder pair</source>
-<target>Lägg till katalogpar</target>
+<target>Lägg till mapp-par</target>
<source>Remove folder pair</source>
-<target>Ta bort katalogpar</target>
+<target>Ta bort mapp-par</target>
<source>Swap sides</source>
<target>Byt sida</target>
-<source>Save current configuration to file</source>
-<target>Spara aktuella inställningar till fil</target>
-
<source>Load configuration from file</source>
<target>Hämta inställningar från fil</target>
+<source>Save current configuration to file</source>
+<target>Spara aktuella inställningar till fil</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Senast använda konfigurationer (Tryck DEL för att ta bort)</target>
@@ -519,14 +528,14 @@ Kommandot verkställes när:
<source>Hide filtered or temporarily excluded files</source>
<target>Visa inte filtrerade eller temporärt undantagna filer</target>
-<source>Number of files and directories that will be created</source>
-<target>Antal filer och kataloger som kommer att skapas</target>
+<source>Number of files and folders that will be created</source>
+<target>Antal filer och mappar som kommer att skapas</target>
<source>Number of files that will be overwritten</source>
<target>Antal filer som kommer att skrivas över</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Antal filer och kataloger som kommer att tas bort</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Antal filer och mappar som kommer att tas bort</target>
<source>Total amount of data that will be transferred</source>
<target>Total mängd data som kommer att överföras</target>
@@ -549,8 +558,8 @@ Kommandot verkställes när:
<source>Batch job</source>
<target>Batch-jobb</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Skapa en batch-fil och automatisera synkroniseringen. För att starta i batch-läge dubbelklickar du på den skapade filen, eller kör följande kommando: FreeFileSync.exe SyncJob.ffs_batch. Detta kan också schemaläggas i systemets schemaläggare.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Skapa en batch-fil för att automatisera synkroniseringen. Dubbelklicka på filen, eller använd systemets schemaläggare och schemalägg: FreeFileSync.exe <filnamn>.ffs_batch</target>
<source>Help</source>
<target>Hjälp</target>
@@ -576,21 +585,12 @@ Kommandot verkställes när:
<source>Maximum number of log files:</source>
<target>Max antal loggfiler:</target>
-<source>Select log file directory:</source>
-<target>Välj loggfilskatalog:</target>
+<source>Select folder to save log files:</source>
+<target>Välj mapp, att spara loggfiler i</target>
<source>Batch settings</source>
<target>Batch-inställningar</target>
-<source>&Save</source>
-<target>&Spara</target>
-
-<source>&Load</source>
-<target>&Läs in</target>
-
-<source>Cancel</source>
-<target>Avbryt</target>
-
<source>Select variant:</source>
<target>Välj variant:</target>
@@ -598,10 +598,10 @@ Kommandot verkställes när:
<target>Använd en databas för att identifiera och sprida ändringar på båda sidor. Borttagning, namnbyte och konflikter upptäcks automatiskt</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 katalog. Höger katalog ändras för att exakt matcha vänster efter synkroniseringen.</target>
+<target>Speglar säkerhetskopia av vänster mapp. Höger mapp ändras för att exakt matcha vänster efter synkroniseringen.</target>
<source>Copy new or updated files to right folder.</source>
-<target>Kopiera nya och uppdaterade filer till höger katalog.</target>
+<target>Kopiera nya och uppdaterade filer till höger mapp.</target>
<source>Configure your own synchronization rules.</source>
<target>Konfigurera dina egna synkroniseringsregler.</target>
@@ -615,29 +615,23 @@ Kommandot verkställes när:
<source>Configuration</source>
<target>Inställningar</target>
-<source>Category</source>
-<target>Kategori</target>
+<source>Item exists on left side only</source>
+<target>Objektet finns bara på vänster sida</target>
-<source>Action</source>
-<target>Aktivitet</target>
-
-<source>File/folder exists on left side only</source>
-<target>Fil/katalog finns bara på vänster sida</target>
+<source>Item exists on right side only</source>
+<target>Objektet finns bara på höger sida</target>
-<source>File/folder exists on right side only</source>
-<target>Fil/katalog finns bara på höger sida</target>
+<source>Left side is newer</source>
+<target>Vänster sida är nyare</target>
-<source>Left file is newer</source>
-<target>Vänster fil är nyare</target>
+<source>Right side is newer</source>
+<target>Höger sida är nyare</target>
-<source>Right file is newer</source>
-<target>Höger fil är nyare</target>
+<source>Items have different content</source>
+<target>Objekten har olika innehåll</target>
-<source>Files have different content</source>
-<target>Filerna har olika innehåll</target>
-
-<source>Conflict/file cannot be categorized</source>
-<target>Konflikt/Fil kan inte kategoriseras</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Konflikten/Objektet kan inte kategoriseras</target>
<source>OK</source>
<target>OK</target>
@@ -714,9 +708,6 @@ Filerna betecknas som lika om,
<source>&Ignore</source>
<target>&Ignorera</target>
-<source>&Retry</source>
-<target>&Försök igen</target>
-
<source>Do not show this dialog again</source>
<target>Visa inte den här dialogrutan igen</target>
@@ -744,36 +735,9 @@ Note: File names must be relative to base directories!
</source>
<target>
Endast filer som matchar alla filterinställningar kommer att synkroniseras.
-OBS! Filnamnen måste anges relativt till baskataloger
+OBS! Filnamnen måste anges relativt till basmappar
</target>
-<source>Hints:</source>
-<target>Tips:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Ange fil- eller katalognamn separerade med "," eller ny rad</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Använd jokertecknen '*' och '?' .</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Undanta filer direkt i huvudfönstret, via högerklicksmenyn.</target>
-
-<source>Example</source>
-<target>Exempel</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Inkludera: *.doc;*.zip;*.exe
-Undanta: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Synkronisera alla .doc-, .zip- och .exe-filer, men utelämna allt i underkatalog "temp".</target>
-
<source>Include</source>
<target>Inkludera</target>
@@ -795,8 +759,8 @@ Undanta: \stuff\temp\*
<source>&Default</source>
<target>&Standard</target>
-<source>Transactional file copy</source>
-<target>Transaktionell filkopiering</target>
+<source>Fail-safe file copy</source>
+<target>Felsäker filkopiering</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Skriv först till en temporär fil (*.ffs_tmp) och byt sedan namn på den. Detta garanterar en konsistent status även vid allvarliga fel</target>
@@ -810,8 +774,8 @@ Undanta: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Kopiera filåtkomstbehörigheter</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Överför fil- och katalogrättigheter (Kräver administratörsrättigheter)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Överför behörigheter för filer och mappar (Kräver administratörsrättigheter)</target>
<source>Restore hidden dialogs</source>
<target>Återställ dolda dialoger</target>
@@ -844,7 +808,7 @@ Undanta: \stuff\temp\*
<target>Huvudfält</target>
<source>Folder pairs</source>
-<target>Katalogpar</target>
+<target>Mapp-par</target>
<source>Overview</source>
<target>Översikt</target>
@@ -913,7 +877,7 @@ Undanta: \stuff\temp\*
<target>Inställningar inlästa!</target>
<source>Folder Comparison and Synchronization</source>
-<target>Katalogjämförelse och synkronisering</target>
+<target>Mappjämförelse och synkronisering</target>
<source>Hide files that exist on left side only</source>
<target>Visa inte filer som endast finns till vänster</target>
@@ -1000,7 +964,7 @@ Undanta: \stuff\temp\*
<target>Visa filer som inte kommer att kopieras</target>
<source>All directories in sync!</source>
-<target>Alla kataloger synkade!</target>
+<target>Alla mappar synkroniserade!</target>
<source>Please run a Compare first before synchronizing!</source>
<target>Du måste trycka "Jämför" innan du kan synkronisera.</target>
@@ -1028,8 +992,8 @@ Undanta: \stuff\temp\*
<pluralform>%x directories</pluralform>
</source>
<target>
-<pluralform>1 katalog</pluralform>
-<pluralform>%x kataloger</pluralform>
+<pluralform>1 mapp</pluralform>
+<pluralform>%x mappar</pluralform>
</target>
<source>
@@ -1119,11 +1083,11 @@ Undanta: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Integrera externa program i högerklicksmeny. Följande variabler finns tillgängliga:</target>
-<source>- full file or directory name</source>
-<target>- Full sökväg</target>
+<source>- full file or folder name</source>
+<target>- fullständigt fil- eller mappnamn</target>
-<source>- directory part only</source>
-<target>- Endast fil-/katalognamn</target>
+<source>- folder part only</source>
+<target>- endast mappdelen</target>
<source>- Other side's counterpart to %name</source>
<target>- Andra sidans motsvarighet till %name</target>
@@ -1167,8 +1131,8 @@ Undanta: \stuff\temp\*
<source>Versioning</source>
<target>Versionshantering</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Flytta filer till en tidsstämplad underkatalog</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Flytta filer till en tidsstämplad undermapp</target>
<source>Files</source>
<target>Filer</target>
@@ -1213,7 +1177,7 @@ Undanta: \stuff\temp\*
</target>
<source>Cannot monitor directory %x.</source>
-<target>Katalogen %x kan inte övervakas.</target>
+<target>Mappen %x kan inte övervakas.</target>
<source>Conversion error:</source>
<target>Konversionsfel:</target>
@@ -1228,7 +1192,7 @@ Undanta: \stuff\temp\*
<target>Kan inte flytta filen %x till %y.</target>
<source>Cannot delete directory %x.</source>
-<target>Kan inte ta bort katalogen %x.</target>
+<target>Kan inte ta bort mappen %x.</target>
<source>Cannot write modification time of %x.</source>
<target>Kan inte ändra tidsangivelsen för %x.</target>
@@ -1249,7 +1213,7 @@ Undanta: \stuff\temp\*
<target>Kan inte skriva behörigheter för %x.</target>
<source>Cannot create directory %x.</source>
-<target>Kan inte skapa katalogen %x.</target>
+<target>Kan inte skapa mappen %x.</target>
<source>Cannot copy symbolic link %x to %y.</source>
<target>Kan inte kopiera den symboliska länken %x till %y.</target>
@@ -1261,10 +1225,10 @@ Undanta: \stuff\temp\*
<target>Kan inte kopiera filen %x till %y.</target>
<source>Cannot read directory %x.</source>
-<target>Kan inte läsa in katalogen %x.</target>
+<target>Kan inte läsa in mappen %x.</target>
-<source>Endless loop.</source>
-<target>Oändlig loop.</target>
+<source>Detected endless directory recursion.</source>
+<target>Upptäckte ändlös mapprekursion</target>
<source>Cannot set privilege %x.</source>
<target>Kan inte att ange behörigheten %x.</target>
@@ -1273,10 +1237,10 @@ Undanta: \stuff\temp\*
<target>Kan inte flytta %x till Papperskorgen</target>
<source>Both sides have changed since last synchronization!</source>
-<target>Båda sidor har ändrats sedan senaste synkroniseringen!</target>
+<target>Bägge sidor har ändrats sedan senaste synkroniseringen!</target>
<source>Cannot determine sync-direction:</source>
-<target>Kan inte bestämma synk-riktning:</target>
+<target>Kan inte bestämma synkroniseringsriktning:</target>
<source>No change since last synchronization!</source>
<target>Inga ändringar sedan senaste synkronisering!</target>
@@ -1290,17 +1254,14 @@ Undanta: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Standardsynkronisering: Gamla filer kommer att skrivas över av nyare versioner.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Filen är ingen giltig konfigureringsfil:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Du kan bortse från det här felet och utgå ifrån att katalogen är tom</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Du kan ignorera detta fel och betrakta mappen som tom</target>
-<source>Cannot find directory %x.</source>
-<target>Kan inte hitta katalogen %x.</target>
+<source>Cannot find folder %x.</source>
+<target>Kan inte hitta mappen %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
-<target>Kataloger är beroende! Var försiktig när du sätter upp synkroniseringsregler:</target>
+<target>Mappar är beroende! Var försiktig när du sätter upp synkroniseringsregler:</target>
<source>Preparing synchronization...</source>
<target>Förbereder synkronisering...</target>
@@ -1329,20 +1290,20 @@ Undanta: \stuff\temp\*
<source>Both sides are equal</source>
<target>Bägge sidor är lika</target>
-<source>Files/folders differ in attributes only</source>
-<target>Endast attributskillnader i filer/kataloger</target>
+<source>Items have different attributes</source>
+<target>Objekten har olika attribut</target>
-<source>Copy new file/folder to left</source>
-<target>Kopiera ny fil/katalog åt vänster</target>
+<source>Copy new item to left</source>
+<target>Kopiera nytt objekt åt vänster</target>
-<source>Copy new file/folder to right</source>
-<target>Kopiera ny fil/katalog åt höger</target>
+<source>Copy new item to right</source>
+<target>Kopiera nytt objekt åt höger</target>
-<source>Delete left file/folder</source>
-<target>Ta bort vänster fil/katalog</target>
+<source>Delete left item</source>
+<target>Ta bort vänster objekt</target>
-<source>Delete right file/folder</source>
-<target>Ta bort höger fil/katalog</target>
+<source>Delete right item</source>
+<target>Ta bort höger objekt</target>
<source>Move file on left</source>
<target>Flytta fil på vänster sida</target>
@@ -1350,29 +1311,29 @@ Undanta: \stuff\temp\*
<source>Move file on right</source>
<target>Flytta fil på höger sida</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Skriv över vänster fil/katalog med den högra</target>
+<source>Overwrite left item</source>
+<target>Skriv över vänster objekt</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Skriv över höger fil/katalog med den vänstra</target>
+<source>Overwrite right item</source>
+<target>Skriv över höger objekt</target>
<source>Do nothing</source>
<target>Gör ingenting</target>
-<source>Copy file attributes only to left</source>
-<target>Kopiera endast filattribut åt vänster</target>
+<source>Update attributes on left</source>
+<target>Uppdatera attribut på vänster sida</target>
-<source>Copy file attributes only to right</source>
-<target>Kopiera endast filattribut åt höger</target>
+<source>Update attributes on right</source>
+<target>Uppdatera attribut på höger sida</target>
<source>Multiple...</source>
-<target>Multipla...</target>
+<target>Flera...</target>
<source>Deleting file %x</source>
<target>Tar bort filen %x</target>
<source>Deleting folder %x</source>
-<target>Tar bort katalogen %x</target>
+<target>Tar bort mappen %x</target>
<source>Deleting symbolic link %x</source>
<target>Tar bort den symboliska länken %x</target>
@@ -1381,7 +1342,7 @@ Undanta: \stuff\temp\*
<target>Flyttar filen %x till papperskorgen</target>
<source>Moving folder %x to recycle bin</source>
-<target>Flyttar katalogen %x till papperskorgen</target>
+<target>Flyttar mappen %x till papperskorgen</target>
<source>Moving symbolic link %x to recycle bin</source>
<target>Flyttar den symboliska länken %x till papperskorgen</target>
@@ -1390,7 +1351,7 @@ Undanta: \stuff\temp\*
<target>Flyttar filen %x till %y</target>
<source>Moving folder %x to %y</source>
-<target>Flyttar katalogen %x till %y</target>
+<target>Flyttar mappen %x till %y</target>
<source>Moving symbolic link %x to %y</source>
<target>Flyttar den symboliska länken %x till %y</target>
@@ -1402,7 +1363,7 @@ Undanta: \stuff\temp\*
<target>Skapar den symboliska länken %x</target>
<source>Creating folder %x</source>
-<target>Skapar katalog %x</target>
+<target>Skapar mappen %x</target>
<source>Overwriting file %x</source>
<target>Skriver över filen %x</target>
@@ -1416,14 +1377,14 @@ Undanta: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Uppdaterar attribut för %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Målkatalogens namn måste anges</target>
+<source>Target folder name must not be empty.</source>
+<target>Målmappens namn saknas.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Katalog för versionshantering har inte specificerats</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Mappnamn för versionshantering saknas.</target>
<source>Source directory %x not found.</source>
-<target>Källkatalogen %x hittas inte</target>
+<target>Källmappen %x hittas inte</target>
<source>Unresolved conflicts existing!</source>
<target>Obehandlad konflikt upptäckt!</target>
@@ -1449,11 +1410,11 @@ Undanta: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Papperskorgen är inte tillgänglig för följande sökvägar! Filerna tas i stället bort permanent.</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>En katalog som är en del av flera katalogpar kommer att ändras! Kontrollera synkroniseringsinställningarna</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>En mapp som tillhör flera mapp-par är på väg att ändras. Kontrollera synkroniseringsinställningarna</target>
<source>Processing folder pair:</source>
-<target>Processar katalogpar:</target>
+<target>Bearbetar mapp-paret:</target>
<source>Generating database...</source>
<target>Skapar databas...</target>
diff --git a/BUILD/Languages/turkish.lng b/BUILD/Languages/turkish.lng
index 5a440333..8a654cae 100644
--- a/BUILD/Languages/turkish.lng
+++ b/BUILD/Languages/turkish.lng
@@ -7,8 +7,8 @@
<plural definition>n == 1 ? 0 : 1</plural definition>
</header>
-<source>Searching for directory %x...</source>
-<target>%x klasörü aranıyor...</target>
+<source>Searching for folder %x...</source>
+<target>%s klasörü aranıyor...</target>
<source>Show in Explorer</source>
<target>Tarayıcıda Göster</target>
@@ -25,18 +25,21 @@
<source>RealtimeSync - Automated Synchronization</source>
<target>RealtimeSync - Kendiliğinden Eşleştirme</target>
+<source>Error</source>
+<target>Hata</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>No filter selected</source>
-<target>Seçilmiş süzgeç yok</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ı sil</target>
@@ -55,9 +58,6 @@
<source>About</source>
<target>Hakkında</target>
-<source>Error</source>
-<target>Hata</target>
-
<source>Warning</source>
<target>Uyarı</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Genel ayarlar</target>
-<source>Synchronization Preview</source>
-<target>Eşleştirme önizlemesi</target>
+<source>Summary</source>
+<target>Özet</target>
<source>Find</source>
<target>Bul</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Gözat</target>
-<source>Invalid command line: %x</source>
-<target>Geçersiz komut satırı: %x</target>
+<source>Invalid command line:</source>
+<target>Geçersiz komut satırı:</target>
<source>Info</source>
<target>Bilgi</target>
@@ -226,29 +226,29 @@
<source>Volume name %x not part of file name %y!</source>
<target>%x birim adı, %y dosya adının parçası değil!</target>
-<source>Cannot find file %x.</source>
-<target>%x dosyası bulunamadı.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Şu XML elemanları okunamadı:</target>
-<source>S&ave configuration...</source>
-<target>Y&apılandırmayı kaydet...</target>
+<source>Cannot find file %x.</source>
+<target>%x dosyası bulunamadı.</target>
-<source>&Load configuration...</source>
-<target>Yapılandırmayı a&l...</target>
+<source>&Open...</source>
+<target>&Aç...</target>
+
+<source>&Save...</source>
+<target>&Kaydet</target>
<source>&Quit</source>
<target>Çı&k</target>
-<source>&File</source>
-<target>&Dosya</target>
+<source>&Program</source>
+<target>&Program</target>
<source>&Content</source>
<target>İçe&rik</target>
-<source>&About...</source>
-<target>H&akkında...</target>
+<source>&About</source>
+<target>H&akkında</target>
<source>&Help</source>
<target>&Yardım</target>
@@ -256,8 +256,8 @@
<source>Usage:</source>
<target>Kullanım:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. İzlenecek klasörleri seçin.</target>
+<source>1. Select folders to watch.</source>
+<target>1. İzlenecek klasörleri seçin</target>
<source>2. Enter a command line.</source>
<target>2. Bir komut satırı yazın.</target>
@@ -265,18 +265,10 @@
<source>3. Press 'Start'.</source>
<target>3. 'Başlat'a Tıklayın.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Her seferinde çalıştırılacak komut satırı:
-- tüm klasörler geçerli (örneğin USB bellek takıldığında)
-- bu klasörlerin ya da alt klasörlerin içindeki dosyalar değiştirildiğinde
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>.ffs_batch dosyasını yükleyerek başlayabilirsiniz.</target>
-<source>Directories to watch</source>
+<source>Folders to watch</source>
<target>İzlenecek klasörler</target>
<source>Add folder</source>
@@ -288,18 +280,35 @@ Her seferinde çalıştırılacak komut satırı:
<source>Select a folder</source>
<target>Bir klasör seçin</target>
+<source>Delay [seconds]</source>
+<target>Gecikme [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ındaki bekleme süresi</target>
+
<source>Command line</source>
<target>Komut satırı</target>
-<source>Minimum Idle Time [seconds]</source>
-<target>En az boşta bekleme süresi [saniye]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Son değişikliğin algılanması ile komut satırının yürütülmesi arasındaki bekleme süresi</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Komut şu durumlarda yürütülür:
+- dosya ya alt klasörler değiştiğinde
+- yeni klasörler algılandığında (örneğin bir USB bellek takıldığında)
+</target>
<source>Start</source>
<target>Başla</target>
+<source>&Retry</source>
+<target>&Yeniden dene</target>
+
+<source>Cancel</source>
+<target>İptal</target>
+
<source>(Build: %x)</source>
<target>(Yapım: %x)</target>
@@ -318,8 +327,8 @@ Her seferinde çalıştırılacak komut satırı:
<source>Waiting for missing directories...</source>
<target>Kayıp klasörler için bekleniyor...</target>
-<source>A directory input field is empty.</source>
-<target>Bir klasör giriş alanı boş</target>
+<source>An input folder name is empty.</source>
+<target>Bir giriş klasörü adı eksik.</target>
<source>Logging</source>
<target>Günlükleme</target>
@@ -405,7 +414,7 @@ Her seferinde çalıştırılacak komut satırı:
<source><Symlink></source>
<target><Smblkbağlantı></target>
-<source><Directory></source>
+<source><Folder></source>
<target><Klasör></target>
<source>Full path</source>
@@ -417,8 +426,8 @@ Her seferinde çalıştırılacak komut satırı:
<source>Relative path</source>
<target>Bağıl klasör yolu</target>
-<source>Directory</source>
-<target>Klasör</target>
+<source>Base folder</source>
+<target>Başlangıç klasörü</target>
<source>Size</source>
<target>Boyut</target>
@@ -429,8 +438,11 @@ Her seferinde çalıştırılacak komut satırı:
<source>Extension</source>
<target>Uzantı</target>
-<source>Comparison Result</source>
-<target>Karşılaştırma sonucu</target>
+<source>Action</source>
+<target>İşlem</target>
+
+<source>Category</source>
+<target>Kategori</target>
<source>Drag && drop</source>
<target>Klasör ya da dosyaları buraya sürükleyip bırakabilirsiniz</target>
@@ -438,14 +450,14 @@ Her seferinde çalıştırılacak komut satırı:
<source>Close progress dialog</source>
<target>İşlem penceresini kapat</target>
-<source>Shut down</source>
-<target>Bilgisayarı kapat</target>
+<source>Standby</source>
+<target>Uykuya dal</target>
<source>Log off</source>
<target>Oturumu kapat</target>
-<source>Standby</source>
-<target>Uykuya dal</target>
+<source>Shut down</source>
+<target>Bilgisayarı kapat</target>
<source>Hibernate</source>
<target>Hazırda beklet</target>
@@ -453,15 +465,12 @@ Her seferinde çalıştırılacak komut satırı:
<source>1. &Compare</source>
<target>1. &Karşılaştır</target>
-<source>2. &Synchronize...</source>
-<target>2. &Eşleştir...</target>
+<source>2. &Synchronize</source>
+<target>2. &Eşleştir</target>
<source>&New</source>
<target>Ye&ni</target>
-<source>&Program</source>
-<target>&Program</target>
-
<source>&Language</source>
<target>Di&l</target>
@@ -489,8 +498,8 @@ Her seferinde çalıştırılacak komut satırı:
<source>&Abort</source>
<target>V&azgeç</target>
-<source>Synchronize...</source>
-<target>Eşleştir...</target>
+<source>Synchronize</source>
+<target>Eşleştir</target>
<source>Start synchronization</source>
<target>Eşleştirmeyi başlat</target>
@@ -504,12 +513,12 @@ Her seferinde çalıştırılacak komut satırı:
<source>Swap sides</source>
<target>Sağ ve sol yanı değiştir</target>
-<source>Save current configuration to file</source>
-<target>Geçerli yapılandırmayı dosyaya kaydeder</target>
-
<source>Load configuration from file</source>
<target>Yapılandırma dosyasından ayarları alır</target>
+<source>Save current configuration to file</source>
+<target>Geçerli yapılandırmayı dosyaya kaydeder</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>Son kullanılan yapılandırmalar (listeden silmek için DEL tuşuna basın)</target>
@@ -519,13 +528,13 @@ Her seferinde çalıştırılacak komut satırı:
<source>Hide filtered or temporarily excluded files</source>
<target>Süzülmüş ya da geçici olarak dışlanmış dosyaları gizler</target>
-<source>Number of files and directories that will be created</source>
+<source>Number of files and folders that will be created</source>
<target>Oluşturulacak dosya ve klasör sayısı</target>
<source>Number of files that will be overwritten</source>
<target>Üzerine yazılacak dosya sayısı</target>
-<source>Number of files and directories that will be deleted</source>
+<source>Number of files and folders that will be deleted</source>
<target>Silinecek dosya ve klasör sayısı</target>
<source>Total amount of data that will be transferred</source>
@@ -549,8 +558,8 @@ Her seferinde çalıştırılacak komut satırı:
<source>Batch job</source>
<target>Toplu iş</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Bir yığın dosyası oluşturarak eşleştirmeyi otomatikleştirir. Yığın kipini başlatmak için oluşturulan dosya üzerinde çift tıklamak ya da şu komutu çalıştırmak yeterlidir: FreeFileSync.exe Eşleştirmeİşi.ffs_batch. Bu işlem aynı şekilde sisteminizin zamanlanmış görev çalıştırıcısına eklenebilir.</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Eşleştirmeyi otomatikleştirmek için bir komut yığın dosyası oluşturun. Bu dosyaya çift tıklayarak ya da sisteminizdeki görev zamanlayıcıya: FreeFileSync.exe <görev adı>.ffs_batch şeklinde yazarak ekleyin</target>
<source>Help</source>
<target>Yardım</target>
@@ -576,21 +585,12 @@ Her seferinde çalıştırılacak komut satırı:
<source>Maximum number of log files:</source>
<target>Tutulacak en fazla günlük dosyası sayısı:</target>
-<source>Select log file directory:</source>
-<target>Kayıt dosyası klasörü:</target>
+<source>Select folder to save log files:</source>
+<target>Günlük dosyalarının kaydedileceği klasörü seçin:</target>
<source>Batch settings</source>
<target>İş ayarları</target>
-<source>&Save</source>
-<target>&Kaydet</target>
-
-<source>&Load</source>
-<target>Yük&le</target>
-
-<source>Cancel</source>
-<target>İptal</target>
-
<source>Select variant:</source>
<target>Davranışı seçin:</target>
@@ -615,29 +615,23 @@ Her seferinde çalıştırılacak komut satırı:
<source>Configuration</source>
<target>Yapılandırma</target>
-<source>Category</source>
-<target>Kategori</target>
-
-<source>Action</source>
-<target>İşlem</target>
-
-<source>File/folder exists on left side only</source>
-<target>Dosya/Klasör yalnız sol tarafta var</target>
+<source>Item exists on left side only</source>
+<target>Yalnız sol yanda bulunan ögeler</target>
-<source>File/folder exists on right side only</source>
-<target>Dosya/Klasör yalnız sağ tarafta var</target>
+<source>Item exists on right side only</source>
+<target>Yalnız sağ yanda bulunan ögeler</target>
-<source>Left file is newer</source>
-<target>Soldaki dosya daha yeni</target>
+<source>Left side is newer</source>
+<target>Sol yan daha yeni</target>
-<source>Right file is newer</source>
-<target>Sağdaki dosya daha yeni</target>
+<source>Right side is newer</source>
+<target>Sağ yan daha yeni</target>
-<source>Files have different content</source>
-<target>Farklı içeriğe sahip dosyalar</target>
+<source>Items have different content</source>
+<target>Ögelerin içeriği farklı</target>
-<source>Conflict/file cannot be categorized</source>
-<target>Çatışma/dosya kategorize edilemedi</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Uyuşmazlık/öge kategorize edilemiyor</target>
<source>OK</source>
<target>Tamam</target>
@@ -714,9 +708,6 @@ aynı olmalıdır
<source>&Ignore</source>
<target>&Yoksay</target>
-<source>&Retry</source>
-<target>&Yeniden dene</target>
-
<source>Do not show this dialog again</source>
<target>Bu iletiyi yeniden gösterme</target>
@@ -747,33 +738,6 @@ Yalnız tüm süzgeç ayarlarına uyan dosyalar eşleştirilecek.
Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
</target>
-<source>Hints:</source>
-<target>İpuçları:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Bağıl dosya ya da klasör adlarını ';' ile ayırarak ya da ayrı satırlar şeklinde yazın.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. '*' ve '?' jokerleri kullanılabilsin.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Ana listedeki dosyaları sağ fare tuşu menüsüyle doğrudan dışla.</target>
-
-<source>Example</source>
-<target>Örnek</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Kat: *.doc;*.zip;*.exe
-Katma: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>"temp" alt klasöründeki herşey hariç, tüm .doc, .zip ve .exe dosyalarını eşleştir.</target>
-
<source>Include</source>
<target>Katılacaklar:</target>
@@ -795,8 +759,8 @@ Katma: \stuff\temp\*
<source>&Default</source>
<target>&Varsayılan</target>
-<source>Transactional file copy</source>
-<target>Aşamalı kopyalama kullan</target>
+<source>Fail-safe file copy</source>
+<target>Hatasız dosya kopyalama</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Kopyalama önce geçici bir dosyaya (*.ffs_tmp) yapılır. Sonra dosya yeniden adlandırılır. Böylece hatalara karşı daha sağlıklı bir durum sağlanır</target>
@@ -810,8 +774,8 @@ Katma: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Dosya erişim izinlerini kopyala</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Dosya ve klasör izinlerini de aktarır (Yönetici izinlerine gerek duyar)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Dosya ve klasör izinlerini de kopyala (Yönetici haklarına gerek duyar)</target>
<source>Restore hidden dialogs</source>
<target>Gizli iletileri göster</target>
@@ -1119,11 +1083,11 @@ Katma: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Dış uygulamaları sağ tuş menüsüne ekler. Şu makrolar kullanılabilir:</target>
-<source>- full file or directory name</source>
+<source>- full file or folder name</source>
<target>- tam dosya ya da klasör adı</target>
-<source>- directory part only</source>
-<target>- Yalnız klasör kısmı</target>
+<source>- folder part only</source>
+<target>- yalnız klasör bölümü</target>
<source>- Other side's counterpart to %name</source>
<target>- %name diğer taraftaki karşılığı</target>
@@ -1167,8 +1131,8 @@ Katma: \stuff\temp\*
<source>Versioning</source>
<target>Eski sürüm olarak sakla</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Dosyaları zaman damgasıyla bir alt klasöre taşır</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Dosyaları zaman damgalı bir alt klasöre taşı</target>
<source>Files</source>
<target>Dosyalar</target>
@@ -1263,8 +1227,8 @@ Katma: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>%x klasörü okunamadı.</target>
-<source>Endless loop.</source>
-<target>Sonsuz çevrim.</target>
+<source>Detected endless directory recursion.</source>
+<target>Sonsuz klasör kısayol döngüsü algılandı.</target>
<source>Cannot set privilege %x.</source>
<target>%x izni verilemedi.</target>
@@ -1290,14 +1254,11 @@ Katma: \stuff\temp\*
<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
<target>Varsayılan eşleştirme yönleri ayarlanıyor: Yeni dosyalar eski dosyaların üzerine yazılacak.</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Dosya geçerli bir yapılandırma içermiyor:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Bu hatayı, klasörü boş sayacak şekilde yok sayabilirsiniz.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Klasörün boş olarak kabul edilmesi için bu hatayı yok sayanbilirsiniz.</target>
-<source>Cannot find directory %x.</source>
-<target>%x klasörü bulunamadı.</target>
+<source>Cannot find folder %x.</source>
+<target>%x klasörü bulunamıyor.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>Klasörler bağımlı! Eşleştirme kurallarını koyarken dikkatli olun:</target>
@@ -1329,20 +1290,20 @@ Katma: \stuff\temp\*
<source>Both sides are equal</source>
<target>İki tarafta aynı</target>
-<source>Files/folders differ in attributes only</source>
-<target>Yalnız dosya/klasör öznitelikleri farklı olanlar</target>
+<source>Items have different attributes</source>
+<target>Ögeler farklı özniteliklere sahip</target>
-<source>Copy new file/folder to left</source>
-<target>Yeni dosya/klasörleri sola kopyala</target>
+<source>Copy new item to left</source>
+<target>Yeni ögeyi sola kopyala</target>
-<source>Copy new file/folder to right</source>
-<target>Yeni dosya/klasörleri sağa kopyala</target>
+<source>Copy new item to right</source>
+<target>Yeni ögeyi sağa kopyala</target>
-<source>Delete left file/folder</source>
-<target>Soldaki dosya/klasörleri sil</target>
+<source>Delete left item</source>
+<target>Soldaki ögeyi sil</target>
-<source>Delete right file/folder</source>
-<target>Sağdaki dosya/klasörleri sil</target>
+<source>Delete right item</source>
+<target>Sağdaki ögeyi sil</target>
<source>Move file on left</source>
<target>Soldaki dosyayı taşı</target>
@@ -1350,20 +1311,20 @@ Katma: \stuff\temp\*
<source>Move file on right</source>
<target>Sağdaki dosyayı taşı</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Soldaki dosya/klasörlerin üzerine sağdakileri yaz</target>
+<source>Overwrite left item</source>
+<target>Soldaki ögenin üzerine yaz</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Sağdaki dosya/klasörlerin üzerine soldakileri yaz</target>
+<source>Overwrite right item</source>
+<target>Sağdaki ögenin üzerine yaz</target>
<source>Do nothing</source>
<target>Hiçbir şey yapma</target>
-<source>Copy file attributes only to left</source>
-<target>Dosya özniteliklerini yalnız sola kopyalaya</target>
+<source>Update attributes on left</source>
+<target>Soldaki öznitelikleri güncelle</target>
-<source>Copy file attributes only to right</source>
-<target>Dosya özniteliklerini yalnız sağa kopyalaya</target>
+<source>Update attributes on right</source>
+<target>Sağdaki öznitelikleri güncelle</target>
<source>Multiple...</source>
<target>Çoklu...</target>
@@ -1416,11 +1377,11 @@ Katma: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>%x öznitelikleri güncelleniyor</target>
-<source>Target directory name must not be empty!</source>
-<target>Hedef klasör adı boş olamaz!</target>
+<source>Target folder name must not be empty.</source>
+<target>Hedef klasör adı boş olamaz.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Dosya sürümlemesi için klasör desteklenmiyor!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Dosya sürümlemesi için klasör adı boş olamaz.</target>
<source>Source directory %x not found.</source>
<target>%x kaynak klasörü bulunamadı.</target>
@@ -1449,8 +1410,8 @@ Katma: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Şu yollar için geri dönüşüm kutusu kullanılamaz! Dosyalar anında ve tamamen silinir:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Bir klasör, çoklu klasör çiftlerinin bir parçası olduğundan değiştirilecek! Lütfen eşleştirme ayarlarınızı gözden geçirin!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Çoklu klasör çiftlerinin parçası olan bir klasör değiştirilecek. Lütfen eşleştirme ayarlarını gözden geçirin.</target>
<source>Processing folder pair:</source>
<target>İşlenen klasör çifti:</target>
diff --git a/BUILD/Languages/ukrainian.lng b/BUILD/Languages/ukrainian.lng
index 5eadfddd..b7f89539 100644
--- a/BUILD/Languages/ukrainian.lng
+++ b/BUILD/Languages/ukrainian.lng
@@ -7,7 +7,7 @@
<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>Searching for directory %x...</source>
+<source>Searching for folder %x...</source>
<target>Пошук каталогу %x...</target>
<source>Show in Explorer</source>
@@ -34,12 +34,12 @@
<source>Select alternate synchronization settings</source>
<target>Вибрати альтернативні налаштування синхронізації</target>
-<source>No filter selected</source>
-<target>Не вибрано жодного фільтра</target>
-
<source>Filter is active</source>
<target>Фільтр активний</target>
+<source>No filter selected</source>
+<target>Не вибрано жодного фільтра</target>
+
<source>Remove alternate settings</source>
<target>Вилучити альтернативні налаштування</target>
@@ -73,8 +73,8 @@
<source>Global settings</source>
<target>Глобальні налаштування</target>
-<source>Synchronization Preview</source>
-<target>Попередній огляд синхронізації</target>
+<source>Summary</source>
+<target>Підсумок</target>
<source>Find</source>
<target>Знайти</target>
@@ -103,8 +103,8 @@
<source>Browse</source>
<target>Переглянути</target>
-<source>Invalid command line: %x</source>
-<target>Неправильний командний рядок: %x</target>
+<source>Invalid command line:</source>
+<target>Неправильний командний рядок:</target>
<source>Info</source>
<target>Інформація</target>
@@ -229,38 +229,38 @@
<source>Volume name %x not part of file name %y!</source>
<target>Ім’я тому %x не є частиною імені файлу %y!</target>
-<source>Cannot find file %x.</source>
-<target>Не вдається знайти файлу %x.</target>
-
<source>Cannot read the following XML elements:</source>
<target>Не вдається прочитати такі елементи XML:</target>
-<source>S&ave configuration...</source>
-<target>Зберегти налаштування...</target>
+<source>Cannot find file %x.</source>
+<target>Не вдається знайти файлу %x.</target>
+
+<source>&Open...</source>
+<target>Відкрити...</target>
-<source>&Load configuration...</source>
-<target>&Завантажити налаштування...</target>
+<source>&Save...</source>
+<target>Зберегти...</target>
<source>&Quit</source>
-<target>&Вихід</target>
+<target>Вихід</target>
-<source>&File</source>
-<target>&Файл</target>
+<source>&Program</source>
+<target>Програма</target>
<source>&Content</source>
-<target>&Зміст</target>
+<target>Зміст</target>
-<source>&About...</source>
-<target>&Про програму...</target>
+<source>&About</source>
+<target>Про програму</target>
<source>&Help</source>
-<target>&Допомога</target>
+<target>Допомога</target>
<source>Usage:</source>
<target>Використання:</target>
-<source>1. Select directories to monitor.</source>
-<target>1. Виберіть каталоги для моніторингу;</target>
+<source>1. Select folders to watch.</source>
+<target>1. Виберіть папки для моніторингу;</target>
<source>2. Enter a command line.</source>
<target>2. Уведіть рядок команди;</target>
@@ -268,19 +268,11 @@
<source>3. Press 'Start'.</source>
<target>3. Натисніть 'Старт'.</target>
-<source>
-The command line is executed each time:
-- all directories become available (e.g. USB stick insert)
-- files within these directories or subdirectories are modified
-</source>
-<target>
-Командний рядок виконується щоразу, коли:
-- всі каталоги стають доступні (наприклад, під’єднання переносного носія)
-- файли в каталогах чи підкаталогах змінені
-</target>
+<source>To get started just import a .ffs_batch file.</source>
+<target>Щоб розпочати імпортуйте .ffs_batch файл.</target>
-<source>Directories to watch</source>
-<target>Каталоги для спостереження</target>
+<source>Folders to watch</source>
+<target>Папки для спостереження</target>
<source>Add folder</source>
<target>Додати папку</target>
@@ -291,14 +283,25 @@ The command line is executed each time:
<source>Select a folder</source>
<target>Вибрати папку</target>
+<source>Delay [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>Minimum Idle Time [seconds]</source>
-<target>Мінімальний час простою [секунд]</target>
-
-<source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Час простою між виявленням останньої зміни та виконанням командного рядка в секундах</target>
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Команда спрацьовує, якщо:
+- змінилися файли або вкладені папки
+- появилися нові папки (наприклад, підключена USB-пам'ять)
+</target>
<source>Start</source>
<target>Старт</target>
@@ -327,8 +330,8 @@ The command line is executed each time:
<source>Waiting for missing directories...</source>
<target>Очікування пропущених каталогів...</target>
-<source>A directory input field is empty.</source>
-<target>Поле введення шляху каталога порожнє.</target>
+<source>An input folder name is empty.</source>
+<target>Назва вхідної папки порожня.</target>
<source>Logging</source>
<target>Лог-файли</target>
@@ -399,12 +402,12 @@ The command line is executed each time:
<source>Download now?</source>
<target>Завантажити зараз?</target>
-<source>Information</source>
-<target>Інформація</target>
-
<source>FreeFileSync is up to date!</source>
<target>У Вас найновіша версія FreeFileSync!</target>
+<source>Information</source>
+<target>Інформація</target>
+
<source>Do you want FreeFileSync to automatically check for updates every week?</source>
<target>Ви хочете, щоб FreeFileSync автоматично перевіряв наявність оновлень щотижня?</target>
@@ -414,8 +417,8 @@ The command line is executed each time:
<source><Symlink></source>
<target><Символьне посилання></target>
-<source><Directory></source>
-<target><Каталог></target>
+<source><Folder></source>
+<target><Папка></target>
<source>Full path</source>
<target>Повний шлях</target>
@@ -426,8 +429,8 @@ The command line is executed each time:
<source>Relative path</source>
<target>Відносний шлях</target>
-<source>Directory</source>
-<target>Каталог</target>
+<source>Base folder</source>
+<target>Базова папка</target>
<source>Size</source>
<target>Розмір</target>
@@ -438,8 +441,11 @@ The command line is executed each time:
<source>Extension</source>
<target>Розширення</target>
-<source>Comparison Result</source>
-<target>Результати порівнювання</target>
+<source>Action</source>
+<target>Дія</target>
+
+<source>Category</source>
+<target>Категорія</target>
<source>Drag && drop</source>
<target>Drag && drop</target>
@@ -447,14 +453,14 @@ The command line is executed each time:
<source>Close progress dialog</source>
<target>Закрити вікно прогресу</target>
-<source>Shut down</source>
-<target>Вимкнути комп'ютер</target>
+<source>Standby</source>
+<target>Сплячий режим</target>
<source>Log off</source>
<target>Вилогувати</target>
-<source>Standby</source>
-<target>Сплячий режим</target>
+<source>Shut down</source>
+<target>Вимкнути комп'ютер</target>
<source>Hibernate</source>
<target>Гібернація</target>
@@ -462,15 +468,12 @@ The command line is executed each time:
<source>1. &Compare</source>
<target>1. &Порівняти</target>
-<source>2. &Synchronize...</source>
+<source>2. &Synchronize</source>
<target>2. &Синхронізувати</target>
<source>&New</source>
<target>&Нова</target>
-<source>&Program</source>
-<target>&Програма</target>
-
<source>&Language</source>
<target>&Мова</target>
@@ -498,7 +501,7 @@ The command line is executed each time:
<source>&Abort</source>
<target>&Припинити</target>
-<source>Synchronize...</source>
+<source>Synchronize</source>
<target>Синхронізувати</target>
<source>Start synchronization</source>
@@ -513,12 +516,12 @@ The command line is executed each time:
<source>Swap sides</source>
<target>Поміняти місцями</target>
-<source>Save current configuration to file</source>
-<target>Зберегти активні налаштування в файлі</target>
-
<source>Load configuration from file</source>
<target>Завантажити налаштування синхронізації з файлу</target>
+<source>Save current configuration to file</source>
+<target>Зберегти активні налаштування в файлі</target>
+
<source>Last used configurations (press DEL to remove from list)</source>
<target>
Останні використовувані налаштування синхронізації
@@ -531,21 +534,18 @@ The command line is executed each time:
<source>Hide filtered or temporarily excluded files</source>
<target>Приховати відфільтровані чи тимчасово виключені файли</target>
-<source>Number of files and directories that will be created</source>
-<target>Число файлів і каталогів, які будуть створені</target>
+<source>Number of files and folders that will be created</source>
+<target>Кількість файлів і папок, які будуть створені</target>
<source>Number of files that will be overwritten</source>
-<target>Число файлів, які будуть перезаписані</target>
+<target>Кількість файлів, які будуть перезаписані</target>
-<source>Number of files and directories that will be deleted</source>
-<target>Число файлів і каталогів, які будуть вилучені</target>
+<source>Number of files and folders that will be deleted</source>
+<target>Кількість файлів і папок, які будуть вилучені</target>
<source>Total amount of data that will be transferred</source>
<target>Загальний об’єм даних, які будуть передаватися</target>
-<source>Operation:</source>
-<target>Операція:</target>
-
<source>Items found:</source>
<target>Елементів знайдено:</target>
@@ -561,8 +561,8 @@ The command line is executed each time:
<source>Batch job</source>
<target>Пакетне завдання</target>
-<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Створити комакндний файл і автоматизувати синхронізацію. Для виконання пакетної синхронізації просто двічі клацніть файл мишкою або скористайтесь командним рядком: FreeFileSync.exe <ffs_batch file>. Можна також використати планувальник завдань операційної системи</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Для автоматизації синхронізації створіть пакетний файл. Двічі клацніть цей файл чи впишіть до системного планувальника завдань: FreeFileSync.exe <назва завдання>.ffs_batch</target>
<source>Help</source>
<target>Допомога</target>
@@ -588,18 +588,12 @@ The command line is executed each time:
<source>Maximum number of log files:</source>
<target>Максимальна кількість лог-файлів:</target>
-<source>Select log file directory:</source>
-<target>Виберіть каталог для лог-файлів:</target>
+<source>Select folder to save log files:</source>
+<target>Вибрати папку для лог-файлу</target>
<source>Batch settings</source>
<target>Налаштування пакетного завдання</target>
-<source>&Save</source>
-<target>&Зберегти</target>
-
-<source>&Load</source>
-<target>&Завантажити</target>
-
<source>Select variant:</source>
<target>Виберіть варіант:</target>
@@ -607,7 +601,7 @@ The command line is executed each time:
<target>Виявити та поширити зміни на обидві сторони використовуючи базу даних. Видалення, перейменування та конфлікти визначаються автоматично.</target>
<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Дзеркальна (резервна) копія лівої частини. В результаті синхронізації права папка змінюється до полної відповідності лівій.</target>
+<target>Дзеркальна (резервна) копія лівої частини. В результаті синхронізації права папка змінюється до повної відповідності лівій.</target>
<source>Copy new or updated files to right folder.</source>
<target>Копіювати нові чи оновлювати файли з правої сторони.</target>
@@ -624,29 +618,23 @@ The command line is executed each time:
<source>Configuration</source>
<target>Налаштування</target>
-<source>Category</source>
-<target>Категорія</target>
-
-<source>Action</source>
-<target>Дія</target>
+<source>Item exists on left side only</source>
+<target>Елемент існує тільки ліворуч</target>
-<source>File/folder exists on left side only</source>
-<target>Файл/папка існує тільки ліворуч</target>
+<source>Item exists on right side only</source>
+<target>Елемент існує тільки праворуч</target>
-<source>File/folder exists on right side only</source>
-<target>Файл/папка існує тільки праворуч</target>
+<source>Left side is newer</source>
+<target>Ліва сторона новіша</target>
-<source>Left file is newer</source>
-<target>Файл ліворуч є новішим</target>
+<source>Right side is newer</source>
+<target>Права сторона новіша</target>
-<source>Right file is newer</source>
-<target>Файл праворуч є новішим</target>
+<source>Items have different content</source>
+<target>Елементи мають різний вміст</target>
-<source>Files have different content</source>
-<target>Файли відрізняються вмістом</target>
-
-<source>Conflict/file cannot be categorized</source>
-<target>Не можна категоризувати конфлікт/файл</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Не вдається категоризувати конфлікт/елемент</target>
<source>OK</source>
<target>OK</target>
@@ -749,33 +737,6 @@ Note: File names must be relative to base directories!
Увага: Назви файлів вказуються відносно базових каталогів.
</target>
-<source>Hints:</source>
-<target>Підказка:</target>
-
-<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Уведіть імена файлів чи каталогів, розділяючи знаком ';' чи з нового рядка.</target>
-
-<source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Використайте символи '*' і '?'.</target>
-
-<source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Виключіть файли безпосередньо у головному вікні через контекстне меню.</target>
-
-<source>Example</source>
-<target>Приклад</target>
-
-<source>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
-</source>
-<target>
-Включити: *.doc;*.zip;*.exe
-Виключити: \stuff\temp\*
-</target>
-
-<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Синхронізувати всі .doc, .zip і .exe файли, за винятком всіх файлів з подкаталогу "temp"</target>
-
<source>Include</source>
<target>Включити</target>
@@ -797,8 +758,8 @@ Exclude: \stuff\temp\*
<source>&Default</source>
<target>&За замовчуванням</target>
-<source>Transactional file copy</source>
-<target>Копіювання файлів з використанням трансакцій</target>
+<source>Fail-safe file copy</source>
+<target>Безпечне копіювання файлів</target>
<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
<target>Записати до тимчасового файлу (*.ffs_tmp), а потім перейменувати. Це гарантує збереження даних навіть при критичній помилці.</target>
@@ -812,8 +773,8 @@ Exclude: \stuff\temp\*
<source>Copy file access permissions</source>
<target>Копіювати права доступу до файлу</target>
-<source>Transfer file and directory permissions (Requires Administrator rights)</source>
-<target>Передача прав доступу файлу/каталогу (потрібні права Адміністратора)</target>
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Дозволи переносу файлів та папок (Вимагає прав Адміністратора)</target>
<source>Restore hidden dialogs</source>
<target>Відновити сховані діалоги</target>
@@ -915,7 +876,7 @@ Exclude: \stuff\temp\*
<target>Налаштування синхронізації загружено!</target>
<source>Folder Comparison and Synchronization</source>
-<target>Порівнювання і синхронізація папок</target>
+<target>Порівнювання та Синхронізація папок</target>
<source>Hide files that exist on left side only</source>
<target>Приховати файли, які є тільки ліворуч</target>
@@ -1125,17 +1086,17 @@ Exclude: \stuff\temp\*
<source>Integrate external applications into context menu. The following macros are available:</source>
<target>Інтеграція зовнішніх додатків в контекстному меню. Доступні макроси:</target>
-<source>- full file or directory name</source>
-<target>- повне ім’я файлу чи каталога</target>
+<source>- full file or folder name</source>
+<target>- повна назва файлу або папки</target>
-<source>- directory part only</source>
-<target>- лише каталог</target>
+<source>- folder part only</source>
+<target>- тільки папка</target>
<source>- Other side's counterpart to %name</source>
-<target>- аналогічний файл з другої сторони</target>
+<target>- файл-відповідник %name з протилежної сторони</target>
<source>- Other side's counterpart to %dir</source>
-<target>- аналогічна папка з другої сторони</target>
+<target>- папка-відповідник %dir з протилежної сторони</target>
<source>Make hidden dialogs and warning messages visible again?</source>
<target>Зробити приховані діалоги та попередження знову видимими?</target>
@@ -1173,10 +1134,10 @@ Exclude: \stuff\temp\*
<target>Використовувати "Корзину" при вилученні чи перезаписі файлів</target>
<source>Versioning</source>
-<target>Переміщати файли, які вилучаються, в задану папку</target>
+<target>Запис версій</target>
-<source>Move files into a time-stamped subdirectory</source>
-<target>Переміщати файли в підкатлог з часовою міткою</target>
+<source>Move files into a time-stamped subfolder</source>
+<target>Перемістити файли в означену датою підпапку</target>
<source>Files</source>
<target>Файли</target>
@@ -1274,8 +1235,8 @@ Exclude: \stuff\temp\*
<source>Cannot read directory %x.</source>
<target>Не вдається прочитати каталог %x</target>
-<source>Endless loop.</source>
-<target>Нескінченний цикл.</target>
+<source>Detected endless directory recursion.</source>
+<target>Виявлено нескінченну рекурсію каталогів.</target>
<source>Cannot set privilege %x.</source>
<target>Не вдається встановити привілеї %х.</target>
@@ -1304,14 +1265,11 @@ Exclude: \stuff\temp\*
Старі файли будуть замінені новішими файлами.
</target>
-<source>The file does not contain a valid configuration:</source>
-<target>Файл не містить правильних налаштувань синхронізації:</target>
-
-<source>You can ignore this error to consider the directory as empty.</source>
-<target>Ви можете проігнорувати помилку, вважаючи каталог порожнім.</target>
+<source>You can ignore this error to consider the folder as empty.</source>
+<target>Ви можете ігнорувати цю помилку вважаючи папку порожньою.</target>
-<source>Cannot find directory %x.</source>
-<target>Не вдається знайти каталог х%.</target>
+<source>Cannot find folder %x.</source>
+<target>Не вдається знайти папку %x.</target>
<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
<target>Залежні каталоги! Будьте уважні при налаштуванні правил синхронізації:</target>
@@ -1343,20 +1301,20 @@ Exclude: \stuff\temp\*
<source>Both sides are equal</source>
<target>Сторони ідентичні</target>
-<source>Files/folders differ in attributes only</source>
-<target>Файли/папки відрізняються лише атрибутами</target>
+<source>Items have different attributes</source>
+<target>Елементи мають різні атрибути</target>
-<source>Copy new file/folder to left</source>
-<target>Зкопіювати новий файл/папку ліворуч</target>
+<source>Copy new item to left</source>
+<target>Копіювати нові елементи ліворуч</target>
-<source>Copy new file/folder to right</source>
-<target>Зкопіювати новий файл/папку праворуч</target>
+<source>Copy new item to right</source>
+<target>Копіювати нові елементи праворуч</target>
-<source>Delete left file/folder</source>
-<target>Вилучити файл/папку ліворуч</target>
+<source>Delete left item</source>
+<target>Вилучити елемент ліворуч</target>
-<source>Delete right file/folder</source>
-<target>Вилучити файл/папку праворуч</target>
+<source>Delete right item</source>
+<target>Вилучити елемент праворуч</target>
<source>Move file on left</source>
<target>Перемістити файли ліворуч</target>
@@ -1364,20 +1322,20 @@ Exclude: \stuff\temp\*
<source>Move file on right</source>
<target>Перемістити файли праворуч</target>
-<source>Overwrite left file/folder with right one</source>
-<target>Перезаписати файл/папку ліворуч відповідником зправа</target>
+<source>Overwrite left item</source>
+<target>Перезаписати елемент ліворуч</target>
-<source>Overwrite right file/folder with left one</source>
-<target>Перезаписати файл/папку праворуч відповідником зліва</target>
+<source>Overwrite right item</source>
+<target>Перезаписати елемент праворуч</target>
<source>Do nothing</source>
<target>Нічого не робити</target>
-<source>Copy file attributes only to left</source>
-<target>Зкопіювати ліворуч лише атрибути файлу</target>
+<source>Update attributes on left</source>
+<target>Оновити атрибути ліворуч</target>
-<source>Copy file attributes only to right</source>
-<target>Зкопіювати праворуч лише атрибути файлу</target>
+<source>Update attributes on right</source>
+<target>Оновити атрибути праворуч</target>
<source>Multiple...</source>
<target>Різні варіанти...</target>
@@ -1430,11 +1388,11 @@ Exclude: \stuff\temp\*
<source>Updating attributes of %x</source>
<target>Оновлення атрибутів %x</target>
-<source>Target directory name must not be empty!</source>
-<target>Кінцевий каталог не повинен бути порожнім</target>
+<source>Target folder name must not be empty.</source>
+<target>Назва цільової папки не повинна бути порожньою.</target>
-<source>Directory for file versioning was not supplied!</source>
-<target>Не вказаний каталог для старих версій файлів!</target>
+<source>Folder name for file versioning must not be empty.</source>
+<target>Назва папки для версій файлів не повинна бути порожньою.</target>
<source>Source directory %x not found.</source>
<target>Вихідний каталог %x не знайдено.</target>
@@ -1463,8 +1421,8 @@ Exclude: \stuff\temp\*
<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
<target>Корзина для цього шляху недоступна. Файли будуть вилучені назавжди:</target>
-<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Каталог, який є частиною декількох пар папок, буде змінений. Будь ласка, перевірте налаштування синхронізації!</target>
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Буде змінена папка, яка є частиною кількох пар папок. Будь ласка, перегляньте налаштування синхронізації.</target>
<source>Processing folder pair:</source>
<target>Обробка пари папок:</target>
diff --git a/BUILD/Resources.zip b/BUILD/Resources.zip
index 2a5cfacd..54e6e657 100644
--- a/BUILD/Resources.zip
+++ b/BUILD/Resources.zip
Binary files differ
diff --git a/BUILD/Sync_Complete.wav b/BUILD/Sync_Complete.wav
index f166cc4b..3fe95e5d 100644
--- a/BUILD/Sync_Complete.wav
+++ b/BUILD/Sync_Complete.wav
Binary files differ
bgstack15