5.21

author: Daniel Wilhelm <daniel@wili.li> 2014-04-18 17:27:42 +0200
committer: Daniel Wilhelm <daniel@wili.li> 2014-04-18 17:27:42 +0200
commit: b916407a2a06f8452e82b74dc44c54acbcc572b0 (patch)
tree: 46358e0bb035fca0f42edb4b5b8aa5f1613814af /BUILD
parent: 5.20 (diff)
download: FreeFileSync-b916407a2a06f8452e82b74dc44c54acbcc572b0.tar.gz
FreeFileSync-b916407a2a06f8452e82b74dc44c54acbcc572b0.tar.bz2
FreeFileSync-b916407a2a06f8452e82b74dc44c54acbcc572b0.zip
35 files changed, 5331 insertions, 3805 deletions
diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt
index d267dca0..8582e2b4 100644
--- a/BUILD/Changelog.txt
+++ b/BUILD/Changelog.txt
@@ -1,3 +1,30 @@
+FreeFileSync 5.21
+-----------------
+Detect moved/renamed files in mirror and custom variants
+New database format for two way variant: old database files are converted automatically
+Support double-clicking ffs_gui/ffs_batch files (OS X)
+Integrated search panel (Ctrl + F, F3)  into main dialog
+Merged variant names into top button labels
+Hide dock icon while minimized to notification area (OS X)
+New keyboard shortcuts: F5, F6, F7, F8, F9, F10
+Further reduced size of database files by 10%
+Fixed Outlook *.ost files found missing on VSS snapshot volumes
+Added include filter context menu option
+Correctly scroll to search hits on different grid
+Always remove .ffs_tmp files permanently
+Fixed layout for buttons with text and graphics for RTL languages (Arabic, Hebrew)
+Revised file filter parser: new syntax for excluding items in subdirectories
+Improved configuration merge algorithm
+Fixed crash when showing help due to wxWigets 64-bit bug in help component (Windows 8)
+Avoid progress dialog graph flicker during resize when too few samples are available
+Progress status when deleting files not greyed out anymore
+Increased time-out to 20 seconds when checking for directory existence
+Exclude broken symlinks via filter before showing error message
+Follow symlinks when checking file/directory existence (Linux)
+Consistently set batch error codes during startup phase
+Updated translation files
+
+
 FreeFileSync 5.20
 -----------------
 Fixed crash on startup due to wxWigets 64-bit bug in font enumeration (Windows 8)
diff --git a/BUILD/FreeFileSync.chm b/BUILD/FreeFileSync.chm
index d6009619..5519353b 100644
--- a/BUILD/FreeFileSync.chm
+++ b/BUILD/FreeFileSync.chm
diff --git a/BUILD/Help/html/Exclude Items.html b/BUILD/Help/html/Exclude Items.html
index 4ac0afaf..22d46b78 100644
--- a/BUILD/Help/html/Exclude Items.html
+++ b/BUILD/Help/html/Exclude Items.html
@@ -105,38 +105,39 @@ include list and <B>none</B> of the entries in the exclude list:</FONT></P>
 			</TD>
 		</TR>
 		<TR>
-			<TD WIDTH=65% STYLE="border: none; padding: 0cm">
-				<P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Tahoma, sans-serif">Multiple entries
-				separated by semicolon</FONT></P>
+			<TD WIDTH=65% STYLE="border-bottom: 1px solid #000000; padding: 0cm">
+				<P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Tahoma, sans-serif">Multiple entries separated by semicolon</FONT></P>
 			</TD>
-			<TD WIDTH=35% STYLE="border-top: none; border-bottom: none; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0cm; padding-left: 0.05cm; padding-right: 0cm">
+			<TD WIDTH=35% STYLE="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0cm; padding-left: 0.05cm; padding-right: 0cm">
 				<P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Courier New, monospace">*.tmp; *.doc;
 				*.bak</FONT></P>
 			</TD>
 		</TR>
+		
+		<TR>
+			<TD WIDTH=65% STYLE="border-bottom: 1px solid #000000; padding: 0cm">
+				<P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Tahoma, sans-serif">Exclude all files and folders located in subdirectories of base directories</FONT></P>
+			</TD>
+			<TD WIDTH=35% STYLE="border-top: none; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0cm; padding-left: 0.05cm; padding-right: 0cm">
+				<P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Courier New, monospace">\*\*</FONT></P>
+			</TD>
+		</TR>
+		<TR>
+			<TD WIDTH=65% STYLE="border: none; padding: 0cm">
+				<P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Tahoma, sans-serif">Exclude only *.txt files
+located in subdirectories of base directories</FONT></P>
+			</TD>
+			<TD WIDTH=35% STYLE="border-top: none; border-bottom: none; border-left: 1px solid #000000; border-right: none; padding-top: 0cm; padding-bottom: 0cm; padding-left: 0.05cm; padding-right: 0cm">
+				<P ALIGN=LEFT STYLE="margin-left: 0.79cm"><FONT FACE="Courier New, monospace">\*\*.txt</FONT></P>
+			</TD>
+		</TR>
+		
+		
 	</TABLE>
 </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>
-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%;  border: none; padding: 0cm; background: #e6e6e6">
-	<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
-	<FONT FACE="Tahoma, sans-serif">Exclude: <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>
-Include only <SPAN STYLE="font-weight: normal">files and folders
-located in subdirectories of base directories</SPAN></FONT></P>
-<P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen2" DIR="LTR" STYLE="float: left; width: 80%;  border: none; padding: 0cm; background: #e6e6e6">
-	<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm">
-	<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"><BR>
-</P>
+
+
 <P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen4" DIR="LTR" STYLE="float: left; width: 80%; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
 		<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note</B></FONT></P>
 		<LI><P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">For
diff --git a/BUILD/Languages/arabic.lng b/BUILD/Languages/arabic.lng
index 4d5bf07b..c97b927d 100644
--- a/BUILD/Languages/arabic.lng
+++ b/BUILD/Languages/arabic.lng
@@ -7,6 +7,171 @@
 	<plural_definition>n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5</plural_definition>
 </header>
 
+<source>Unable to move %x to the recycle bin.</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Log</source>
+<target></target>
+
+<source>&Continue</source>
+<target></target>
+
+<source>&Don't show this warning again</source>
+<target></target>
+
+<source>&Ignore subsequent errors</source>
+<target></target>
+
+<source>Comma-separated values</source>
+<target></target>
+
+<source>Never save &changes</source>
+<target></target>
+
+<source>Include via filter:</source>
+<target></target>
+
+<source>&Execute</source>
+<target></target>
+
+<source>Confirm</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target></target>
+
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target></target>
+
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target></target>
+
+<source>
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
+</source>
+<target></target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target></target>
+
+<source>Move files to a user-defined folder</source>
+<target></target>
+
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target></target>
+
+<source>Recycle bin</source>
+<target></target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target></target>
+
+<source>Detect moved files</source>
+<target></target>
+
+<source>&Don't show this dialog again</source>
+<target></target>
+
+<source>Minimize to notification area</source>
+<target></target>
+
+<source>Retrying operation after error:</source>
+<target></target>
+
+<source>job name</source>
+<target></target>
+
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target></target>
+
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target></target>
+
+<source>&Show error</source>
+<target></target>
+
+<source>Waiting until all directories are available...</source>
+<target></target>
+
+<source>Directory monitoring active</source>
+<target></target>
+
+<source>Volume name %x is not part of file path %y.</source>
+<target></target>
+
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target></target>
+
+<source>%x items</source>
+<target></target>
+
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
+<target>
+</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target></target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target></target>
+
+<source>directory</source>
+<target></target>
+
+<source>config files</source>
+<target></target>
+
+<source>Syntax:</source>
+<target></target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target></target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target></target>
+
+<source>Unequal number of left and right directories specified.</source>
+<target></target>
+
+<source>Cannot open file %x.</source>
+<target></target>
+
+<source>Syntax error</source>
+<target></target>
+
+<source>A directory path is expected after %x.</source>
+<target></target>
+
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target></target>
+
+<source>Moving symbolic link %x to the recycle bin</source>
+<target></target>
+
+<source>Moving folder %x to the recycle bin</source>
+<target></target>
+
+<source>Moving file %x to the recycle bin</source>
+<target></target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>كلا الجانبين قد تغير منذ المزامنة الأخيرة.</target>
 
@@ -25,15 +190,6 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>التحقق من توافر سلة المحذوفات من أجل المجلد %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>نقل الملف %x إلى سلة المحذوفات</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>نقل المجلد %x إلى سلة المحذوفات</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>نقل الارتباط الرمزي %x إلى سلة المحذوفات</target>
-
 <source>Deleting file %x</source>
 <target>حذف الملف %x</target>
 
@@ -43,21 +199,21 @@
 <source>Deleting symbolic link %x</source>
 <target>حذف الارتباط الرمزي %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>سلة المحذوفات غير متاحة لهذه المجلدات. سيتم بدلاً عن ذلك حذف الملفات بشكل نهائي</target>
-
 <source>An exception occurred</source>
 <target>حدث استثناء</target>
 
-<source>Cannot find file %x.</source>
-<target>لا يمكن العثور على الملف  %x.</target>
-
 <source>Error</source>
 <target>خطأ</target>
 
 <source>File %x does not contain a valid configuration.</source>
 <target>لا يحتوي الملف %x تكويناً صحيحاً.</target>
 
+<source>Warning</source>
+<target>تحذير</target>
+
+<source>Command line</source>
+<target>سطر الأوامر</target>
+
 <source>A folder input field is empty.</source>
 <target>حقل إدخال خاص بمجلد فارغ.</target>
 
@@ -218,19 +374,6 @@
 <source>Total time:</source>
 <target>مجموع الوقت:</target>
 
-<source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</source>
-<target>
-<pluralform>0 Bytes</pluralform>
-<pluralform>1 Byte</pluralform>
-<pluralform>2 Bytes</pluralform>
-<pluralform>%x Bytes</pluralform>
-<pluralform>%x Bytes</pluralform>
-<pluralform>%x Bytes</pluralform>
-</target>
-
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -280,9 +423,6 @@
 <source>Browse directory</source>
 <target>تصفح المسار</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>لا يمكن الوصول إلى خدمة "نسخ الظل لوحدة التخزين".</target>
-
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>الرجاء استخدام إصدار الـ 64-bit للبرنامج لإنشاء ملفات الظل الاحتياطية على هذا النظام.</target>
 
@@ -292,9 +432,6 @@
 <source>Cannot determine volume name for %x.</source>
 <target>تعذر تحديد اسم الوسط %x</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>اسم وحدة التخزين %x ليس جزءاُ من اسم الملف %y.</target>
-
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>طلب إحباط المهمة: في انتظار انتهاء المهمة الحالية...</target>
 
@@ -361,9 +498,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>وقت الخمول بين آخر تغيير تم الكشف عنه وتنفيذ الأوامر</target>
 
-<source>Command line</source>
-<target>سطر الأوامر</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -387,9 +521,6 @@ The command is triggered if:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>المزامنة اللحظية - المزمنة التلقائية</target>
 
-<source>Warning</source>
-<target>تحذير</target>
-
 <source>Build: %x</source>
 <target>بناء: %x</target>
 
@@ -405,9 +536,6 @@ The command is triggered if:
 <source>&Exit</source>
 <target>&خروج</target>
 
-<source>Waiting for missing directories...</source>
-<target>في انتظار المسارات المفقود...</target>
-
 <source>Invalid command line:</source>
 <target>سطر الأوامر غير صالح:</target>
 
@@ -417,14 +545,14 @@ The command is triggered if:
 <source>File time and size</source>
 <target>تاريخ الملف و حجمه</target>
 
-<source> Two way </source>
-<target> بالاتجاهين </target>
+<source>Two way</source>
+<target>بالاتجاهين</target>
 
 <source>Mirror</source>
-<target>انعكاس </target>
+<target>انعكاس</target>
 
 <source>Update</source>
-<target>تحديث </target>
+<target>تحديث</target>
 
 <source>Custom</source>
 <target>مخصص</target>
@@ -480,12 +608,6 @@ The command is triggered if:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>العناصر التالية لم تحل اختلافاتها، و لن يتم مزامنتها:</target>
 
-<source>Significant difference detected:</source>
-<target>تم الكشف عن فرق كبير:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>أكثر من 50% من إجمالي عدد الملفات  سيتم نسخها أو حذفها.</target>
-
 <source>Not enough free disk space available in:</source>
 <target>المساحة الحرة المتوفرة على القرص غير كافية:</target>
 
@@ -504,9 +626,6 @@ The command is triggered if:
 <source>Generating database...</source>
 <target>إنشاء قاعدة بيانات...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>جاري إنشاء نسخة ظلية لـ %x...</target>
-
 <source>Data verification error: %x and %y have different content.</source>
 <target>خطأ في التحقق من البيانات: يحتوي %x و %y بيانات مختلفة.</target>
 
@@ -657,8 +776,8 @@ The command is triggered if:
 <source>&Export file list...</source>
 <target>&تصدير قائمة الملفات...</target>
 
-<source>&Global settings...</source>
-<target>&الإعدادات العامة...</target>
+<source>&Global settings</source>
+<target>&الإعدادات العامة</target>
 
 <source>&Tools</source>
 <target>&أدوات</target>
@@ -738,6 +857,12 @@ The command is triggered if:
 <source>&Pause</source>
 <target>&إيقاف مؤقت</target>
 
+<source>Variant</source>
+<target>المتغير</target>
+
+<source>Statistics</source>
+<target>إحصائيات</target>
+
 <source>Select a variant</source>
 <target>اختيار بديل</target>
 
@@ -810,27 +935,15 @@ is the same
 <source>Delete or overwrite files permanently</source>
 <target>حذف أو الكتابة فوق الملفات بشكل دائم</target>
 
-<source>Recycle Bin</source>
-<target>سلة المحذوفات</target>
-
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>استخدام سلة المحذوفات للملفات المحذوفة و الكتابة فوق الملفات</target>
-
 <source>Versioning</source>
 <target>الوسم برقم الإصدار</target>
 
-<source>Move files to user-defined folder</source>
-<target>نقل الملفات إلى مجلد يحدده المستخدم</target>
-
 <source>Naming convention:</source>
 <target>اصطلاح التسمية:</target>
 
 <source>Batch job</source>
 <target>مهمة دفعية</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>إنشاء ملف دفعي لتحويل المزامنةإلى تلقائية. بالنقر المزدوج على الملف أو جدولته ضمن task planner الخاص بالنظام: FreeFileSync.exe <job name>.ffs_batch</target>
-
 <source>Exit</source>
 <target>خروج</target>
 
@@ -882,15 +995,6 @@ is the same
 <source>Delete on both sides even if the file is selected on one side only</source>
 <target>حذف الملف في كلا الجانبين حتى إذا كان الملف محدداً على جانب واحد فقط</target>
 
-<source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
-</source>
-<target>
-سوف تتم متزامنة فقط الملفات التي تطابق كافة إعدادات عامل التصفية.
-ملاحظة: يجب أن تكون أسماء الملفات منسوبة إلى بنية المسارات.
-</target>
-
 <source>Include</source>
 <target>شمول</target>
 
@@ -918,21 +1022,12 @@ Note: File names must be relative to base directories.
 <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>
-
 <source>Copy locked files</source>
 <target>نسخ الملفات المقفلة</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>نسخ الملفات المشاركة أو المقفلة باستخدام "خدمة النسخ الاحتياطي لوحدة التخزين" (بحاجة لصلاحيات المدير)</target>
-
 <source>Copy file access permissions</source>
 <target>نسخ أذونات الوصول إلى الملف</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>نقل أذونات الوصول إلى الملفات و المجلدات (بحاجة لصلاحيات المدير)</target>
-
 <source>Restore hidden dialogs</source>
 <target>استعادة نوافذ الحوار المخفية</target>
 
@@ -945,15 +1040,6 @@ Note: File names must be relative to base directories.
 <source>&Default</source>
 <target>&الافتراضي</target>
 
-<source>Variant</source>
-<target>المتغير</target>
-
-<source>Statistics</source>
-<target>إحصائيات</target>
-
-<source>Don't show this dialog again</source>
-<target>عدم إظهار نافذة الحوار هذه مرة أخرى</target>
-
 <source>Find what:</source>
 <target>بحث عن:</target>
 
@@ -963,15 +1049,15 @@ Note: File names must be relative to base directories.
 <source>&Find next</source>
 <target>&بحث عن التالي</target>
 
+<source>Start synchronization</source>
+<target>بدء المزامنة</target>
+
 <source>Delete</source>
 <target>حذف</target>
 
 <source>Configure filter</source>
 <target>ضبط عامل التصفية</target>
 
-<source>Start synchronization</source>
-<target>بدء المزامنة</target>
-
 <source>Find</source>
 <target>بحث</target>
 
@@ -1053,12 +1139,12 @@ Note: File names must be relative to base directories.
 <source>Include temporarily</source>
 <target>شمول مؤقتاً</target>
 
-<source>Exclude via filter:</source>
-<target>استبعاد باستخدام عامل التصفية:</target>
-
 <source>multiple selection</source>
 <target>تحديد متعدد</target>
 
+<source>Exclude via filter:</source>
+<target>استبعاد باستخدام عامل التصفية:</target>
+
 <source>Include all</source>
 <target>شمول الكل</target>
 
@@ -1104,9 +1190,6 @@ Note: File names must be relative to base directories.
 <source>Do&n't save</source>
 <target>&لا تحفظ</target>
 
-<source>Never save changes</source>
-<target>لا تحفظ التغييرات أبداً</target>
-
 <source>Show files that exist on left side only</source>
 <target>إظهار الملفات الموجودة في الجانب الأيمن فقط</target>
 
@@ -1158,27 +1241,18 @@ Note: File names must be relative to base directories.
 <source>All folders are in sync</source>
 <target>جميع المجلدات متزامنة</target>
 
-<source>Comma separated list</source>
-<target>قائمة مفصولة بفواصل</target>
-
 <source>File list exported</source>
 <target>تم تصدير قائمة الملفات</target>
 
 <source>Searching for program updates...</source>
 <target>جاري البحث عن تحديثات للبرنامج...</target>
 
-<source>Ignore further errors</source>
-<target>تجاهل أي أخطاء أخرى</target>
-
 <source>&Ignore</source>
 <target>&تجاهل</target>
 
 <source>Fatal Error</source>
 <target>خطأ فادح</target>
 
-<source>Don't show this warning again</source>
-<target>لا تظهر هذا التنبيه ثانية</target>
-
 <source>&Switch</source>
 <target>&تبديل</target>
 
@@ -1212,15 +1286,6 @@ Note: File names must be relative to base directories.
 <source>Completed</source>
 <target>تم الإنتهاء</target>
 
-<source>Continue</source>
-<target>مواصلة</target>
-
-<source>Pause</source>
-<target>إيقاف مؤقت</target>
-
-<source>Logging</source>
-<target>التسجيل</target>
-
 <source>Cannot find %x</source>
 <target>لا يمكن العثور على  %x</target>
 
@@ -1255,19 +1320,6 @@ Note: File names must be relative to base directories.
 <target>عامل التصفية</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>هل تريد حقاً نقل 0 ملف التالي إلى سلة المهملات ؟</pluralform>
-<pluralform>هل تريد حقاً نقل الملف 1 التالي إلى سلة المهملات ؟</pluralform>
-<pluralform>هل تريد حقاً نقل الملفين 2 التاليين إلى سلة المهملات ؟</pluralform>
-<pluralform>هل تريد حقاً نقل الـ %x ملفات التالية إلى سلة المهملات ؟</pluralform>
-<pluralform>هل تريد حقاً نقل الـ %x ملفاً التالية إلى سلة المهملات ؟</pluralform>
-<pluralform>هل تريد حقاً نقل الـ %x ملف التالية إلى سلة المهملات ؟</pluralform>
-</target>
-
-<source>
 <pluralform>Do you really want to delete the following item?</pluralform>
 <pluralform>Do you really want to delete the following %x items?</pluralform>
 </source>
@@ -1322,9 +1374,6 @@ Note: File names must be relative to base directories.
 <source>Append a timestamp to each file name</source>
 <target>إلحاق طابع زمني اسم كل ملف</target>
 
-<source>Folder</source>
-<target>مجلد</target>
-
 <source>File</source>
 <target>ملف</target>
 
@@ -1457,9 +1506,6 @@ Note: File names must be relative to base directories.
 <source>Cannot change process I/O priorities.</source>
 <target>تعذر تغيير أولويات I/O للعملية</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>تعذر نقل %x إلى سلة المحذوفات.</target>
-
 <source>Cannot determine final path for %x.</source>
 <target>تعذر تحديد المسار النهائي لـ %x.</target>
 
diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index 754d0ca3..98c55320 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -25,14 +25,14 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>正在为文件夹 %x 检测回收站可用性...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>正在移动文件 %x 到回收站</target>
+<source>Moving file %x to the recycle bin</source>
+<target>移动文件 %x 到回收站</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>正在移动文件夹 %x 到回收站</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>移动文件夹 %x 到回收站</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>正在移动符号连接 %x 到回收站</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>移动符号连接 %x 到回收站</target>
 
 <source>Deleting file %x</source>
 <target>正删除文件 %x</target>
@@ -43,14 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>正在删除符号连接 %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>回收站对如下文件夹无效. 文件将被永久性删除:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>对于如下的文件夹回收站不可用. 文件将被永久性删除:</target>
 
 <source>An exception occurred</source>
 <target>发生异常</target>
 
-<source>Cannot find file %x.</source>
-<target>无法找到文件 %x .</target>
+<source>A directory path is expected after %x.</source>
+<target>在 %x 之后预期是一个目录路径.</target>
+
+<source>Syntax error</source>
+<target>语法错误</target>
+
+<source>Cannot open file %x.</source>
+<target>无法打开文件 %x.</target>
 
 <source>Error</source>
 <target>错误</target>
@@ -58,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>文件 %x 并未包含合法的配置.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>左边和右边指定了数量不相等的目录.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>当目录通过命令行设定时配置文件必须不包含目录对级别的设置.</target>
+
+<source>Warning</source>
+<target>警告</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>无法为多于一个配置文件设置目录.</target>
+
+<source>Syntax:</source>
+<target>语法:</target>
+
+<source>config files</source>
+<target>配置文件</target>
+
+<source>directory</source>
+<target>目录</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>任意数量的 FreeFileSync .ffs_gui 和/或 .ffs_batch 配置文件.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>任意数量的替代目录中至多有一个配置文件.</target>
+
+<source>Command line</source>
+<target>命令行</target>
+
 <source>A folder input field is empty.</source>
 <target>有一个文件夹输入框为空.</target>
 
@@ -214,8 +250,8 @@
 <target>总共时间:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
 <pluralform>%x 字节</pluralform>
@@ -240,11 +276,11 @@
 <target>扫描中:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[%x 线程]</pluralform>
+<pluralform>%x 线程</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -253,6 +289,9 @@
 <source>/sec</source>
 <target>/秒</target>
 
+<source>%x items</source>
+<target>%x 个项目</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>配置文件 %x 只是部分载入.</target>
 
@@ -265,7 +304,7 @@
 <source>Browse directory</source>
 <target>浏览目录</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
+<source>Cannot access the Volume Shadow Copy Service.</source>
 <target>无法访问卷影复制服务.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
@@ -277,8 +316,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>无法为 %x 确定卷名.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>卷名 %x 并非文件名 %y 的一部分.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>卷名 %x 不是文件路径 %y 的一部分.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>请求中止: 正在等待当前操作完成...</target>
@@ -346,9 +385,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>最后检测到改变和命令执行之间的空闲时间</target>
 
-<source>Command line</source>
-<target>命令行</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -372,9 +408,6 @@ The command is triggered if:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>实时同步 - 自动同步</target>
 
-<source>Warning</source>
-<target>警告</target>
-
 <source>Build: %x</source>
 <target>Build: %x</target>
 
@@ -384,15 +417,21 @@ The command is triggered if:
 <source>All files</source>
 <target>所有文件</target>
 
+<source>Directory monitoring active</source>
+<target>目录监视激活</target>
+
+<source>Waiting until all directories are available...</source>
+<target>正在等待直到所有目录都可用...</target>
+
 <source>&Restore</source>
 <target>恢复(&R)</target>
 
+<source>&Show error</source>
+<target>显示错误(&S)</target>
+
 <source>&Exit</source>
 <target>退出(&E)</target>
 
-<source>Waiting for missing directories...</source>
-<target>正在等待丢失的目录...</target>
-
 <source>Invalid command line:</source>
 <target>无效的命令行:</target>
 
@@ -402,14 +441,14 @@ The command is triggered if:
 <source>File time and size</source>
 <target>文件时间和大小</target>
 
-<source> Two way </source>
+<source>Two way</source>
 <target>双向</target>
 
 <source>Mirror</source>
-<target>镜像 </target>
+<target>镜像</target>
 
 <source>Update</source>
-<target>更新 </target>
+<target>更新</target>
 
 <source>Custom</source>
 <target>自定义</target>
@@ -465,11 +504,8 @@ The command is triggered if:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>如下项目有无法解决的冲突并将不会被同步:</target>
 
-<source>Significant difference detected:</source>
-<target>已侦测到显著不同:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>超过总数 50% 以上的文件要被复制或删除.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>如下的文件夹有显著的不同. 请确认你为同步配对了正确的文件夹.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>没有足够的可用磁盘空间用于:</target>
@@ -489,12 +525,15 @@ The command is triggered if:
 <source>Generating database...</source>
 <target>正在生成数据库...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>正在为 %x 创建卷影响复制...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>为 %x 创建一个卷影副本...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>数据校验错误: %x 和 %y 有不同的内容.</target>
 
+<source>job name</source>
+<target>作业名称</target>
+
 <source>Synchronization aborted</source>
 <target>同步已被中止</target>
 
@@ -519,6 +558,9 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog</source>
 <target>正在切换到 FreeFileSync 主对话框</target>
 
+<source>Retrying operation after error:</source>
+<target>发生错误后重试操作:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>已经有新版本的FreeFileSync可用:</target>
 
@@ -642,8 +684,8 @@ The command is triggered if:
 <source>&Export file list...</source>
 <target>导出文件列表(&E)...</target>
 
-<source>&Global settings...</source>
-<target>全局设置(&G)...</target>
+<source>&Global settings</source>
+<target>全局设置(&G)</target>
 
 <source>&Tools</source>
 <target>工具(&T)</target>
@@ -714,6 +756,9 @@ The command is triggered if:
 <source>Synchronizing...</source>
 <target>同步中...</target>
 
+<source>Minimize to notification area</source>
+<target>最小化到托盘</target>
+
 <source>On completion</source>
 <target>在完成时</target>
 
@@ -723,6 +768,15 @@ The command is triggered if:
 <source>&Pause</source>
 <target>暂停(&P)</target>
 
+<source>Variant</source>
+<target>变化</target>
+
+<source>Statistics</source>
+<target>统计</target>
+
+<source>&Don't show this dialog again</source>
+<target>不要再显示这个对话框(&D)</target>
+
 <source>Select a variant</source>
 <target>选择一个变化</target>
 
@@ -771,6 +825,12 @@ is the same
 <source>Configure your own synchronization rules.</source>
 <target>配置你自己的同步规则.</target>
 
+<source>Detect moved files</source>
+<target>检测被移动的文件</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>需要数据库文件. 不是所有文件系统都支持.</target>
+
 <source>Error handling</source>
 <target>错误处理</target>
 
@@ -795,17 +855,17 @@ is the same
 <source>Delete or overwrite files permanently</source>
 <target>永久性删除或覆盖文件</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>回收站</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>将删除和覆盖文件放到回收站</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>备份被删除和被覆盖的文件到回收站</target>
 
 <source>Versioning</source>
 <target>保留历史版本</target>
 
-<source>Move files to user-defined folder</source>
-<target>移动文件至用户定义文件夹</target>
+<source>Move files to a user-defined folder</source>
+<target>移动文件到一个用户定义的文件夹</target>
 
 <source>Naming convention:</source>
 <target>命名规则:</target>
@@ -813,8 +873,8 @@ is the same
 <source>Batch job</source>
 <target>批处理作业</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>创建一个用于无人值守同步的批处理文件. 要开始, 双击这个文件或任务计划器中的计划调度: %x</target>
 
 <source>Exit</source>
 <target>退出</target>
@@ -868,12 +928,12 @@ is the same
 <target>从两侧删除(即使仅在一侧选择文件)</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-只有匹配所有过滤器的文件会被同步.
-注:文件名必须是主目录的相对路径.
+文件仅仅在它们通过了所有的过滤器规则时才会被同步.
+备注: 文件路径必须是主目录的相对路径.
 </target>
 
 <source>Include</source>
@@ -903,20 +963,20 @@ Note: File names must be relative to base directories.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>先复制到一个临时文件(*.ffs_tmp)然后再改名. 这保证了即使是在发生致使错误的情况下也有一致的状态.</target>
 
 <source>Copy locked files</source>
 <target>复制被锁定的文件</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>通过卷影复制服务复制共享或锁定的文件(需要管理员权限)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>使用卷影复制服务来复制已共享或已锁定的文件(需要管理员权限)</target>
 
 <source>Copy file access permissions</source>
 <target>复制文件存取权限</target>
 
-<source>Transfer file and folder 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>
@@ -930,15 +990,6 @@ Note: File names must be relative to base directories.
 <source>&Default</source>
 <target>默认(&D)</target>
 
-<source>Variant</source>
-<target>变化</target>
-
-<source>Statistics</source>
-<target>统计</target>
-
-<source>Don't show this dialog again</source>
-<target>不要再显示这个对话框</target>
-
 <source>Find what:</source>
 <target>要查找什么:</target>
 
@@ -948,15 +999,15 @@ Note: File names must be relative to base directories.
 <source>&Find next</source>
 <target>查找下一个(&F)</target>
 
+<source>Start synchronization</source>
+<target>开始同步</target>
+
 <source>Delete</source>
 <target>删除</target>
 
 <source>Configure filter</source>
 <target>配置过滤器</target>
 
-<source>Start synchronization</source>
-<target>开始同步</target>
-
 <source>Find</source>
 <target>查找</target>
 
@@ -991,6 +1042,20 @@ Note: File names must be relative to base directories.
 <target>比较两侧</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>你是否真的要对 %x 个项目执行命令 %y?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>确认</target>
+
+<source>&Execute</source>
+<target>排除(&E)</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1023,12 +1088,15 @@ Note: File names must be relative to base directories.
 <source>Include temporarily</source>
 <target>暂时包括</target>
 
-<source>Exclude via filter:</source>
-<target>通过过滤器排除:</target>
-
 <source>multiple selection</source>
 <target>多选</target>
 
+<source>Include via filter:</source>
+<target>通过过滤器包括:</target>
+
+<source>Exclude via filter:</source>
+<target>通过过滤器排除:</target>
+
 <source>Include all</source>
 <target>包括所有</target>
 
@@ -1074,8 +1142,8 @@ Note: File names must be relative to base directories.
 <source>Do&n't save</source>
 <target>不保存(&N)</target>
 
-<source>Never save changes</source>
-<target>永不保存更改</target>
+<source>Never save &changes</source>
+<target>不再保存更改(&C)</target>
 
 <source>Show files that exist on left side only</source>
 <target>显示仅存在左侧的文件</target>
@@ -1128,8 +1196,8 @@ Note: File names must be relative to base directories.
 <source>All folders are in sync</source>
 <target>所有文件夹都是同步的</target>
 
-<source>Comma separated list</source>
-<target>逗号分隔的列表</target>
+<source>Comma-separated values</source>
+<target>逗号分割的数值(CSV)</target>
 
 <source>File list exported</source>
 <target>文件清单已经导出</target>
@@ -1137,8 +1205,8 @@ Note: File names must be relative to base directories.
 <source>Searching for program updates...</source>
 <target>正在搜索程序的更新...</target>
 
-<source>Ignore further errors</source>
-<target>忽略之后出现的错误</target>
+<source>&Ignore subsequent errors</source>
+<target>忽略后续的错误(&I)</target>
 
 <source>&Ignore</source>
 <target>忽略(&I)</target>
@@ -1146,8 +1214,8 @@ Note: File names must be relative to base directories.
 <source>Fatal Error</source>
 <target>致命错误</target>
 
-<source>Don't show this warning again</source>
-<target>不要再显示这个警告</target>
+<source>&Don't show this warning again</source>
+<target>不再显示这个警告(&D)</target>
 
 <source>&Switch</source>
 <target>切换(&S)</target>
@@ -1182,14 +1250,11 @@ Note: File names must be relative to base directories.
 <source>Completed</source>
 <target>完成</target>
 
-<source>Continue</source>
-<target>继续</target>
+<source>&Continue</source>
+<target>继续(&C)</target>
 
-<source>Pause</source>
-<target>暂停</target>
-
-<source>Logging</source>
-<target>记录</target>
+<source>Log</source>
+<target>日志</target>
 
 <source>Cannot find %x</source>
 <target>找不到 %x</target>
@@ -1225,11 +1290,11 @@ Note: File names must be relative to base directories.
 <target>过滤器</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>是否真的要移动如下 %x 个项目到回收站?</pluralform>
+<pluralform>你是否要将如下 %x 个项目移动到回收站?</pluralform>
 </target>
 
 <source>
@@ -1282,9 +1347,6 @@ Note: File names must be relative to base directories.
 <source>Append a timestamp to each file name</source>
 <target>附加时间戳到每一个文件名</target>
 
-<source>Folder</source>
-<target>文件夹</target>
-
 <source>File</source>
 <target>文件</target>
 
@@ -1402,8 +1464,8 @@ Note: File names must be relative to base directories.
 <source>Cannot change process I/O priorities.</source>
 <target>无法更改进程的I/O优先级.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>无法移动 %x 到回收站.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>无法将 %x 移动到回收站.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>无法确定 %x 的最终路径.</target>
diff --git a/BUILD/Languages/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng
index f735db65..9b93446e 100644
--- a/BUILD/Languages/chinese_traditional.lng
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -7,6 +7,9 @@
 	<plural_definition>0</plural_definition>
 </header>
 
+<source>Close search bar</source>
+<target></target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>自上次同步後，兩邊均已變更過。</target>
 
@@ -25,13 +28,13 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>正在檢查資源回收筒的可用性資料夾 %x...</target>
 
-<source>Moving file %x to recycle bin</source>
+<source>Moving file %x to the recycle bin</source>
 <target>正在移動檔案 %x 到資源回收筒</target>
 
-<source>Moving folder %x to recycle bin</source>
+<source>Moving folder %x to the recycle bin</source>
 <target>正在移動資料夾 %x 到資源回收筒</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
+<source>Moving symbolic link %x to the recycle bin</source>
 <target>正在移動符號連結 %x 到資源回收筒</target>
 
 <source>Deleting file %x</source>
@@ -43,14 +46,20 @@
 <source>Deleting symbolic link %x</source>
 <target>正在刪除符號連結 %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>資源回收筒不可用於以下資料夾！否則檔案將改為永久被刪除：</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>資源回收筒不可用於以下資料夾。檔案將被永久刪除替代：</target>
 
 <source>An exception occurred</source>
 <target>發生異常</target>
 
-<source>Cannot find file %x.</source>
-<target>找不到檔案 %x。</target>
+<source>A directory path is expected after %x.</source>
+<target>%x 後預期的目錄路徑。</target>
+
+<source>Syntax error</source>
+<target>語法錯誤</target>
+
+<source>Cannot open file %x.</source>
+<target>無法開啟檔案 %x。</target>
 
 <source>Error</source>
 <target>錯誤</target>
@@ -58,6 +67,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>檔案 %x 不包含一個有效的配置。</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>左邊和右邊指定的目錄數不相等。</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>目錄設定透過命令列時，該設定檔必須不包含配對目錄級別的設定。</target>
+
+<source>Warning</source>
+<target>警告</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>目錄無法設定多個配置檔。</target>
+
+<source>Syntax:</source>
+<target>語法：</target>
+
+<source>config files</source>
+<target>配置檔案</target>
+
+<source>directory</source>
+<target>目錄</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>FreeFileSync .ffs_gui和/或.ffs_batch配置檔案的任意數量。</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>替代目錄的任意數量中最多有一個配置文件。</target>
+
+<source>Command line</source>
+<target>命令列</target>
+
 <source>A folder input field is empty.</source>
 <target>資料夾輸入欄位是空的。</target>
 
@@ -214,11 +253,11 @@
 <target>全部時間：</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>%x 位元組</pluralform>
+<pluralform>%x 個位元組</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -240,11 +279,11 @@
 <target>正在掃瞄：</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[%x 個執行緒]</pluralform>
+<pluralform>%x 個執行緒</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -253,6 +292,9 @@
 <source>/sec</source>
 <target>/秒</target>
 
+<source>%x items</source>
+<target>%x 項目</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>只載入設定檔 %x 的一部份。</target>
 
@@ -265,7 +307,7 @@
 <source>Browse directory</source>
 <target>瀏覽目錄</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
+<source>Cannot access the Volume Shadow Copy Service.</source>
 <target>無法讀取卷影複製服務。</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
@@ -277,8 +319,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>無法確定卷名為 %x。</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>卷名 %x 並非檔名 %y 的一部份。</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>卷名 %x 不是檔案路徑 %y 的一部分。</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>中止請求：正在等待目前操作完成...</target>
@@ -346,9 +388,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>最後檢測到變更和執行命令之間的閒置時間</target>
 
-<source>Command line</source>
-<target>命令列</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -372,9 +411,6 @@ The command is triggered if:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>即時同步 - 自動同步</target>
 
-<source>Warning</source>
-<target>警告</target>
-
 <source>Build: %x</source>
 <target>建立：%x</target>
 
@@ -384,15 +420,21 @@ The command is triggered if:
 <source>All files</source>
 <target>所有檔案</target>
 
+<source>Directory monitoring active</source>
+<target>目錄監測啟動</target>
+
+<source>Waiting until all directories are available...</source>
+<target>等到所有目錄可用...</target>
+
 <source>&Restore</source>
 <target>還原(&R)</target>
 
+<source>&Show error</source>
+<target>顯示錯誤(&S)</target>
+
 <source>&Exit</source>
 <target>結束(&E)</target>
 
-<source>Waiting for missing directories...</source>
-<target>等待缺少的目錄...</target>
-
 <source>Invalid command line:</source>
 <target>無效的命令列：</target>
 
@@ -402,14 +444,14 @@ The command is triggered if:
 <source>File time and size</source>
 <target>檔案大小和日期</target>
 
-<source> Two way </source>
-<target> 雙向 </target>
+<source>Two way</source>
+<target>雙向</target>
 
 <source>Mirror</source>
-<target>鏡像 </target>
+<target>鏡像</target>
 
 <source>Update</source>
-<target>更新 </target>
+<target>更新</target>
 
 <source>Custom</source>
 <target>自訂</target>
@@ -465,11 +507,8 @@ The command is triggered if:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>下列項目有未解決的衝突，將不會同步：</target>
 
-<source>Significant difference detected:</source>
-<target>檢測到顯著的差異：</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>超過總數 50% 以上的檔案會被複製或刪除。</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>下列資料夾明顯不同。請確定要進行同步的資料夾匹配正確。</target>
 
 <source>Not enough free disk space available in:</source>
 <target>沒有足夠的可用空間：</target>
@@ -489,12 +528,15 @@ The command is triggered if:
 <source>Generating database...</source>
 <target>正在產生資料庫...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
+<source>Creating a Volume Shadow Copy for %x...</source>
 <target>正在新建卷影複製為 %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>資料驗證錯誤：%x 和 %y 內容不同！</target>
 
+<source>job name</source>
+<target>作業名稱</target>
+
 <source>Synchronization aborted</source>
 <target>同步已中止</target>
 
@@ -519,6 +561,9 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog</source>
 <target>切換到FreeFileSync主對話框</target>
 
+<source>Retrying operation after error:</source>
+<target>錯誤後重試操作：</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>FreeFileSync有新版本可用：</target>
 
@@ -642,8 +687,8 @@ The command is triggered if:
 <source>&Export file list...</source>
 <target>匯出檔案清單(&E)...</target>
 
-<source>&Global settings...</source>
-<target>整體設定(&G)...</target>
+<source>&Global settings</source>
+<target>整體設定(&G)</target>
 
 <source>&Tools</source>
 <target>工具(&T)</target>
@@ -660,12 +705,6 @@ The command is triggered if:
 <source>Compare</source>
 <target>比對</target>
 
-<source>Comparison settings</source>
-<target>比對設定</target>
-
-<source>Synchronization settings</source>
-<target>同步設定</target>
-
 <source>Synchronize</source>
 <target>同步</target>
 
@@ -678,6 +717,12 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>兩邊交換</target>
 
+<source>Find what:</source>
+<target>尋找內容：</target>
+
+<source>Match case</source>
+<target>區分大小寫</target>
+
 <source>Save as batch job</source>
 <target>另存為批次處理作業</target>
 
@@ -714,6 +759,9 @@ The command is triggered if:
 <source>Synchronizing...</source>
 <target>正在同步...</target>
 
+<source>Minimize to notification area</source>
+<target>最小化到通知區域</target>
+
 <source>On completion</source>
 <target>完成後</target>
 
@@ -723,6 +771,15 @@ The command is triggered if:
 <source>&Pause</source>
 <target>暫停(&P)</target>
 
+<source>Variant</source>
+<target>變數</target>
+
+<source>Statistics</source>
+<target>統計</target>
+
+<source>&Don't show this dialog again</source>
+<target>不要再顯示此對話框(&D)</target>
+
 <source>Select a variant</source>
 <target>選擇一個變數</target>
 
@@ -762,6 +819,12 @@ is the same
 <source>Configure your own synchronization rules.</source>
 <target>配置你自己的同步規則。</target>
 
+<source>Detect moved files</source>
+<target>檢測被移動的檔案</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>需要資料庫檔案。不支援所有檔案系統。</target>
+
 <source>Error handling</source>
 <target>錯誤處理</target>
 
@@ -786,17 +849,17 @@ is the same
 <source>Delete or overwrite files permanently</source>
 <target>永久刪除或覆蓋檔案</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>資源回收筒</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>將刪除和覆蓋的檔案移動到資源回收筒</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>在資源回收筒中刪除備份和覆蓋檔案</target>
 
 <source>Versioning</source>
 <target>版本控制</target>
 
-<source>Move files to user-defined folder</source>
-<target>將檔案移動到使用者自訂的資料夾</target>
+<source>Move files to a user-defined folder</source>
+<target>將檔案移動到一個使用者定義的資料夾</target>
 
 <source>Naming convention:</source>
 <target>命名慣例：</target>
@@ -804,8 +867,8 @@ is the same
 <source>Batch job</source>
 <target>批次處理作業</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>新建一個批次處理檔，用於無人值守同步。開始，點兩下此檔案，或安排在任務規劃中：%x</target>
 
 <source>Exit</source>
 <target>結束</target>
@@ -828,30 +891,6 @@ is the same
 <source>Limit maximum number of log files</source>
 <target>限制日誌檔的最大數量</target>
 
-<source>Source code written in C++ using:</source>
-<target>使用C++編寫的原始碼</target>
-
-<source>If you like FreeFileSync</source>
-<target>如果你喜歡FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>使用PayPal捐款</target>
-
-<source>Many thanks for localization:</source>
-<target>非常感謝本地化語系翻譯工作人員：</target>
-
-<source>Feedback and suggestions are welcome</source>
-<target>歡迎反饋意見和建議</target>
-
-<source>Homepage</source>
-<target>首頁</target>
-
-<source>Email</source>
-<target>信箱</target>
-
-<source>Published under the GNU General Public License</source>
-<target>在GNU通用公共許可證下發佈</target>
-
 <source>Delete on both sides</source>
 <target>兩邊都刪除</target>
 
@@ -859,12 +898,12 @@ is the same
 <target>即使只在一邊中選好檔案，還是會刪除兩邊檔案。</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-只有符合所有篩選器設定的檔案才會被同步。
-注意：檔名必須相對到基本目錄。
+如果他們通過所有的過濾規則，將只會同步檔案。
+注意：檔案路徑必須是相對於基本目錄。
 </target>
 
 <source>Include</source>
@@ -894,20 +933,20 @@ Note: File names must be relative to base directories.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>先複製到一個臨時檔案(*.ffs_tmp)然後將其重新命名。即使發生致命錯誤時，還能確保一致的狀態。</target>
 
 <source>Copy locked files</source>
 <target>複製被鎖定的檔案</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>複製共用或鎖定檔案使用使用卷影複製服務(需要管理員權限)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>共用的副本或鎖定的檔案使用卷影複製服務(需要管理員權限)</target>
 
 <source>Copy file access permissions</source>
 <target>複製檔案系統權限</target>
 
-<source>Transfer file and folder 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>
@@ -921,35 +960,44 @@ Note: File names must be relative to base directories.
 <source>&Default</source>
 <target>預設(&D)</target>
 
-<source>Variant</source>
-<target>變數</target>
+<source>Source code written in C++ using:</source>
+<target>使用C++編寫的原始碼</target>
 
-<source>Statistics</source>
-<target>統計</target>
+<source>If you like FreeFileSync</source>
+<target>如果你喜歡FreeFileSync</target>
 
-<source>Don't show this dialog again</source>
-<target>不再顯示此對話框</target>
+<source>Donate with PayPal</source>
+<target>使用PayPal捐款</target>
 
-<source>Find what:</source>
-<target>尋找內容：</target>
+<source>Feedback and suggestions are welcome</source>
+<target>歡迎反饋意見和建議</target>
 
-<source>Match case</source>
-<target>區分大小寫</target>
+<source>Homepage</source>
+<target>首頁</target>
 
-<source>&Find next</source>
-<target>找下一個(&F)</target>
+<source>Email</source>
+<target>信箱</target>
 
-<source>Delete</source>
-<target>刪除</target>
+<source>Published under the GNU General Public License</source>
+<target>在GNU通用公共許可證下發佈</target>
 
-<source>Configure filter</source>
-<target>配置篩選</target>
+<source>Many thanks for localization:</source>
+<target>非常感謝本地化語系翻譯工作人員：</target>
 
 <source>Start synchronization</source>
 <target>開始同步</target>
 
-<source>Find</source>
-<target>尋找</target>
+<source>Comparison settings</source>
+<target>比對設定</target>
+
+<source>Synchronization settings</source>
+<target>同步設定</target>
+
+<source>Delete</source>
+<target>刪除</target>
+
+<source>Configure filter</source>
+<target>配置篩選</target>
 
 <source>Select time span</source>
 <target>選擇時間間隔</target>
@@ -957,6 +1005,9 @@ Note: File names must be relative to base directories.
 <source>Folder pairs</source>
 <target>配對資料夾</target>
 
+<source>Find</source>
+<target>尋找</target>
+
 <source>Overview</source>
 <target>摘要</target>
 
@@ -982,6 +1033,20 @@ Note: File names must be relative to base directories.
 <target>比對兩邊</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>你真的要執行 %x 項目的命令 %y 嗎？</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>確認</target>
+
+<source>&Execute</source>
+<target>執行(&E)</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1008,17 +1073,20 @@ Note: File names must be relative to base directories.
 <source>Set direction:</source>
 <target>設定方向：</target>
 
-<source>Exclude temporarily</source>
-<target>暫時排除</target>
+<source>multiple selection</source>
+<target>多重選擇</target>
 
-<source>Include temporarily</source>
-<target>暫時包括</target>
+<source>Include via filter:</source>
+<target>包括透過篩選器：</target>
 
 <source>Exclude via filter:</source>
 <target>使用篩選器排除：</target>
 
-<source>multiple selection</source>
-<target>多重選擇</target>
+<source>Exclude temporarily</source>
+<target>暫時排除</target>
+
+<source>Include temporarily</source>
+<target>暫時包括</target>
 
 <source>Include all</source>
 <target>包括所有</target>
@@ -1065,8 +1133,8 @@ Note: File names must be relative to base directories.
 <source>Do&n't save</source>
 <target>不儲存(&N)</target>
 
-<source>Never save changes</source>
-<target>不要儲存變更</target>
+<source>Never save &changes</source>
+<target>從不保存更改(&c)</target>
 
 <source>Show files that exist on left side only</source>
 <target>顯示只存在於左邊的檔案</target>
@@ -1119,8 +1187,11 @@ Note: File names must be relative to base directories.
 <source>All folders are in sync</source>
 <target>所有資料夾都是同步的</target>
 
-<source>Comma separated list</source>
-<target>逗號分隔清單</target>
+<source>Cannot find %x</source>
+<target>找不到 %x</target>
+
+<source>Comma-separated values</source>
+<target>以逗號分隔值</target>
 
 <source>File list exported</source>
 <target>檔案清單已匯出</target>
@@ -1128,8 +1199,8 @@ Note: File names must be relative to base directories.
 <source>Searching for program updates...</source>
 <target>正在搜尋程式更新...</target>
 
-<source>Ignore further errors</source>
-<target>忽略進一步錯誤</target>
+<source>&Ignore subsequent errors</source>
+<target>忽略後續的錯誤(&I)</target>
 
 <source>&Ignore</source>
 <target>忽略(&I)</target>
@@ -1137,8 +1208,8 @@ Note: File names must be relative to base directories.
 <source>Fatal Error</source>
 <target>嚴重錯誤</target>
 
-<source>Don't show this warning again</source>
-<target>不再顯示此警告</target>
+<source>&Don't show this warning again</source>
+<target>不要再顯示此警告(&D)</target>
 
 <source>&Switch</source>
 <target>切換(&S)</target>
@@ -1173,17 +1244,11 @@ Note: File names must be relative to base directories.
 <source>Completed</source>
 <target>已完成</target>
 
-<source>Continue</source>
-<target>繼續</target>
-
-<source>Pause</source>
-<target>暫停</target>
+<source>&Continue</source>
+<target>繼續(&C)</target>
 
-<source>Logging</source>
-<target>日誌記錄</target>
-
-<source>Cannot find %x</source>
-<target>找不到 %x</target>
+<source>Log</source>
+<target>日誌</target>
 
 <source>Inactive</source>
 <target>停用</target>
@@ -1216,11 +1281,11 @@ Note: File names must be relative to base directories.
 <target>篩選器</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>您確定要將下列 %x 項目移動到資源回收筒嗎？</pluralform>
+<pluralform>你真的要將以下項目 %x 移動到資源回收筒嗎？</pluralform>
 </target>
 
 <source>
@@ -1228,7 +1293,7 @@ Note: File names must be relative to base directories.
 <pluralform>Do you really want to delete the following %x items?</pluralform>
 </source>
 <target>
-<pluralform>您確定要將下列 %x 項目刪除嗎？</pluralform>
+<pluralform>您真的要將下列 %x 項目刪除嗎？</pluralform>
 </target>
 
 <source>Direct</source>
@@ -1273,9 +1338,6 @@ Note: File names must be relative to base directories.
 <source>Append a timestamp to each file name</source>
 <target>將時間戳記附加到每個檔案名稱上</target>
 
-<source>Folder</source>
-<target>資料夾</target>
-
 <source>File</source>
 <target>檔案</target>
 
@@ -1393,7 +1455,7 @@ Note: File names must be relative to base directories.
 <source>Cannot change process I/O priorities.</source>
 <target>無法更改I/O處理優先順序。</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
+<source>Unable to move %x to the recycle bin.</source>
 <target>無法將 %x 移動到資源回收筒。</target>
 
 <source>Cannot determine final path for %x.</source>
diff --git a/BUILD/Languages/croatian.lng b/BUILD/Languages/croatian.lng
index 8407fe7f..1db53365 100644
--- a/BUILD/Languages/croatian.lng
+++ b/BUILD/Languages/croatian.lng
@@ -7,6 +7,9 @@
 	<plural_definition>n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2</plural_definition>
 </header>
 
+<source>Close search bar</source>
+<target></target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Obje su strane promjenjene od posljednje sinkronizacije.</target>
 
@@ -25,14 +28,14 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Provjeravam dosupnost koša za smeće za mapu %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>Premještam datoteku %x u Koš za smeće</target>
+<source>Moving file %x to the recycle bin</source>
+<target>Premještam datoteku %x u koš</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>Premještam mapu %x u Koš za smeće</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>Premještam datoteku %x u koš</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Premještam simboličnu poveznicu %x u Koš za smeće</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>Premještam simobličnu opveznicu %x u koš</target>
 
 <source>Deleting file %x</source>
 <target>Brisanje datoteke %x</target>
@@ -43,8 +46,8 @@
 <source>Deleting symbolic link %x</source>
 <target>Brisanje simboličnih poveznica %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>Koš nije dostupan za sljedeće mape. Datoteke će biti nepovratno izbrisane:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Koš nije dosuutpan za sljedeće mape. Zbog toga će datoteke biti trajno obrisane:</target>
 
 <source>An exception occurred</source>
 <target>Dogodilo se izuzeće</target>
@@ -310,8 +313,8 @@
 <source>Browse directory</source>
 <target>Odaberi direktorij</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Ne mogu pristupiti Volume Shadow Copy Servisu</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Ne mogu pristupiti Voulme Shadow Copy servisu.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Molimo koristite FreeFileSync 64-bitnu verziju za izradu shadow kopija na ovom sustavu</target>
@@ -531,12 +534,15 @@ Naredba će biti pokrenuta ako se:
 <source>Generating database...</source>
 <target>Izrađujem bazu podataka...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Izrađujem Volume Shadow Kopiju za %x...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Lreiram Volume Shadow Copy za %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Greška pri provjeri podataka: %x i %y imaju različit sadržaj.</target>
 
+<source>job name</source>
+<target>Ime zadatka</target>
+
 <source>Synchronization aborted</source>
 <target>Sinkronizacija prekinuta</target>
 
@@ -687,8 +693,8 @@ Naredba će biti pokrenuta ako se:
 <source>&Export file list...</source>
 <target>&Izvoz liste datoteka...</target>
 
-<source>&Global settings...</source>
-<target>&Globalne postavke...</target>
+<source>&Global settings</source>
+<target>&Globalne postavke</target>
 
 <source>&Tools</source>
 <target>&Alati</target>
@@ -705,12 +711,6 @@ Naredba će biti pokrenuta ako se:
 <source>Compare</source>
 <target>Usporedi</target>
 
-<source>Comparison settings</source>
-<target>Postavke usporedbe</target>
-
-<source>Synchronization settings</source>
-<target>Postavke sinkronizacije</target>
-
 <source>Synchronize</source>
 <target>Sinkroniziraj</target>
 
@@ -723,6 +723,12 @@ Naredba će biti pokrenuta ako se:
 <source>Swap sides</source>
 <target>Zamjeni strane</target>
 
+<source>Find what:</source>
+<target>Nađi što:</target>
+
+<source>Match case</source>
+<target>Poklopi se</target>
+
 <source>Save as batch job</source>
 <target>Spremi kao slijedni zadatak</target>
 
@@ -777,8 +783,8 @@ Naredba će biti pokrenuta ako se:
 <source>Statistics</source>
 <target>Statistika</target>
 
-<source>Don't show this dialog again</source>
-<target>Ne prikazuj ovaj prozor ponovno</target>
+<source>&Don't show this dialog again</source>
+<target>&Nemoj više prikazivati ovaj dijaloški prozor</target>
 
 <source>Select a variant</source>
 <target>Odaberite varijantu</target>
@@ -828,6 +834,12 @@ jednak
 <source>Configure your own synchronization rules.</source>
 <target>Konfigurirajte vaša vlastita sinkronizacijska pravila.</target>
 
+<source>Detect moved files</source>
+<target>Proađene preseljene datoteke</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Zahtjevaju se datoteke baze. Nisu podržai svi datotečni sustavi.</target>
+
 <source>Error handling</source>
 <target>Greška pri obradi</target>
 
@@ -852,17 +864,17 @@ jednak
 <source>Delete or overwrite files permanently</source>
 <target>Trajno izbriši ili prepiši datoteke</target>
 
-<source>Recycle Bin</source>
-<target>Koš za smeće</target>
+<source>Recycle bin</source>
+<target>Koš</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Koristi Smeće za izbrisane i prepisane datoteke</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Spremi obrisae ili prepisane datoteke u koš</target>
 
 <source>Versioning</source>
 <target>Označi</target>
 
-<source>Move files to user-defined folder</source>
-<target>Premjesti datoteke u određenu mapu</target>
+<source>Move files to a user-defined folder</source>
+<target>Premjesti datoteke u mapu određenu od korsnika</target>
 
 <source>Naming convention:</source>
 <target>Pravilo imena:</target>
@@ -870,8 +882,8 @@ jednak
 <source>Batch job</source>
 <target>Slijedni zadatak</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Stvaranje batch datoteka za sinkronizaciju bez nadzora. Za početak, dvaput kliknite na ovu datoteku ili planirajte u planeru zadataka: %x</target>
 
 <source>Exit</source>
 <target>Izađi</target>
@@ -894,30 +906,6 @@ jednak
 <source>Limit maximum number of log files</source>
 <target>Ograniči maksimalan broj izvješća</target>
 
-<source>Source code written in C++ using:</source>
-<target>Izvorni kod napisan u C++ uz korištenje:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Ako volite FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Doniraj s PayPal</target>
-
-<source>Many thanks for localization:</source>
-<target>Velike zahvale idu:</target>
-
-<source>Feedback and suggestions are welcome</source>
-<target>Povratne informacije i prijedlozi su dobrodošli</target>
-
-<source>Homepage</source>
-<target>Početna stranica</target>
-
-<source>Email</source>
-<target>Email</target>
-
-<source>Published under the GNU General Public License</source>
-<target>Objavljeno pod licencom GNU General Public</target>
-
 <source>Delete on both sides</source>
 <target>Izbriši na obje strane</target>
 
@@ -925,12 +913,12 @@ jednak
 <target>Izbriši na obje strane iako je označena datoteka samo na jednoj strani</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Samo datoteke koje odgovaraju svim filterskim postavkama će biti sinkronizirane.
-Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
+Datoteke će biti kopirane ukoliko zadovolje sve zahtjeve filtera.
+Pažnja: Putanje datoteka moraju biti relativne na ishodni direktorij.
 </target>
 
 <source>Include</source>
@@ -960,20 +948,20 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Prvo kopiraj u privremenu datoteku (*ffs_tmp) zatim promijeni ime. Ovo osigurava dosljedno stanje čak i kod fatalne greške.</target>
 
 <source>Copy locked files</source>
 <target>Kopiraj zaključane datoteke</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Kopiraj zajedničke ili zaključane datoteke koristeći Volume Shadow Copy Servis(Zahtjeva Administratorske ovlasti)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Kopiraj dijeljene ili zaključane datoteke koristeći Volume Shadow Copy servis (potrebna su administratorska ovlaštenja)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopiraj datotečna dopuštenja</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Premjesti datotečna dopuštenja (Zahtjeva administratorska prava)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Prenesi dozvole za mape i datoteke (potrebna su administratorska ovlaštenja)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Prikaži skrivene prozore</target>
@@ -987,33 +975,54 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>&Default</source>
 <target>&Zadano</target>
 
-<source>Find what:</source>
-<target>Nađi što:</target>
+<source>Source code written in C++ using:</source>
+<target>Izvorni kod napisan u C++ uz korištenje:</target>
 
-<source>Match case</source>
-<target>Poklopi se</target>
+<source>If you like FreeFileSync</source>
+<target>Ako volite FreeFileSync</target>
 
-<source>&Find next</source>
-<target>&Nađi slijedeće</target>
+<source>Donate with PayPal</source>
+<target>Doniraj s PayPal</target>
+
+<source>Feedback and suggestions are welcome</source>
+<target>Povratne informacije i prijedlozi su dobrodošli</target>
+
+<source>Homepage</source>
+<target>Početna stranica</target>
+
+<source>Email</source>
+<target>Email</target>
+
+<source>Published under the GNU General Public License</source>
+<target>Objavljeno pod licencom GNU General Public</target>
+
+<source>Many thanks for localization:</source>
+<target>Velike zahvale idu:</target>
 
 <source>Start synchronization</source>
 <target>Započni sinkronizaciju</target>
 
+<source>Comparison settings</source>
+<target>Postavke usporedbe</target>
+
+<source>Synchronization settings</source>
+<target>Postavke sinkronizacije</target>
+
 <source>Delete</source>
 <target>Izbriši</target>
 
 <source>Configure filter</source>
 <target>Konfiguriraj filter</target>
 
-<source>Find</source>
-<target>Pronađi</target>
-
 <source>Select time span</source>
 <target>Izaberite mjerni raspon</target>
 
 <source>Folder pairs</source>
 <target>Par mape</target>
 
+<source>Find</source>
+<target>Pronađi</target>
+
 <source>Overview</source>
 <target>Pregled</target>
 
@@ -1054,9 +1063,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>&Execute</source>
 <target>&Izvrši</target>
 
-<source>&Don't show this dialog again</source>
-<target>&Nemoj više prikazivati ovaj dijaloški prozor</target>
-
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
@@ -1090,17 +1096,20 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>Set direction:</source>
 <target>Odaberi smijer:</target>
 
-<source>Exclude temporarily</source>
-<target>Izuzmi privremeno</target>
+<source>multiple selection</source>
+<target>višestruki odabir</target>
 
-<source>Include temporarily</source>
-<target>Trenutno uključi</target>
+<source>Include via filter:</source>
+<target>Pridruži preko filtera:</target>
 
 <source>Exclude via filter:</source>
 <target>Isključi preko filtra:</target>
 
-<source>multiple selection</source>
-<target>višestruki odabir</target>
+<source>Exclude temporarily</source>
+<target>Izuzmi privremeno</target>
+
+<source>Include temporarily</source>
+<target>Trenutno uključi</target>
 
 <source>Include all</source>
 <target>Uključi sve</target>
@@ -1147,8 +1156,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>Do&n't save</source>
 <target>&Nemoj spremiti</target>
 
-<source>Never save changes</source>
-<target>Nikad ne spremaj promjene</target>
+<source>Never save &changes</source>
+<target>Nikad ne spremaj &promjene</target>
 
 <source>Show files that exist on left side only</source>
 <target>Prikaži datoteke koje postoje samo na lijevoj strani</target>
@@ -1201,6 +1210,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>All folders are in sync</source>
 <target>Sve mape su u sinkronizaciji</target>
 
+<source>Cannot find %x</source>
+<target>Nemogu pronaći %x</target>
+
 <source>Comma-separated values</source>
 <target>Zarezom odvojene vrijednosti</target>
 
@@ -1210,8 +1222,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>Searching for program updates...</source>
 <target>Pretražujem ažuriranja programa...</target>
 
-<source>Ignore further errors</source>
-<target>Zanemari buduće greške</target>
+<source>&Ignore subsequent errors</source>
+<target>&Zanemari naknadne pogreške</target>
 
 <source>&Ignore</source>
 <target>&Ignoriraj</target>
@@ -1219,8 +1231,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>Fatal Error</source>
 <target>Kritična greška</target>
 
-<source>Don't show this warning again</source>
-<target>Ne prikazuj ovo upozorenje ponovno</target>
+<source>&Don't show this warning again</source>
+<target>&Ne prikazuj više ovo upozorenje.</target>
 
 <source>&Switch</source>
 <target>&Zamjeni</target>
@@ -1261,9 +1273,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>Log</source>
 <target>Dnevnik</target>
 
-<source>Cannot find %x</source>
-<target>Nemogu pronaći %x</target>
-
 <source>Inactive</source>
 <target>Neaktivno</target>
 
@@ -1295,8 +1304,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <target>Filtriranje</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
 <pluralform>Dali stvarno želite premjestiti sljedeću %x stavku u koš?</pluralform>
@@ -1479,8 +1488,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>Cannot change process I/O priorities.</source>
 <target>Ne može se promjeniti proces I/O prioriteta</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Nije moguće premjestiti %x u koš za smeće.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>Nije moguće prebaciti %x u koš za smeće.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>Ne mogu odrediti završnu putanju za %x.</target>
diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng
index 0b77b086..9762fbb7 100644
--- a/BUILD/Languages/czech.lng
+++ b/BUILD/Languages/czech.lng
@@ -25,13 +25,13 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Kontrola Koše na složku %x ...</target>
 
-<source>Moving file %x to recycle bin</source>
+<source>Moving file %x to the recycle bin</source>
 <target>Přesouvání souboru %x do Koše</target>
 
-<source>Moving folder %x to recycle bin</source>
+<source>Moving folder %x to the recycle bin</source>
 <target>Přesouvání adresáře %x do Koše</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
+<source>Moving symbolic link %x to the recycle bin</source>
 <target>Přesouvání symbolického odkazu %x do Koše</target>
 
 <source>Deleting file %x</source>
@@ -43,14 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>Mazání symbolického odkazu %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>Nelze použít Koš pro následující složky (soubory budou odstraněny permanentně):</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Nelze použít Koš pro následující složky. Soubory tak budou odstraněny permanentně:</target>
 
 <source>An exception occurred</source>
 <target>Vyskytla se chyba</target>
 
-<source>Cannot find file %x.</source>
-<target>Nelze najít soubor %x.</target>
+<source>A directory path is expected after %x.</source>
+<target>Očekávána adresářová cesta po %x.</target>
+
+<source>Syntax error</source>
+<target>Chyba syntaxe</target>
+
+<source>Cannot open file %x.</source>
+<target>Nelze otevřít soubor %x.</target>
 
 <source>Error</source>
 <target>Chyba</target>
@@ -58,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>Soubor %x neobsahuje platnou konfiguraci.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Zjištěn nestejný počet levých a pravých adresářů.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Konfigurační soubor nesmí obsahovat nastavení na úrovni adresářových párů pokud je zadán přes příkazovou řádku.</target>
+
+<source>Warning</source>
+<target>Varování</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Adresáře nemohou obsahovat více než jeden konfigurační soubor.</target>
+
+<source>Syntax:</source>
+<target>Syntaxe:</target>
+
+<source>config files</source>
+<target>konfigurační soubory</target>
+
+<source>directory</source>
+<target>adresář</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Libovolný počet konfiguračních souborů FreeFileSync typu .ffs_gui a/nebo .ffs_batch.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Libovolný počet alternativních adresářů na alespoň jednu konfiguraci.</target>
+
+<source>Command line</source>
+<target>Příkazová řádka</target>
+
 <source>A folder input field is empty.</source>
 <target>Není zadána vstupní složka.</target>
 
@@ -216,8 +252,8 @@
 <target>Celkový čas:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
 <pluralform>%x B</pluralform>
@@ -244,13 +280,13 @@
 <target>Zpracováváno:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 proces]</pluralform>
-<pluralform>[%x procesy]</pluralform>
-<pluralform>[%x procesů]</pluralform>
+<pluralform>1 proces</pluralform>
+<pluralform>%x procesy</pluralform>
+<pluralform>%x procesů</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -259,6 +295,9 @@
 <source>/sec</source>
 <target>/s</target>
 
+<source>%x items</source>
+<target>%x položek</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Konfigurace ze souboru %x byla načtena jen částečně.</target>
 
@@ -271,7 +310,7 @@
 <source>Browse directory</source>
 <target>Procházet adresář</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
+<source>Cannot access the Volume Shadow Copy Service.</source>
 <target>Nepodařil se přístup ke službě Stínové kopie.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
@@ -283,8 +322,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>>Nelze zjistit jméno jednotky souboru %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Disk %x není součástí jména souboru %y.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>Název disku %x není součástí cesty souboru %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Požadavek na přerušení: Čekání na ukončení aktuální operace...</target>
@@ -352,9 +391,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Prodleva mezi zjištěním poslední změny a spuštěním příkazu</target>
 
-<source>Command line</source>
-<target>Příkazová řádka</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -378,9 +414,6 @@ Příkaz je spuštěn když:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatická synchronizace</target>
 
-<source>Warning</source>
-<target>Varování</target>
-
 <source>Build: %x</source>
 <target>Verze: %x</target>
 
@@ -390,15 +423,21 @@ Příkaz je spuštěn když:
 <source>All files</source>
 <target>Všechny soubory</target>
 
+<source>Directory monitoring active</source>
+<target>Sledování adresářů je aktivní</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Čekání na nedostupné adresáře...</target>
+
 <source>&Restore</source>
 <target>&Obnovit</target>
 
+<source>&Show error</source>
+<target>&Zobrazit chybu</target>
+
 <source>&Exit</source>
 <target>&Konec</target>
 
-<source>Waiting for missing directories...</source>
-<target>Čekání na nedostupné adresáře...</target>
-
 <source>Invalid command line:</source>
 <target>Neplatný příkaz:</target>
 
@@ -408,14 +447,14 @@ Příkaz je spuštěn když:
 <source>File time and size</source>
 <target>Podle velikosti a data souboru</target>
 
-<source> Two way </source>
-<target> Databáze </target>
+<source>Two way</source>
+<target>Databáze</target>
 
 <source>Mirror</source>
-<target>Zrcadlení </target>
+<target>Zrcadlení</target>
 
 <source>Update</source>
-<target>Aktualizace </target>
+<target>Aktualizace</target>
 
 <source>Custom</source>
 <target>Vlastní</target>
@@ -471,11 +510,8 @@ Příkaz je spuštěn když:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Následující položky jsou nevyřešené konflikty a nebudou synchronizovány:</target>
 
-<source>Significant difference detected:</source>
-<target>Nalezeny významné změny:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Více než polovina souborů má být zkopírována nebo smazána.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Nsledující složky se významně liší. Zkontrolujte zda porovnáváte správnou dvojici složek pro synchronizaci.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Nedostatek místa na disku:</target>
@@ -495,12 +531,15 @@ Příkaz je spuštěn když:
 <source>Generating database...</source>
 <target>Vytváření databáze...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
+<source>Creating a Volume Shadow Copy for %x...</source>
 <target>Vytváření Stínové kopie pro %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Chyba porovnání dat: %x má jiný obsah než %y</target>
 
+<source>job name</source>
+<target>název úlohy</target>
+
 <source>Synchronization aborted</source>
 <target>Synchronizace zrušena</target>
 
@@ -525,6 +564,9 @@ Příkaz je spuštěn když:
 <source>Switching to FreeFileSync main dialog</source>
 <target>Přepínání do hlavního okna FreeFileSync</target>
 
+<source>Retrying operation after error:</source>
+<target>Opakovaní operace po chybě:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Je dostupná novější verze FreeFileSync:</target>
 
@@ -648,8 +690,8 @@ Příkaz je spuštěn když:
 <source>&Export file list...</source>
 <target>&Exportovat seznam souborů...</target>
 
-<source>&Global settings...</source>
-<target>&Nastavení...</target>
+<source>&Global settings</source>
+<target>&Nastavení programu</target>
 
 <source>&Tools</source>
 <target>&Upřesnit</target>
@@ -666,12 +708,6 @@ Příkaz je spuštěn když:
 <source>Compare</source>
 <target>Porovnání</target>
 
-<source>Comparison settings</source>
-<target>Nastavení porovnání</target>
-
-<source>Synchronization settings</source>
-<target>Nastavení synchronizace</target>
-
 <source>Synchronize</source>
 <target>Synchronizace</target>
 
@@ -720,6 +756,9 @@ Příkaz je spuštěn když:
 <source>Synchronizing...</source>
 <target>Synchronizuji...</target>
 
+<source>Minimize to notification area</source>
+<target>Minimalizovat do oznamovací oblasti</target>
+
 <source>On completion</source>
 <target>Po dokončení</target>
 
@@ -729,6 +768,15 @@ Příkaz je spuštěn když:
 <source>&Pause</source>
 <target>&Pauza</target>
 
+<source>Variant</source>
+<target>Varianta</target>
+
+<source>Statistics</source>
+<target>Statistika</target>
+
+<source>&Don't show this dialog again</source>
+<target>Tento dialog již &nezobrazovat</target>
+
 <source>Select a variant</source>
 <target>Výběr možnosti</target>
 
@@ -777,6 +825,12 @@ je stejný
 <source>Configure your own synchronization rules.</source>
 <target>Nastavení vlastních pravidel synchronizace.</target>
 
+<source>Detect moved files</source>
+<target>Detekce přesunutých souborů</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Je nutný soubor databáze. Toto není dostupné na všech systémech.</target>
+
 <source>Error handling</source>
 <target>Zpracování chyb</target>
 
@@ -801,16 +855,16 @@ je stejný
 <source>Delete or overwrite files permanently</source>
 <target>Smazat nebo přepsat soubory trvale</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Koš</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
+<source>Back up deleted and overwritten files in the recycle bin</source>
 <target>Použít Koš při mazání nebo přepisu souborů</target>
 
 <source>Versioning</source>
 <target>Verzování</target>
 
-<source>Move files to user-defined folder</source>
+<source>Move files to a user-defined folder</source>
 <target>Přesunout soubory do uživatelského adresáře</target>
 
 <source>Naming convention:</source>
@@ -819,8 +873,8 @@ je stejný
 <source>Batch job</source>
 <target>Dávkový soubor</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Vytvoří dávkový souboru pro automatickou synchronizaci. Ke spuštění dávky jednoduše poklikejte na vytvořený soubor nebo využijte plánovač úloh vašeho systému: %x</target>
 
 <source>Exit</source>
 <target>Konec</target>
@@ -852,9 +906,6 @@ je stejný
 <source>Donate with PayPal</source>
 <target>Přispět pomocí PayPal</target>
 
-<source>Many thanks for localization:</source>
-<target>Poděkování za překlad FreeFileSync:</target>
-
 <source>Feedback and suggestions are welcome</source>
 <target>Komentáře a náměty jsou vždy vítány</target>
 
@@ -867,6 +918,9 @@ je stejný
 <source>Published under the GNU General Public License</source>
 <target>Vydáno pod GNU General Public License (GPL)</target>
 
+<source>Many thanks for localization:</source>
+<target>Poděkování za překlad FreeFileSync:</target>
+
 <source>Delete on both sides</source>
 <target>Smazat z obou stran</target>
 
@@ -874,8 +928,8 @@ je stejný
 <target>Smazat na obou stranách i když je soubor vybrán pouze na jedné z nich</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
 Pouze soubory odpovídající nastavenému filtru budou vybrány pro synchronizaci.
@@ -909,19 +963,19 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <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>
-<target>Kopíruje data nejprve do pomocného souboru (*.ffs_tmp) a poté teprve soubor přejmenuje. Tento postup zajišťuje bezpečné chování i v případě chyby během přenosu</target>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Kopírovat nejprve do pomocného souboru (*.ffs_tmp) a teprve poté soubor přejmenovat. Tento postup zajišťuje bezpečné chování i v případě chyby během přenosu</target>
 
 <source>Copy locked files</source>
 <target>Kopírovat zamčené soubory</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
 <target>Kopírovat sdílené nebo zamčené soubory pomocí služby Stínové kopie (Vyžaduje administrátorské oprávnění)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopírovat přístupová oprávnění k souborům</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
 <target>Přenést přístupová oprávnění souborů a složek (Vyžaduje administrátorské oprávnění)</target>
 
 <source>Restore hidden dialogs</source>
@@ -936,15 +990,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>&Default</source>
 <target>&Předdefinované</target>
 
-<source>Variant</source>
-<target>Varianta</target>
-
-<source>Statistics</source>
-<target>Statistika</target>
-
-<source>Don't show this dialog again</source>
-<target>Tento dialog již nezobrazovat</target>
-
 <source>Find what:</source>
 <target>Najít:</target>
 
@@ -954,15 +999,21 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>&Find next</source>
 <target>&Najít další</target>
 
+<source>Start synchronization</source>
+<target>Start synchronizace</target>
+
+<source>Comparison settings</source>
+<target>Nastavení porovnání</target>
+
+<source>Synchronization settings</source>
+<target>Nastavení synchronizace</target>
+
 <source>Delete</source>
 <target>Smazat</target>
 
 <source>Configure filter</source>
 <target>Nastavení filtru</target>
 
-<source>Start synchronization</source>
-<target>Start synchronizace</target>
-
 <source>Find</source>
 <target>Najít</target>
 
@@ -997,6 +1048,22 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <target>Porovnat obě strany</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Opravdu chcete provést příkaz %y pro 1 položku?</pluralform>
+<pluralform>Opravdu chcete provést příkaz %y pro %x položky?</pluralform>
+<pluralform>Opravdu chcete provést příkaz %y pro %x položek?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Potvrdit</target>
+
+<source>&Execute</source>
+<target>&Spustit</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1035,12 +1102,15 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Include temporarily</source>
 <target>Přidat dočasně</target>
 
-<source>Exclude via filter:</source>
-<target>Vynechat pomocí filtru:</target>
-
 <source>multiple selection</source>
 <target>vícenásobný výběr</target>
 
+<source>Include via filter:</source>
+<target>Zahrnout pomocí filtru:</target>
+
+<source>Exclude via filter:</source>
+<target>Vynechat pomocí filtru:</target>
+
 <source>Include all</source>
 <target>Zahrnout vše</target>
 
@@ -1086,8 +1156,8 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Do&n't save</source>
 <target>&Neukládat</target>
 
-<source>Never save changes</source>
-<target>Nikdy neukládat změny</target>
+<source>Never save &changes</source>
+<target>Nikdy &neukládat změny</target>
 
 <source>Show files that exist on left side only</source>
 <target>Zobrazit soubory existující pouze vlevo</target>
@@ -1140,7 +1210,7 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>All folders are in sync</source>
 <target>Všechny složky jsou synchronizovány</target>
 
-<source>Comma separated list</source>
+<source>Comma-separated values</source>
 <target>Text oddělený čárkami</target>
 
 <source>File list exported</source>
@@ -1149,8 +1219,8 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Searching for program updates...</source>
 <target>Hledání aktualizací programu ...</target>
 
-<source>Ignore further errors</source>
-<target>Přeskočit další chyby</target>
+<source>&Ignore subsequent errors</source>
+<target>Pře&skočit další chyby</target>
 
 <source>&Ignore</source>
 <target>&Pokračovat</target>
@@ -1158,8 +1228,8 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Fatal Error</source>
 <target>Závažná chyba</target>
 
-<source>Don't show this warning again</source>
-<target>Nezobrazovat již příště toto varování</target>
+<source>&Don't show this warning again</source>
+<target>&Nezobrazovat již příště toto varování</target>
 
 <source>&Switch</source>
 <target>&Přepnout</target>
@@ -1194,13 +1264,10 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Completed</source>
 <target>Hotovo</target>
 
-<source>Continue</source>
-<target>Pokračovat</target>
-
-<source>Pause</source>
-<target>Pauza</target>
+<source>&Continue</source>
+<target>&Pokračovat</target>
 
-<source>Logging</source>
+<source>Log</source>
 <target>Záznam zpracování</target>
 
 <source>Cannot find %x</source>
@@ -1237,8 +1304,8 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <target>Filtr</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
 <pluralform>Opravdu chcete přesunout následující položku do Koše?</pluralform>
@@ -1298,9 +1365,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Append a timestamp to each file name</source>
 <target>Přidat časovou značku ke jménu souboru</target>
 
-<source>Folder</source>
-<target>Složka</target>
-
 <source>File</source>
 <target>Soubor</target>
 
@@ -1424,7 +1488,7 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Cannot change process I/O priorities.</source>
 <target>Nelze nastavit priority procesu.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
+<source>Unable to move %x to the recycle bin.</source>
 <target>Není možné přesunout %x do Koše.</target>
 
 <source>Cannot determine final path for %x.</source>
diff --git a/BUILD/Languages/danish.lng b/BUILD/Languages/danish.lng
index bc01b271..a835f88c 100644
--- a/BUILD/Languages/danish.lng
+++ b/BUILD/Languages/danish.lng
@@ -25,14 +25,14 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Tjekker papirkurvs tilgængelighed for mappen %x...</target>
 
-<source>Moving file %x to recycle bin</source>
+<source>Moving file %x to the recycle bin</source>
 <target>Flytter filen %x til papirkurv</target>
 
-<source>Moving folder %x to recycle bin</source>
+<source>Moving folder %x to the recycle bin</source>
 <target>Flytter mappen %x til papirkurv</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Flytter symlink %x til papirkurv</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>Flytter symbolsk link %x til papirkurv</target>
 
 <source>Deleting file %x</source>
 <target>Sletter filen %x</target>
@@ -43,20 +43,56 @@
 <source>Deleting symbolic link %x</source>
 <target>Sletter symlink %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
 <target>Papirkurven kan ikke bruges til følgende mapper. Filerne slettes permanent:</target>
 
 <source>An exception occurred</source>
 <target>Undtagelse opstod</target>
 
-<source>Cannot find file %x.</source>
-<target>Kan ikke finde filen %x.</target>
+<source>A directory path is expected after %x.</source>
+<target>Der forventes en mappestil efter %x.</target>
+
+<source>Syntax error</source>
+<target>Syntaksfejl</target>
+
+<source>Cannot open file %x.</source>
+<target>Filen %x kan ikke åbnes.</target>
 
 <source>Error</source>
 <target>Fejl</target>
 
 <source>File %x does not contain a valid configuration.</source>
-<target>%x indeholder ikke gyldige indstillinger.</target>
+<target>Filen %x indeholder ikke gyldige indstillinger.</target>
+
+<source>Unequal number of left and right directories specified.</source>
+<target>Der er angivet et ulige antal højre og venstre mapper.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Indstillingsfilen må ikke indeholde indstillinger på mappepar niveau når mapper er sat via kommando.</target>
+
+<source>Warning</source>
+<target>Advarsel</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Mapper kan ikke sættes til mere end en indstillingsfil.</target>
+
+<source>Syntax:</source>
+<target>Syntaks:</target>
+
+<source>config files</source>
+<target>indstillingsfiler</target>
+
+<source>directory</source>
+<target>mappe</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Vilkårligt antal FreeFileSync .ffs_gui og/eller .ffs_batch indstillingsfiler.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Vilkårligt antal alternative mappe til højst en indstillingsfil</target>
+
+<source>Command line</source>
+<target>Kommando</target>
 
 <source>A folder input field is empty.</source>
 <target>Der er ikke valgt nogen mapper.</target>
@@ -215,8 +251,8 @@
 <target>Samlet tid:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
 <pluralform>1 byte</pluralform>
@@ -242,12 +278,12 @@
 <target>Skanner:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 tråd]</pluralform>
-<pluralform>[%x tråde]</pluralform>
+<pluralform>1 tråd</pluralform>
+<pluralform>%x tråde</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -256,6 +292,9 @@
 <source>/sec</source>
 <target>/sek</target>
 
+<source>%x items</source>
+<target>%x emner</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Indstillingsfilen %x er kun delvist indlæst.</target>
 
@@ -268,8 +307,8 @@
 <source>Browse directory</source>
 <target>Gennemse mappe</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Kan ikke opnå adgang til VSS.</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>VSS tjenesten er ikke tilgængelig</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Brug FreeFileSync 64-bit til at lave VSS kopier på dette system.</target>
@@ -280,8 +319,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Kan ikke bestemme volumennavn for %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Drevnavn %x findes ikke i filnavnet %y.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>Volumennavnet %x er ikke del af filstien %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Afbrydelse: Venter på aktuel opgave afsluttes...</target>
@@ -349,9 +388,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Tid imellem sidst fundne ændring og udførsel</target>
 
-<source>Command line</source>
-<target>Kommando</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -375,9 +411,6 @@ Kommandoen udføres hvis:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>Realtids synk - automatisk synkronisering</target>
 
-<source>Warning</source>
-<target>Advarsel</target>
-
 <source>Build: %x</source>
 <target>Udgivet: %x</target>
 
@@ -387,15 +420,21 @@ Kommandoen udføres hvis:
 <source>All files</source>
 <target>Alle filer</target>
 
+<source>Directory monitoring active</source>
+<target>Mappeovervågning aktiv</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Venter til alle mapper er tilgængelige...</target>
+
 <source>&Restore</source>
 <target>&Vis vindue</target>
 
+<source>&Show error</source>
+<target>Vi&s fejl</target>
+
 <source>&Exit</source>
 <target>&Luk</target>
 
-<source>Waiting for missing directories...</source>
-<target>Venter på manglende mapper...</target>
-
 <source>Invalid command line:</source>
 <target>Ugyldig kommando:</target>
 
@@ -405,14 +444,14 @@ Kommandoen udføres hvis:
 <source>File time and size</source>
 <target>Størrelse og tid</target>
 
-<source> Two way </source>
-<target> Tovejs </target>
+<source>Two way</source>
+<target>Tovejs</target>
 
 <source>Mirror</source>
-<target>Spejling </target>
+<target>Spejling</target>
 
 <source>Update</source>
-<target>Opdater </target>
+<target>Opdater</target>
 
 <source>Custom</source>
 <target>Tilpasset</target>
@@ -468,11 +507,8 @@ Kommandoen udføres hvis:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Følgende emner har uløste konflikter og synkroniseres ikke:</target>
 
-<source>Significant difference detected:</source>
-<target>Markant forskel:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Mere end 50% af af filerne kopieres eller slettes.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Følgende mapper har markante forskelle. Kontroller at du synkroniserer de rigtige mapper</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Ikke nok ledig diskplads på:</target>
@@ -492,12 +528,15 @@ Kommandoen udføres hvis:
 <source>Generating database...</source>
 <target>Opretter database...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Opretter VVS kopi for %x...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Oprette VSS kopi for %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Godkendelsesfejl: %x og %y har forskelligt indhold</target>
 
+<source>job name</source>
+<target>Jobnavn</target>
+
 <source>Synchronization aborted</source>
 <target>Synkronisering afbrudt</target>
 
@@ -522,6 +561,9 @@ Kommandoen udføres hvis:
 <source>Switching to FreeFileSync main dialog</source>
 <target>Skifter til hovedvinduet</target>
 
+<source>Retrying operation after error:</source>
+<target>Prøver igen efter fejl:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Opdatering tilgængelig:</target>
 
@@ -645,8 +687,8 @@ Kommandoen udføres hvis:
 <source>&Export file list...</source>
 <target>&Eksporter filliste...</target>
 
-<source>&Global settings...</source>
-<target>&Programindstillinger...</target>
+<source>&Global settings</source>
+<target>&Programindstillinger</target>
 
 <source>&Tools</source>
 <target>&Værktøj</target>
@@ -717,6 +759,9 @@ Kommandoen udføres hvis:
 <source>Synchronizing...</source>
 <target>Synkroniserer...</target>
 
+<source>Minimize to notification area</source>
+<target>Minimér til uret</target>
+
 <source>On completion</source>
 <target>Ved gennemført</target>
 
@@ -726,6 +771,15 @@ Kommandoen udføres hvis:
 <source>&Pause</source>
 <target>&Pause</target>
 
+<source>Variant</source>
+<target>Jobtype</target>
+
+<source>Statistics</source>
+<target>Statistik</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Vis ikke igen</target>
+
 <source>Select a variant</source>
 <target>Vælg metode</target>
 
@@ -774,6 +828,12 @@ er identisk
 <source>Configure your own synchronization rules.</source>
 <target>Opret dine egne synkroniseringsregler.</target>
 
+<source>Detect moved files</source>
+<target>Genkend flyttede filer</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Kræver databasefiler. Ikke understøttet i alle filsystemer</target>
+
 <source>Error handling</source>
 <target>Fejlhåndtering</target>
 
@@ -798,17 +858,17 @@ er identisk
 <source>Delete or overwrite files permanently</source>
 <target>Slet eller overskriv filer permanent</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Papirkurv</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Slettede og overskrevne filer flyttes til papirkurv</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Backup slettede og overskrevne filer i papirkurven</target>
 
 <source>Versioning</source>
 <target>Versionering</target>
 
-<source>Move files to user-defined folder</source>
-<target>Flyt filer til valgt mappe</target>
+<source>Move files to a user-defined folder</source>
+<target>Flyt filer til brugerdefineret mappe</target>
 
 <source>Naming convention:</source>
 <target>Navneregler:</target>
@@ -816,8 +876,8 @@ er identisk
 <source>Batch job</source>
 <target>Batchfil</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 batchfil til automatisk synkronisering. Dobbeltklik på filen eller brug systemets opgavestyring: FreeFileSync.exe <opgave navn>.ffs_batch</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Opret batchfil til automatisk synkronisering. Start ved at dobbeltklikke på filen eller planlæg via opgavestyring: %x</target>
 
 <source>Exit</source>
 <target>Luk</target>
@@ -871,12 +931,12 @@ er identisk
 <target>Slet på begge sider selvom selvom filen kun er valgt på en side</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Synkroniserer kun filer der opfylder alle betingelser.
-Bemærk: Filnavne skal relatere til grundmapperne.
+Filer synkroniseres kun hvis de opfyldet alle filterregler.
+Bemærk: Filstier skal relatere til kildemappen.
 </target>
 
 <source>Include</source>
@@ -906,20 +966,20 @@ Bemærk: Filnavne skal relatere til grundmapperne.
 <source>Fail-safe file copy</source>
 <target>Sikker 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 til en midlertidig fil (*.ffs_tmp) og omdøb derefter. Dette garanterer sikkerheden selv ved fatale fejl.</target>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Kopiér til midlertidig fil (*.ffs_tmp) før omdøbning. Sikrer processen ved alvorlige fejl.</target>
 
 <source>Copy locked files</source>
 <target>Kopier låste filer</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Kopier delte eller låste filer ved hjælp af VSS (kræver administrative rettigheder)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Kopiér delte eller låste filer med VSS kopiering (administrator)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopier adgangstilladelser</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Overfør fil- og mappetilladelser (kræver administrative rettigheder)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Overfør fil og mappetilladelser (administrator)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Gendan skjulte dialoger</target>
@@ -933,15 +993,6 @@ Bemærk: Filnavne skal relatere til grundmapperne.
 <source>&Default</source>
 <target>S&tandard</target>
 
-<source>Variant</source>
-<target>Jobtype</target>
-
-<source>Statistics</source>
-<target>Statistik</target>
-
-<source>Don't show this dialog again</source>
-<target>Vis ikke igen</target>
-
 <source>Find what:</source>
 <target>Søg efter:</target>
 
@@ -951,15 +1002,15 @@ Bemærk: Filnavne skal relatere til grundmapperne.
 <source>&Find next</source>
 <target>&Find næste</target>
 
+<source>Start synchronization</source>
+<target>Start synkronisering</target>
+
 <source>Delete</source>
 <target>Slet</target>
 
 <source>Configure filter</source>
 <target>Indstil filter</target>
 
-<source>Start synchronization</source>
-<target>Start synkronisering</target>
-
 <source>Find</source>
 <target>Søg</target>
 
@@ -994,6 +1045,21 @@ Bemærk: Filnavne skal relatere til grundmapperne.
 <target>Analyser begge sider</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Vil du køre kommandoen %y for 1 emne?</pluralform>
+<pluralform>Vil du køre kommandoen %y for %x emner?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Bekræft</target>
+
+<source>&Execute</source>
+<target>&Udfør</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1029,12 +1095,15 @@ Bemærk: Filnavne skal relatere til grundmapperne.
 <source>Include temporarily</source>
 <target>Inkluder midlertidigt</target>
 
-<source>Exclude via filter:</source>
-<target>Ekskluder m. filter:</target>
-
 <source>multiple selection</source>
 <target>vælg flere</target>
 
+<source>Include via filter:</source>
+<target>Inkludér via filter:</target>
+
+<source>Exclude via filter:</source>
+<target>Ekskluder m. filter:</target>
+
 <source>Include all</source>
 <target>Vælg alle</target>
 
@@ -1080,8 +1149,8 @@ Bemærk: Filnavne skal relatere til grundmapperne.
 <source>Do&n't save</source>
 <target>&Gem ikke</target>
 
-<source>Never save changes</source>
-<target>Gem aldrig</target>
+<source>Never save &changes</source>
+<target>Gem &aldrig ændringer</target>
 
 <source>Show files that exist on left side only</source>
 <target>Vis filer der kun findes på venstre side</target>
@@ -1134,8 +1203,8 @@ Bemærk: Filnavne skal relatere til grundmapperne.
 <source>All folders are in sync</source>
 <target>Alle mapper er synkrone</target>
 
-<source>Comma separated list</source>
-<target>Kommaopdelt liste</target>
+<source>Comma-separated values</source>
+<target>Kommaopdelte værdier</target>
 
 <source>File list exported</source>
 <target>Fillisten blev eksporteret</target>
@@ -1143,8 +1212,8 @@ Bemærk: Filnavne skal relatere til grundmapperne.
 <source>Searching for program updates...</source>
 <target>Søger efter opdatering...</target>
 
-<source>Ignore further errors</source>
-<target>Ignorer fremtidige fejl</target>
+<source>&Ignore subsequent errors</source>
+<target>&Ignorer efterfølgende fejl</target>
 
 <source>&Ignore</source>
 <target>&Ignorer</target>
@@ -1152,8 +1221,8 @@ Bemærk: Filnavne skal relatere til grundmapperne.
 <source>Fatal Error</source>
 <target>Fatal fejl</target>
 
-<source>Don't show this warning again</source>
-<target>Vis ikke igen</target>
+<source>&Don't show this warning again</source>
+<target>&Vis ikke igen</target>
 
 <source>&Switch</source>
 <target>&Skift</target>
@@ -1188,14 +1257,11 @@ Bemærk: Filnavne skal relatere til grundmapperne.
 <source>Completed</source>
 <target>Gennemført</target>
 
-<source>Continue</source>
-<target>Fortsæt</target>
+<source>&Continue</source>
+<target>&Fortsæt</target>
 
-<source>Pause</source>
-<target>Pause</target>
-
-<source>Logging</source>
-<target>Rapporter</target>
+<source>Log</source>
+<target>Log</target>
 
 <source>Cannot find %x</source>
 <target>Kan ikke finde %x</target>
@@ -1231,11 +1297,11 @@ Bemærk: Filnavne skal relatere til grundmapperne.
 <target>Filter</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>Vil du flytte emnet til papirkurven?</pluralform>
+<pluralform>Vil du flytte følgende emne til papirkurven?</pluralform>
 <pluralform>Vil du flytte følgende %x emner til papirkurven?</pluralform>
 </target>
 
@@ -1290,9 +1356,6 @@ Bemærk: Filnavne skal relatere til grundmapperne.
 <source>Append a timestamp to each file name</source>
 <target>Føj tidsstempel til hvert filnavn</target>
 
-<source>Folder</source>
-<target>Mappe</target>
-
 <source>File</source>
 <target>Fil</target>
 
@@ -1413,8 +1476,8 @@ Bemærk: Filnavne skal relatere til grundmapperne.
 <source>Cannot change process I/O priorities.</source>
 <target>Kan ikke ændre I/O prioriteter.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Kan ikke flytte %x til papirkurv.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>Kunne ikke flytte %x til papirkurv.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>Kan ikke bestemme endelig sti for %x</target>
diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng
index 911893b9..dca4af40 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -1,6 +1,6 @@
 <header>
 	<language>Nederlands</language>
-	<translator>Edwin Dierssen && Jochem Sparla</translator>
+	<translator>Edwin Dierssen</translator>
 	<locale>nl_NL</locale>
 	<flag_image>flag_holland.png</flag_image>
 	<plural_form_count>2</plural_form_count>
@@ -25,13 +25,13 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Prullebak beschikbaarheid voor map %x te controleren...</target>
 
-<source>Moving file %x to recycle bin</source>
+<source>Moving file %x to the recycle bin</source>
 <target>Bezig met verplaatsen van bestand %x naar de prullenbak</target>
 
-<source>Moving folder %x to recycle bin</source>
+<source>Moving folder %x to the recycle bin</source>
 <target>Bezig met verplaatsen van map %x naar de prullenbak</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
+<source>Moving symbolic link %x to the recycle bin</source>
 <target>Bezig met verplaatsen van snelkoppeling %x naar de prullenbak</target>
 
 <source>Deleting file %x</source>
@@ -43,8 +43,8 @@
 <source>Deleting symbolic link %x</source>
 <target>Verwijderen van snelkoppeling %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>De Prullenbak is niet beschikbaar voor de volgende mappen. De bestanden zullen permanent worden verwijderd:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>De prullenbak is niet beschikbaar voor de volgende mappen. Bestanden zullen permanent verwijderd worden:</target>
 
 <source>An exception occurred</source>
 <target>Er heeft een uitzondering plaatsgevonden</target>
@@ -307,8 +307,8 @@
 <source>Browse directory</source>
 <target>Verken map</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Kan de Volume Schaduwkopie Service niet benaderen.</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Kan de Volume Shadow Copy Service niet benaderen.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Gebruik alstublieft de FreeFileSync 64-bit versie om schaduwkopieën te maken op dit systeem.</target>
@@ -528,12 +528,15 @@ De opdracht word geactiveerd als:
 <source>Generating database...</source>
 <target>Genereren van database...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Bezig met Volume Schaduwkopie te maken voor %x...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Aanmaken van een Volume Shadow Copy voor %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Data verificatie fout: %x en %y hebben een verschillende inhoud.</target>
 
+<source>job name</source>
+<target>taaknaam</target>
+
 <source>Synchronization aborted</source>
 <target>Synchronisatie afgebroken</target>
 
@@ -684,8 +687,8 @@ De opdracht word geactiveerd als:
 <source>&Export file list...</source>
 <target>&Exporteer bestandslijst...</target>
 
-<source>&Global settings...</source>
-<target>&Algemene instellingen...</target>
+<source>&Global settings</source>
+<target>&Algemene instellingen</target>
 
 <source>&Tools</source>
 <target>&Gereedschap</target>
@@ -774,8 +777,8 @@ De opdracht word geactiveerd als:
 <source>Statistics</source>
 <target>Statistieken</target>
 
-<source>Don't show this dialog again</source>
-<target>Laat deze dialoog niet meer zien</target>
+<source>&Don't show this dialog again</source>
+<target>Laat deze dialoog &niet meer zien</target>
 
 <source>Select a variant</source>
 <target>Selecteer een variant</target>
@@ -825,6 +828,12 @@ overeenkomt
 <source>Configure your own synchronization rules.</source>
 <target>Configureer uw eigen synchronisatieregels.</target>
 
+<source>Detect moved files</source>
+<target>Detecteer verplaatste bestanden</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Heeft database bestanden nodig. Wordt niet ondersteund door alle bestandssystemen</target>
+
 <source>Error handling</source>
 <target>Fout afhandeling</target>
 
@@ -849,16 +858,16 @@ overeenkomt
 <source>Delete or overwrite files permanently</source>
 <target>Bestanden definitief verwijderen of overschrijven</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Prullenbak</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Gebruik prullenbak voor verwijderde en overschreven bestanden</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Maak een backup van verwijderde en overschreven bestanden in de prullenbak</target>
 
 <source>Versioning</source>
 <target>Versiebeheer</target>
 
-<source>Move files to user-defined folder</source>
+<source>Move files to a user-defined folder</source>
 <target>Verplaats bestanden naar een gebruikers gedefineerde map</target>
 
 <source>Naming convention:</source>
@@ -867,8 +876,8 @@ overeenkomt
 <source>Batch job</source>
 <target>Taaklijst</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 taakbestand om synchronisatie te automatiseren. Dubbelklik op dit bestand of plan dit in de systeem taakplanner: FreeFileSync.exe <taaknaam>.ffs_batch</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Maak een batchbestand voor onbeheerde synchronisatie. Om te starten dubbelklikt u dit bestand of rooster in een taakplanner: %x</target>
 
 <source>Exit</source>
 <target>Sluiten</target>
@@ -922,13 +931,10 @@ overeenkomt
 <target>Verwijder aan beide zijdes ook al is het bestand maar aan één zijde geselecteerd</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
-<target>
-Alleen bestanden die met alle filter instellingen overeen komen worden gesynchroniseerd.
-Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
-</target>
+<target>Bestanden zullen alleen gesynchroniseerd worden als ze aan alle filterregels voldoen.</target>
 
 <source>Include</source>
 <target>Opnemen</target>
@@ -957,20 +963,20 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <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 daarna. Dit garandeert een consistente toestand, zelfs in het geval van een fatale fout.</target>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Kopiëer eerst naar een tijdelijk bestand (*.ffs_tmp) en hernoem het daarna. Dit garandeert consistentie, zelfs in het geval van een fatale fout.</target>
 
 <source>Copy locked files</source>
 <target>Kopiëer vergrendelde bestanden</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Kopiëer gedeelde of vergrendelde bestanden met Volume Shadow Copy Service (Vereist Administrator rechten)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Kopiëer gedeelde of afgesloten bestanden met behulp van de Volume Shadow Copy Service (vereist administrator rechten)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopiëer toegangsrechten van bestand.</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Overdragen van bestands- en mappermissies (Administrator rechten nodig)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Verplaats bestands en map permissies (vereist administrator rechten)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Herstel verborgen dialogen</target>
@@ -1050,9 +1056,6 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <source>&Execute</source>
 <target>&Uitvoeren</target>
 
-<source>&Don't show this dialog again</source>
-<target>Laat deze dialoog &niet meer zien</target>
-
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
@@ -1089,12 +1092,15 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <source>Include temporarily</source>
 <target>Tijdelijk opnemen</target>
 
-<source>Exclude via filter:</source>
-<target>Sluit via filter uit:</target>
-
 <source>multiple selection</source>
 <target>meervoudige selectie</target>
 
+<source>Include via filter:</source>
+<target>Invoegen via filter:</target>
+
+<source>Exclude via filter:</source>
+<target>Sluit via filter uit:</target>
+
 <source>Include all</source>
 <target>Alles opnemen</target>
 
@@ -1140,8 +1146,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <source>Do&n't save</source>
 <target>&Niet opslaan</target>
 
-<source>Never save changes</source>
-<target>Wijzigingen nooit opslaan</target>
+<source>Never save &changes</source>
+<target>Sla &veranderingen nooit op</target>
 
 <source>Show files that exist on left side only</source>
 <target>Toon bestanden die alleen aan de linkerzijde bestaan</target>
@@ -1203,8 +1209,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <source>Searching for program updates...</source>
 <target>Bezig met zoeken naar programma updates...</target>
 
-<source>Ignore further errors</source>
-<target>Negeer verdere foutmeldingen</target>
+<source>&Ignore subsequent errors</source>
+<target>&Negeer volgende foutmeldingen</target>
 
 <source>&Ignore</source>
 <target>&Negeren</target>
@@ -1212,8 +1218,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <source>Fatal Error</source>
 <target>Kritieke fout</target>
 
-<source>Don't show this warning again</source>
-<target>Laat deze waarschuwing niet opnieuw zien</target>
+<source>&Don't show this warning again</source>
+<target>Laat deze &waarschuwing niet meer zien</target>
 
 <source>&Switch</source>
 <target>&Omschakelen</target>
@@ -1288,12 +1294,12 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <target>Filter</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>Weet u zeker dat u het volgende item naar de Prullebak wilt verplaatsen?</pluralform>
-<pluralform>Weet u zeker dat u de volgende %x items naar de Prullebak wilt verplaatsen?</pluralform>
+<pluralform>Wilt u dit item echt naar de prullenbak verplaatsen?</pluralform>
+<pluralform>Wilt u echt de volgende %x items naar de prullenbak verplaatsen?</pluralform>
 </target>
 
 <source>
@@ -1467,8 +1473,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <source>Cannot change process I/O priorities.</source>
 <target>Kan de I/O prioriteiten niet aanpassen.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Niet mogelijk om %x naar de Prullenbak te verplaatsen.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>Kan %x niet verplaatsen naar de prullenbak.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>Kan pad voor %x niet vaststellen.</target>
diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index 753ccfd0..69642e78 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -7,6 +7,9 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Close search bar</source>
+<target>Close search bar</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Both sides have changed since last synchronisation.</target>
 
@@ -25,14 +28,14 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Checking recycle bin availability for folder %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>Moving file %x to recycle bin</target>
+<source>Moving file %x to the recycle bin</source>
+<target>Moving file %x to the recycle bin</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>Moving folder %x to recycle bin</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>Moving folder %x to the recycle bin</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Moving symbolic link %x to recycle bin</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>Moving symbolic link %x to the recycle bin</target>
 
 <source>Deleting file %x</source>
 <target>Deleting file %x</target>
@@ -43,8 +46,8 @@
 <source>Deleting symbolic link %x</source>
 <target>Deleting symbolic link %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</target>
 
 <source>An exception occurred</source>
 <target>An exception occurred</target>
@@ -307,8 +310,8 @@
 <source>Browse directory</source>
 <target>Browse directory</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Cannot access Volume Shadow Copy Service.</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Cannot access the Volume Shadow Copy Service.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Please use FreeFileSync 64-bit version to create shadow copies on this system.</target>
@@ -528,12 +531,15 @@ The command is triggered if:
 <source>Generating database...</source>
 <target>Generating database...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Creating Volume Shadow Copy for %x...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Creating a Volume Shadow Copy for %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Data verification error: %x and %y have different content.</target>
 
+<source>job name</source>
+<target>job name</target>
+
 <source>Synchronization aborted</source>
 <target>Synchronisation aborted</target>
 
@@ -684,8 +690,8 @@ The command is triggered if:
 <source>&Export file list...</source>
 <target>&Export file list...</target>
 
-<source>&Global settings...</source>
-<target>&Global settings...</target>
+<source>&Global settings</source>
+<target>&Global settings</target>
 
 <source>&Tools</source>
 <target>&Tools</target>
@@ -702,12 +708,6 @@ The command is triggered if:
 <source>Compare</source>
 <target>Compare</target>
 
-<source>Comparison settings</source>
-<target>Comparison settings</target>
-
-<source>Synchronization settings</source>
-<target>Synchronisation settings</target>
-
 <source>Synchronize</source>
 <target>Synchronise</target>
 
@@ -720,6 +720,12 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>Swap sides</target>
 
+<source>Find what:</source>
+<target>Find what:</target>
+
+<source>Match case</source>
+<target>Match case</target>
+
 <source>Save as batch job</source>
 <target>Save as batch job</target>
 
@@ -774,8 +780,8 @@ The command is triggered if:
 <source>Statistics</source>
 <target>Statistics</target>
 
-<source>Don't show this dialog again</source>
-<target>Don't show this dialogue again</target>
+<source>&Don't show this dialog again</source>
+<target>&Don't show this dialogue again</target>
 
 <source>Select a variant</source>
 <target>Select a variant</target>
@@ -825,6 +831,12 @@ is the same
 <source>Configure your own synchronization rules.</source>
 <target>Configure your own synchronisation rules.</target>
 
+<source>Detect moved files</source>
+<target>Detect moved files</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Requires database files. Not supported by all file systems.</target>
+
 <source>Error handling</source>
 <target>Error handling</target>
 
@@ -849,17 +861,17 @@ is the same
 <source>Delete or overwrite files permanently</source>
 <target>Delete or overwrite files permanently</target>
 
-<source>Recycle Bin</source>
-<target>Recycle Bin</target>
+<source>Recycle bin</source>
+<target>Recycle bin</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Use Recycle Bin for deleted and overwritten files</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Back up deleted and overwritten files in the recycle bin</target>
 
 <source>Versioning</source>
 <target>Versioning</target>
 
-<source>Move files to user-defined folder</source>
-<target>Move files to user-defined folder</target>
+<source>Move files to a user-defined folder</source>
+<target>Move files to a user-defined folder</target>
 
 <source>Naming convention:</source>
 <target>Naming convention:</target>
@@ -867,8 +879,8 @@ is the same
 <source>Batch job</source>
 <target>Batch job</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Create a batch file for unattended synchronisation. To start, double-click this file or schedule in a task planner: %x</target>
 
 <source>Exit</source>
 <target>Exit</target>
@@ -891,30 +903,6 @@ is the same
 <source>Limit maximum number of log files</source>
 <target>Limit maximum number of log files</target>
 
-<source>Source code written in C++ using:</source>
-<target>Source code written in C++ using:</target>
-
-<source>If you like FreeFileSync</source>
-<target>If you like FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Donate with PayPal</target>
-
-<source>Many thanks for localization:</source>
-<target>Many thanks for localisation:</target>
-
-<source>Feedback and suggestions are welcome</source>
-<target>Feedback and suggestions are welcome</target>
-
-<source>Homepage</source>
-<target>Homepage</target>
-
-<source>Email</source>
-<target>E-mail</target>
-
-<source>Published under the GNU General Public License</source>
-<target>Published under the GNU General Public Licence</target>
-
 <source>Delete on both sides</source>
 <target>Delete on both sides</target>
 
@@ -922,12 +910,12 @@ is the same
 <target>Delete on both sides even if the file is selected on one side only</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Only files that match all filter settings will be synchronised.
-Note: File names must be relative to base directories.
+Files will only be synchronised if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </target>
 
 <source>Include</source>
@@ -957,20 +945,20 @@ Note: File names must be relative to base directories.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</target>
 
 <source>Copy locked files</source>
 <target>Copy locked files</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</target>
 
 <source>Copy file access permissions</source>
 <target>Copy file access permissions</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Transfer file and folder permissions (Requires Administrator rights)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Transfer file and folder permissions (requires administrator rights)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Restore hidden dialogues</target>
@@ -984,33 +972,54 @@ Note: File names must be relative to base directories.
 <source>&Default</source>
 <target>&Default</target>
 
-<source>Find what:</source>
-<target>Find what:</target>
+<source>Source code written in C++ using:</source>
+<target>Source code written in C++ using:</target>
 
-<source>Match case</source>
-<target>Match case</target>
+<source>If you like FreeFileSync</source>
+<target>If you like FreeFileSync</target>
 
-<source>&Find next</source>
-<target>&Find next</target>
+<source>Donate with PayPal</source>
+<target>Donate with PayPal</target>
+
+<source>Feedback and suggestions are welcome</source>
+<target>Feedback and suggestions are welcome</target>
+
+<source>Homepage</source>
+<target>Homepage</target>
+
+<source>Email</source>
+<target>E-mail</target>
+
+<source>Published under the GNU General Public License</source>
+<target>Published under the GNU General Public Licence</target>
+
+<source>Many thanks for localization:</source>
+<target>Many thanks for localisation:</target>
 
 <source>Start synchronization</source>
 <target>Start synchronisation</target>
 
+<source>Comparison settings</source>
+<target>Comparison settings</target>
+
+<source>Synchronization settings</source>
+<target>Synchronisation settings</target>
+
 <source>Delete</source>
 <target>Delete</target>
 
 <source>Configure filter</source>
 <target>Configure filter</target>
 
-<source>Find</source>
-<target>Find</target>
-
 <source>Select time span</source>
 <target>Select time span</target>
 
 <source>Folder pairs</source>
 <target>Folder pairs</target>
 
+<source>Find</source>
+<target>Find</target>
+
 <source>Overview</source>
 <target>Overview</target>
 
@@ -1050,9 +1059,6 @@ Note: File names must be relative to base directories.
 <source>&Execute</source>
 <target>&Execute</target>
 
-<source>&Don't show this dialog again</source>
-<target>&Don't show this dialogue again</target>
-
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
@@ -1083,17 +1089,20 @@ Note: File names must be relative to base directories.
 <source>Set direction:</source>
 <target>Set direction:</target>
 
-<source>Exclude temporarily</source>
-<target>Exclude temporarily</target>
+<source>multiple selection</source>
+<target>multiple selection</target>
 
-<source>Include temporarily</source>
-<target>Include temporarily</target>
+<source>Include via filter:</source>
+<target>Include via filter:</target>
 
 <source>Exclude via filter:</source>
 <target>Exclude via filter:</target>
 
-<source>multiple selection</source>
-<target>multiple selection</target>
+<source>Exclude temporarily</source>
+<target>Exclude temporarily</target>
+
+<source>Include temporarily</source>
+<target>Include temporarily</target>
 
 <source>Include all</source>
 <target>Include all</target>
@@ -1140,8 +1149,8 @@ Note: File names must be relative to base directories.
 <source>Do&n't save</source>
 <target>Do&n't save</target>
 
-<source>Never save changes</source>
-<target>Never save changes</target>
+<source>Never save &changes</source>
+<target>Never save &changes</target>
 
 <source>Show files that exist on left side only</source>
 <target>Show files that exist on left side only</target>
@@ -1194,6 +1203,9 @@ Note: File names must be relative to base directories.
 <source>All folders are in sync</source>
 <target>All folders are in sync</target>
 
+<source>Cannot find %x</source>
+<target>Cannot find %x</target>
+
 <source>Comma-separated values</source>
 <target>Comma-separated values</target>
 
@@ -1203,8 +1215,8 @@ Note: File names must be relative to base directories.
 <source>Searching for program updates...</source>
 <target>Searching for program updates...</target>
 
-<source>Ignore further errors</source>
-<target>Ignore further errors</target>
+<source>&Ignore subsequent errors</source>
+<target>&Ignore subsequent errors</target>
 
 <source>&Ignore</source>
 <target>&Ignore</target>
@@ -1212,8 +1224,8 @@ Note: File names must be relative to base directories.
 <source>Fatal Error</source>
 <target>Fatal Error</target>
 
-<source>Don't show this warning again</source>
-<target>Don't show this warning again</target>
+<source>&Don't show this warning again</source>
+<target>&Don't show this warning again</target>
 
 <source>&Switch</source>
 <target>&Switch</target>
@@ -1254,9 +1266,6 @@ Note: File names must be relative to base directories.
 <source>Log</source>
 <target>Log</target>
 
-<source>Cannot find %x</source>
-<target>Cannot find %x</target>
-
 <source>Inactive</source>
 <target>Inactive</target>
 
@@ -1288,12 +1297,12 @@ Note: File names must be relative to base directories.
 <target>Filter</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </target>
 
 <source>
@@ -1467,8 +1476,8 @@ Note: File names must be relative to base directories.
 <source>Cannot change process I/O priorities.</source>
 <target>Cannot change process I/O priorities.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Unable to move %x to the Recycle Bin.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>Unable to move %x to the recycle bin.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>Cannot determine final path for %x.</target>
diff --git a/BUILD/Languages/finnish.lng b/BUILD/Languages/finnish.lng
index 81c5bf61..54b8c2c7 100644
--- a/BUILD/Languages/finnish.lng
+++ b/BUILD/Languages/finnish.lng
@@ -25,14 +25,14 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Tarkistetaan Roskakorin käyttö hakemistolle %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>Siirrä tiedosto %x roskakoriin</target>
+<source>Moving file %x to the recycle bin</source>
+<target>Siirrä tiedosto %x Roskakoriin</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>Siirrä hakemisto %x roskakoriin</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>Siirrä hakemisto %x Roskakoriin</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Siirrä pikakuvake %x roskakoriin</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>Siirrä linkki %x Roskakoriin</target>
 
 <source>Deleting file %x</source>
 <target>Poista tiedosto %x</target>
@@ -43,14 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>Pistetaan pikakuvake %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>Roskakori ei ole käytössä näillä hakemistoilla. Tiedostot poistetaan pysyvästi:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Roskakori puuttuu näiltä hakemistoilta. Tiedostot poistetaan ehdotta:</target>
 
 <source>An exception occurred</source>
 <target>Virhe havaittu</target>
 
-<source>Cannot find file %x.</source>
-<target>Tiedosto %x ei löydy.</target>
+<source>A directory path is expected after %x.</source>
+<target>Tarvitaan hakemistopolku %x jälkeen.</target>
+
+<source>Syntax error</source>
+<target>Komento virhe</target>
+
+<source>Cannot open file %x.</source>
+<target>Tiedosto %x ei aukea.</target>
 
 <source>Error</source>
 <target>Virhe</target>
@@ -58,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>Tiedosto %x ei sisällä kelvollista kokoonpanoa.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Hakemisto määrät ei täsmää (oikea<>vasen).</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Määrittelyssä on oltava viittaukset hakemistopareista, jos hakemistot kutsutaam komentoriviltä.</target>
+
+<source>Warning</source>
+<target>Varoitus</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Hakemisto määriteltävä vain yhteen määrittelyyn.</target>
+
+<source>Syntax:</source>
+<target>Syntaksi:</target>
+
+<source>config files</source>
+<target>määrittelytiedosto</target>
+
+<source>directory</source>
+<target>hakemisto</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Vapaa määrä FreeFileSync .ffs_gui ja/tai .ffs_batch määrittelytiedostoja.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Vapaa määrä eri hakemistoja yhdessä määrittelytiedostossa.</target>
+
+<source>Command line</source>
+<target>Komentokehote</target>
+
 <source>A folder input field is empty.</source>
 <target>Hakemiston syöte on tyhjä.</target>
 
@@ -215,8 +251,8 @@
 <target>Kokonaisaika:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
 <pluralform>1 tavu</pluralform>
@@ -242,12 +278,12 @@
 <target>Skannaus:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 säije]</pluralform>
-<pluralform>[%x säijettä]</pluralform>
+<pluralform>1 säije</pluralform>
+<pluralform>%x säijettä</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -256,6 +292,9 @@
 <source>/sec</source>
 <target>/s</target>
 
+<source>%x items</source>
+<target>%x kpl</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Kokoonpanotiedosto %x ladattu vain osittain.</target>
 
@@ -268,8 +307,8 @@
 <source>Browse directory</source>
 <target>Selaa hakemistoa</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Ei voi käyttää Volume Shadow Copy Service.</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Volume Shadow Copy palvelu ei vastaa.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Tilannevedoksia varten käytä tässä järjestelmässä FreeFileSync 64-bittinen versio.</target>
@@ -280,8 +319,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Nimen %x tunnistus ei onnistu.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Taltion nimi %x ei esiinny tiedostonimessä %y.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>Nimi %x ei esiinny tiedostopolussa %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Keskeytys pyydetty: Odotetaan toiminnon loppumista...</target>
@@ -349,9 +388,6 @@
 <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>
 The command is triggered if:
 - files or subfolders change
@@ -375,9 +411,6 @@ Käsky suoritetaan jos:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automaattisoitu täsmäytys</target>
 
-<source>Warning</source>
-<target>Varoitus</target>
-
 <source>Build: %x</source>
 <target>Versio: %x</target>
 
@@ -387,15 +420,21 @@ Käsky suoritetaan jos:
 <source>All files</source>
 <target>Kaikki tiedostot</target>
 
+<source>Directory monitoring active</source>
+<target>Hakemistovalvonta päällä</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Odota kunnes kaikki hakemistot on saatavilla...</target>
+
 <source>&Restore</source>
 <target>&Palauta</target>
 
+<source>&Show error</source>
+<target>&Näytä virheet</target>
+
 <source>&Exit</source>
 <target>&Poistu</target>
 
-<source>Waiting for missing directories...</source>
-<target>Odottaa puuttuvia hakemistoja...</target>
-
 <source>Invalid command line:</source>
 <target>Virheellinen komentokehote:</target>
 
@@ -405,14 +444,14 @@ Käsky suoritetaan jos:
 <source>File time and size</source>
 <target>Tiedoston aika ja koko</target>
 
-<source> Two way </source>
-<target> Molemmat </target>
+<source>Two way</source>
+<target>Molemmat</target>
 
 <source>Mirror</source>
-<target>Peilaava </target>
+<target>Peilaava</target>
 
 <source>Update</source>
-<target>Päivittävä </target>
+<target>Päivittävä</target>
 
 <source>Custom</source>
 <target>Oma määritelmä</target>
@@ -468,11 +507,8 @@ Käsky suoritetaan jos:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Näissä kohteissa on selvittämättömiä ristiriitoja, niitä ei täsmäytetä:</target>
 
-<source>Significant difference detected:</source>
-<target>Merkittävä eroavavuus todettu:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Yli 50% tiedostoista kopioidaan tai poistetaan.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Hakemistoissa on oleelliset erot. Varmista että hakemistot on oikein valittu.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Vapaa levytila ei riitä:</target>
@@ -492,12 +528,15 @@ Käsky suoritetaan jos:
 <source>Generating database...</source>
 <target>Tietokanta luodaan...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Luodaan Volume Shadow Copy %x:lle...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Luo %x:lle Volume Shadow Copy ...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Tiedon verifiointie virhe: %x ja %y sisältö on erilainen.</target>
 
+<source>job name</source>
+<target>työnimi</target>
+
 <source>Synchronization aborted</source>
 <target>Täsmäytys lopetettiin</target>
 
@@ -522,6 +561,9 @@ Käsky suoritetaan jos:
 <source>Switching to FreeFileSync main dialog</source>
 <target>Siirry FreeFileSync perusikkunaan</target>
 
+<source>Retrying operation after error:</source>
+<target>Yritä virheen jälkeen uudestaan:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>FreeFileSync:n uusi verio on saatavilla:</target>
 
@@ -645,8 +687,8 @@ Käsky suoritetaan jos:
 <source>&Export file list...</source>
 <target>&Vie tiedostojoukko...</target>
 
-<source>&Global settings...</source>
-<target>&Yleiset asetukset...</target>
+<source>&Global settings</source>
+<target>&Yleiset asetukset</target>
 
 <source>&Tools</source>
 <target>&Asetukset</target>
@@ -663,12 +705,6 @@ Käsky suoritetaan jos:
 <source>Compare</source>
 <target>Vertaile</target>
 
-<source>Comparison settings</source>
-<target>Vertailun asetukset</target>
-
-<source>Synchronization settings</source>
-<target>Täsmäytyksen asetukset</target>
-
 <source>Synchronize</source>
 <target>Täsmäytä</target>
 
@@ -717,6 +753,9 @@ Käsky suoritetaan jos:
 <source>Synchronizing...</source>
 <target>Täsmäytetään...</target>
 
+<source>Minimize to notification area</source>
+<target>Pienennä huomiokenttään</target>
+
 <source>On completion</source>
 <target>Valmistuttua</target>
 
@@ -726,6 +765,15 @@ Käsky suoritetaan jos:
 <source>&Pause</source>
 <target>&Keskeytä</target>
 
+<source>Variant</source>
+<target>Vaihtoehto</target>
+
+<source>Statistics</source>
+<target>Tilastot</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Älä näytä valitaa uudestaan</target>
+
 <source>Select a variant</source>
 <target>Valitse tyyppi</target>
 
@@ -774,6 +822,12 @@ on sama
 <source>Configure your own synchronization rules.</source>
 <target>Määritä omat täsmäytyssäännöt.</target>
 
+<source>Detect moved files</source>
+<target>Tunnista siirretyt tiedostot</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Vaatii tietokantaa. Ei toimi kaikissa käyttöjärjestelmissä.</target>
+
 <source>Error handling</source>
 <target>Virheiden käsittely</target>
 
@@ -798,16 +852,16 @@ on sama
 <source>Delete or overwrite files permanently</source>
 <target>Poista tai korvaa tiedostoja pysyvästi</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Roskakori</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Käytä Roskakoria poistetuille/korvatille tiedostoille</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Tallenna poistetut/ylikirjoitetut tiedostot Roskakoriin</target>
 
 <source>Versioning</source>
 <target>Versiointi</target>
 
-<source>Move files to user-defined folder</source>
+<source>Move files to a user-defined folder</source>
 <target>Siirrä tiedostot määrättyyn hakemistoon</target>
 
 <source>Naming convention:</source>
@@ -816,8 +870,8 @@ on sama
 <source>Batch job</source>
 <target>Eräajo</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Luo eräajo-tiedosto automaattiseen täsmäytykseen. Käynnista tuplaklickillä tai ajasta: %x</target>
 
 <source>Exit</source>
 <target>Poistu</target>
@@ -840,30 +894,6 @@ on sama
 <source>Limit maximum number of log files</source>
 <target>Lokeja enintäin</target>
 
-<source>Source code written in C++ using:</source>
-<target>Koodikieli on C++ käyttäen:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Jos pidät FreeFileSync:tä</target>
-
-<source>Donate with PayPal</source>
-<target>Lahjoita PayPal:lla</target>
-
-<source>Many thanks for localization:</source>
-<target>Paljon kiitoksia kääntäjille:</target>
-
-<source>Feedback and suggestions are welcome</source>
-<target>Palaute ja uudet ideat ovat tervetulleita</target>
-
-<source>Homepage</source>
-<target>Kotisivu</target>
-
-<source>Email</source>
-<target>S-posti</target>
-
-<source>Published under the GNU General Public License</source>
-<target>Julkaistu lisenssillä GNU General Public License</target>
-
 <source>Delete on both sides</source>
 <target>Poista molemmilta puolilta</target>
 
@@ -871,12 +901,12 @@ on sama
 <target>Poista molemmin puolin, vaikka tiedosto on valittu vain toisella puolella</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Vain tiedostot, jotka vastaavat kaikkia suodattimen asetuksia synkronoidaan.
-Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin.
+Tiedostot synkronoidaan vain jos kaikki ehdot täyttyy.
+HUOM: Tiedostopolku oltava suhteessa juurihakemistoon.
 </target>
 
 <source>Include</source>
@@ -906,20 +936,20 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Kopio ensin välitiedostoon (*.ffs_tmp) ja nimeä sitten uudestaan. Varmistaa toimivuudet vakavan virheen tapahtuessa.</target>
 
 <source>Copy locked files</source>
 <target>Kopioi lukitut tiedostot</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Kopioi jaetut/lukitut tiedostot Volume Shadow Copy prosessilla (Vaatii Järjestelmävalvojan oikeuksia)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Kopioi jaetut/lukitut tiedostot Volume Shadow Copy Service:lla (vaatii pääkäyttäjän oikeudet)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopioi tiedoston käyttöoikeuksia</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Kopioi tiedosto ja hakemisto käyttöoikeuksia (Vaatii Järjestelmävalvojan oikeuksia)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Vie tiedosto ja hakemisto ominaisuudet(vaatii pääkäyttäjän oikeudet)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Palauta piiloitetut ikkunat</target>
@@ -933,15 +963,6 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin.
 <source>&Default</source>
 <target>&Vakio</target>
 
-<source>Variant</source>
-<target>Vaihtoehto</target>
-
-<source>Statistics</source>
-<target>Tilastot</target>
-
-<source>Don't show this dialog again</source>
-<target>Älä näytä tätä uudestaan</target>
-
 <source>Find what:</source>
 <target>Etsi:</target>
 
@@ -951,15 +972,45 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin.
 <source>&Find next</source>
 <target>&Etsi seuraava</target>
 
+<source>Source code written in C++ using:</source>
+<target>Koodikieli on C++ käyttäen:</target>
+
+<source>If you like FreeFileSync</source>
+<target>Jos pidät FreeFileSync:tä</target>
+
+<source>Donate with PayPal</source>
+<target>Lahjoita PayPal:lla</target>
+
+<source>Feedback and suggestions are welcome</source>
+<target>Palaute ja uudet ideat ovat tervetulleita</target>
+
+<source>Homepage</source>
+<target>Kotisivu</target>
+
+<source>Email</source>
+<target>S-posti</target>
+
+<source>Published under the GNU General Public License</source>
+<target>Julkaistu lisenssillä GNU General Public License</target>
+
+<source>Many thanks for localization:</source>
+<target>Paljon kiitoksia kääntäjille:</target>
+
+<source>Start synchronization</source>
+<target>Käynnistä täsmäytys</target>
+
+<source>Comparison settings</source>
+<target>Vertailun asetukset</target>
+
+<source>Synchronization settings</source>
+<target>Täsmäytyksen asetukset</target>
+
 <source>Delete</source>
 <target>Poista</target>
 
 <source>Configure filter</source>
 <target>Määritä suodin</target>
 
-<source>Start synchronization</source>
-<target>Käynnistä täsmäytys</target>
-
 <source>Find</source>
 <target>Etsi</target>
 
@@ -994,6 +1045,21 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin.
 <target>Vertaile molemmat puolet</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Haluatko varmasti suorittaa komentoa %y yhteen?</pluralform>
+<pluralform>Haluatko varmasti suorittaa komentoa %y %x:n?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Vahvista</target>
+
+<source>&Execute</source>
+<target>&Suorita</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1029,12 +1095,15 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin.
 <source>Include temporarily</source>
 <target>Sisällytä, tilapäisesti</target>
 
-<source>Exclude via filter:</source>
-<target>Sulje pois suotimella:</target>
-
 <source>multiple selection</source>
 <target>monivalinta</target>
 
+<source>Include via filter:</source>
+<target>Lisää suotimella:</target>
+
+<source>Exclude via filter:</source>
+<target>Sulje pois suotimella:</target>
+
 <source>Include all</source>
 <target>Valitse kaikki</target>
 
@@ -1080,8 +1149,8 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin.
 <source>Do&n't save</source>
 <target>Äl&ä tallenna</target>
 
-<source>Never save changes</source>
-<target>Älä tallenna muutoksia</target>
+<source>Never save &changes</source>
+<target>Älä tallenna &muutoksia</target>
 
 <source>Show files that exist on left side only</source>
 <target>Näytä vain vasemmalla esiintyvät tiedostot</target>
@@ -1134,8 +1203,8 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin.
 <source>All folders are in sync</source>
 <target>Kaikki hakemistot täsmäytetty</target>
 
-<source>Comma separated list</source>
-<target>CSV-muotoinen lista</target>
+<source>Comma-separated values</source>
+<target>Pilkulla erotetut arvot</target>
 
 <source>File list exported</source>
 <target>Tiedostolista viety</target>
@@ -1143,8 +1212,8 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin.
 <source>Searching for program updates...</source>
 <target>Ohjelmapäivytys haetaa...</target>
 
-<source>Ignore further errors</source>
-<target>Hylkää toistuvat virheviestit</target>
+<source>&Ignore subsequent errors</source>
+<target>&Hylkää toistuvat virheet</target>
 
 <source>&Ignore</source>
 <target>&Unohda</target>
@@ -1152,8 +1221,8 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin.
 <source>Fatal Error</source>
 <target>Kohtalokas virhe</target>
 
-<source>Don't show this warning again</source>
-<target>Älä enää näytä varoitusta</target>
+<source>&Don't show this warning again</source>
+<target>&Älä enää näytä tätä varoitusta</target>
 
 <source>&Switch</source>
 <target>&Vaihda</target>
@@ -1188,14 +1257,11 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin.
 <source>Completed</source>
 <target>Valmis</target>
 
-<source>Continue</source>
-<target>Jatka</target>
+<source>&Continue</source>
+<target>&Jatka</target>
 
-<source>Pause</source>
-<target>Tauko</target>
-
-<source>Logging</source>
-<target>Kirjaa</target>
+<source>Log</source>
+<target>Loki</target>
 
 <source>Cannot find %x</source>
 <target>En löydä %x</target>
@@ -1231,12 +1297,12 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin.
 <target>Suodin</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>Haluatko todella siirtää tätä Roskakoriin?</pluralform>
-<pluralform>Haluatko todella siirtää nämä %x kohdetta Roskakoriin?</pluralform>
+<pluralform>Haluatko varmasti siirtää kohde Roskakoriin?</pluralform>
+<pluralform>Haluatko varmasti siirtää nämä %x kohteet Roskakoriin?</pluralform>
 </target>
 
 <source>
@@ -1290,9 +1356,6 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin.
 <source>Append a timestamp to each file name</source>
 <target>Lisää aikaleima tiedostoihin</target>
 
-<source>Folder</source>
-<target>Hakemisto</target>
-
 <source>File</source>
 <target>Tiedosto</target>
 
@@ -1413,8 +1476,8 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin.
 <source>Cannot change process I/O priorities.</source>
 <target>Prosessin I/O -pririteetin muutos ei onnistu.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Ei voitu siirtää %x Roskakoriin.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>%x siirto Roskakoriin epäonnistui.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>Polkua ei voida määrittää, %x.</target>
diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng
index 0a720f41..ece832e9 100644
--- a/BUILD/Languages/french.lng
+++ b/BUILD/Languages/french.lng
@@ -25,14 +25,14 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Contrôle de la disponibilité de la Corbeille pour le dossier %x ...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>Envoi du fichier %x dans la corbeille</target>
+<source>Moving file %x to the recycle bin</source>
+<target>Déplacement du fichier %x vers la Corbeille<</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>Envoi du dossier %x dans la corbeille</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>Déplacement du dossier %x vers la Corbeille<</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Envoi du lien symbolique %x dans la corbeille</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>Déplacement du lien symbolique %x vers la Corbeille</target>
 
 <source>Deleting file %x</source>
 <target>Suppression du fichier %x</target>
@@ -43,14 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>Suppression du lien symbolique %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>La Corbeille est inaccessible pour les dossiers suivants. Les fichiers seront donc détruits définitivement.</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>La Corbeille n'est pas disponible por les dossiers suivants. Les fichiers seront détruits définitivement /</target>
 
 <source>An exception occurred</source>
 <target>Une erreur s'est produite</target>
 
-<source>Cannot find file %x.</source>
-<target>Impossible de trouver le fichier %x.</target>
+<source>A directory path is expected after %x.</source>
+<target>Un chemin est attendu après %x.</target>
+
+<source>Syntax error</source>
+<target>Erreur de syntaxe</target>
+
+<source>Cannot open file %x.</source>
+<target>Impossible d'ouvrir le fichier %x.</target>
 
 <source>Error</source>
 <target>Erreur</target>
@@ -58,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>Le fichier %x ne contient pas une configuration valide.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Nombre incorrect de répertoires à gauche et à droite.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Le fichier de configuration ne peut pas contenir de paramètres au niveau de paires de répertoires quand ceux-ci sont définis par une ligne de commande.</target>
+
+<source>Warning</source>
+<target>Attention</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Les répertoires ne peuvent pas être définis pour plus d'un fichier de configuration.</target>
+
+<source>Syntax:</source>
+<target>Syntaxe :</target>
+
+<source>config files</source>
+<target>fichiers de configuration</target>
+
+<source>directory</source>
+<target>répertoire</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>N'importe quel nombre de fichiers FreeFileSync .ffs_gui et/ou .ffs_batch.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>N'importe quel nombre de répertoires alternatifs pour au plus un fichier de configuration.</target>
+
+<source>Command line</source>
+<target>Ligne de commande</target>
+
 <source>A folder input field is empty.</source>
 <target>Une entrée dossier est vide.</target>
 
@@ -215,8 +251,8 @@
 <target>Durée totale :</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
 <pluralform>%x octet</pluralform>
@@ -242,12 +278,12 @@
 <target>Lecture en cours :</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[%x Tâche]</pluralform>
-<pluralform>[%x Tâches]</pluralform>
+<pluralform>%x tâche</pluralform>
+<pluralform>%x tâches</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -256,6 +292,9 @@
 <source>/sec</source>
 <target>/sec</target>
 
+<source>%x items</source>
+<target>%x éléments</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Le fichier de configuration %x a été chargé seulement partiellement.</target>
 
@@ -268,8 +307,8 @@
 <source>Browse directory</source>
 <target>Parcourir le répertoire</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Impossible d'accéder au service Volume Shadow Copy</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Impossible d'accéder au service Volume Shadow Copy.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Utilisez la version FreeFileSync 64-bit pour créer des "shadow copies" sur ce système.</target>
@@ -280,8 +319,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Impossible de déterminer le nom du volume de %x.</target>
 
-<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>Volume name %x is not part of file path %y.</source>
+<target>Le nom de volume %x ne fait pas partie du chemin %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Abandon demandé : En attente de la fin de l'opération en cours...</target>
@@ -349,9 +388,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Délai entre le dernier changement détecté et la dernière exécution de la commande</target>
 
-<source>Command line</source>
-<target>Ligne de commande</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -375,9 +411,6 @@ La commande est déclenchée si :
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Synchronisation Automatisée</target>
 
-<source>Warning</source>
-<target>Attention</target>
-
 <source>Build: %x</source>
 <target>Généré : %x</target>
 
@@ -387,15 +420,21 @@ La commande est déclenchée si :
 <source>All files</source>
 <target>Tous les fichiers</target>
 
+<source>Directory monitoring active</source>
+<target>Gestion des répertoires active</target>
+
+<source>Waiting until all directories are available...</source>
+<target>En attente de la disponibilité de tous les répertoires ...</target>
+
 <source>&Restore</source>
 <target>&Restaurer</target>
 
+<source>&Show error</source>
+<target>&Afficher l'erreur</target>
+
 <source>&Exit</source>
 <target>&Quitter</target>
 
-<source>Waiting for missing directories...</source>
-<target>En attente des répertoires absents ...</target>
-
 <source>Invalid command line:</source>
 <target>Ligne de commande incorrecte :</target>
 
@@ -405,14 +444,14 @@ La commande est déclenchée si :
 <source>File time and size</source>
 <target>Date et taille du fichier</target>
 
-<source> Two way </source>
-<target> Deux sens </target>
+<source>Two way</source>
+<target>Deux sens</target>
 
 <source>Mirror</source>
-<target>Miroir </target>
+<target>Miroir</target>
 
 <source>Update</source>
-<target>Mise à Jour </target>
+<target>Mise à Jour</target>
 
 <source>Custom</source>
 <target>Personnaliser</target>
@@ -468,11 +507,8 @@ La commande est déclenchée si :
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Les éléments suivants sont en conflit non résolu et ne seront pas synchronisés :</target>
 
-<source>Significant difference detected:</source>
-<target>Différence significative détectée :</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Plus de 50% des fichiers seront copiés ou détruits.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Les dossiers suivants sont significativement différents. Assurez-vous que les dossiers correspondent avant de lancer la synchronisation.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Espace disque insuffisant sur :</target>
@@ -492,12 +528,15 @@ La commande est déclenchée si :
 <source>Generating database...</source>
 <target>Génération de la base de données...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
+<source>Creating a Volume Shadow Copy for %x...</source>
 <target>Création d'un Volume Shadow Copy pour %x ...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Erreur lors de la vérification des données : %x et %y ont des contenus différents.</target>
 
+<source>job name</source>
+<target>nom du job</target>
+
 <source>Synchronization aborted</source>
 <target>Synchronisation abandonnée</target>
 
@@ -522,6 +561,9 @@ La commande est déclenchée si :
 <source>Switching to FreeFileSync main dialog</source>
 <target>Passage à la fenêtre principale de FreeFileSync</target>
 
+<source>Retrying operation after error:</source>
+<target>Réessauer l'opération après erreur :</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Une nouvelle version de FreeFileSync est disponible</target>
 
@@ -645,8 +687,8 @@ La commande est déclenchée si :
 <source>&Export file list...</source>
 <target>&Exportation de la liste des fichiers...</target>
 
-<source>&Global settings...</source>
-<target>&Paramètres généraux...</target>
+<source>&Global settings</source>
+<target>&Paramètres généraux</target>
 
 <source>&Tools</source>
 <target>Ou&tils</target>
@@ -717,6 +759,9 @@ La commande est déclenchée si :
 <source>Synchronizing...</source>
 <target>Synchronisation en cours...</target>
 
+<source>Minimize to notification area</source>
+<target>Réduction à la zone de notification</target>
+
 <source>On completion</source>
 <target>À la fin</target>
 
@@ -726,6 +771,15 @@ La commande est déclenchée si :
 <source>&Pause</source>
 <target>&Pause</target>
 
+<source>Variant</source>
+<target>Variante</target>
+
+<source>Statistics</source>
+<target>Statistiques</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Ne plus afficher cette boîte de dialogue</target>
+
 <source>Select a variant</source>
 <target>Choisir une variante</target>
 
@@ -774,6 +828,12 @@ est identique
 <source>Configure your own synchronization rules.</source>
 <target>Paramétrage de vos règles de synchronisation.</target>
 
+<source>Detect moved files</source>
+<target>Détection des fichiers déplacés</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Exige les fichiers de la base de données. Non supporté par tous les systèmes de fichiers.</target>
+
 <source>Error handling</source>
 <target>Erreur de gestion de fichiers</target>
 
@@ -798,17 +858,17 @@ est identique
 <source>Delete or overwrite files permanently</source>
 <target>Supprimer ou écraser les fichiers définitivement</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Corbeille</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Utiliser la corbeille pour les fichiers supprimés ou écrasés</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Sauvegarder les fichier détruits ou écrasés dans la Corbeille</target>
 
 <source>Versioning</source>
 <target>Gestion des versions</target>
 
-<source>Move files to user-defined folder</source>
-<target>Déplacer les fichiers vers un dossier choisi par l'utilisateur</target>
+<source>Move files to a user-defined folder</source>
+<target>Déplacer les fichiers vers un dossier utilisateur</target>
 
 <source>Naming convention:</source>
 <target>Convention de nommage :</target>
@@ -816,8 +876,8 @@ est identique
 <source>Batch job</source>
 <target>Traitement 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>Créer un fichier batch pour automatiser la synchronisation. Double-cliquez sur ce fichier ou entrez-le dans le planificateur de tâches : FreeFileSync.exe <job name>.ffs_batch</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Créer un fichier batch pour une synchronisation non assitée. Pour démarrer, double-cliquez sur ce fichier ou planifiez-le dans le gestionnaire des tâches : %x</target>
 
 <source>Exit</source>
 <target>Quitter</target>
@@ -871,12 +931,12 @@ est identique
 <target>Suppression des deux côtés même si le fichier n'est sélectionné que d'un seul côté</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Seuls les fichiers correspondant à tous les paramètres de filtrage seront synchronisés.
-Attention : les noms de fichiers doivent être relatifs aux répertoires de base.
+Les fichiers ne seront synchronisés que s'ils satisfont aux règles de filtrage.
+Note : Les chemins doivent être relatifs aux répertoires de base.
 </target>
 
 <source>Include</source>
@@ -906,20 +966,20 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <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 garantit la cohérence des données même en cas d'erreur fatale.</target>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Copie d'abord vers un fichier temporaire (*.ffs_tmp) puis le renomme. Cela garantit un état cohérent même en cas d'erreur fatale.</target>
 
 <source>Copy locked files</source>
 <target>Copier les fichiers verrouillés</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>La copie des fichiers partagés ou verrouillés nécessite le Service Volume Shadow Copy (avec les droits administrateur)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Copie de fichiers partagés ou verrouillés à l'aide du service Volume Shadow Copy (exige les droits d'administrateur)</target>
 
 <source>Copy file access permissions</source>
 <target>Copie des droits d'accès aux fichiers</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Transférer les permissions des fichiers et des dossiers (Nécessite les droits administrateur)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Transfert des autorisations de fichier et de dossier (exige les droits d'administrateur)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Afficher les boîtes de dialogue masquées</target>
@@ -933,15 +993,6 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>&Default</source>
 <target>&Défaut</target>
 
-<source>Variant</source>
-<target>Variante</target>
-
-<source>Statistics</source>
-<target>Statistiques</target>
-
-<source>Don't show this dialog again</source>
-<target>Ne plus afficher cette boîte de dialogue</target>
-
 <source>Find what:</source>
 <target>Chercher cela :</target>
 
@@ -951,15 +1002,15 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>&Find next</source>
 <target>&Chercher le suivant</target>
 
+<source>Start synchronization</source>
+<target>Démarrer la synchronisation</target>
+
 <source>Delete</source>
 <target>Supprimer</target>
 
 <source>Configure filter</source>
 <target>Configuration des filtres</target>
 
-<source>Start synchronization</source>
-<target>Démarrer la synchronisation</target>
-
 <source>Find</source>
 <target>Chercher</target>
 
@@ -994,6 +1045,21 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <target>Comparer les deux listes</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Etes-vous sûr de vouloir exécuter la commande %y pour %x élément ?</pluralform>
+<pluralform>Etes-vous sûr de vouloir exécuter la commande %y pour %x éléments ?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Confirmer</target>
+
+<source>&Execute</source>
+<target>&Exécuter</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1029,12 +1095,15 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Include temporarily</source>
 <target>Inclure temporairement</target>
 
-<source>Exclude via filter:</source>
-<target>Exclure à l'aide du filtre :</target>
-
 <source>multiple selection</source>
 <target>sélection multiple</target>
 
+<source>Include via filter:</source>
+<target>Inclure via le filtre :</target>
+
+<source>Exclude via filter:</source>
+<target>Exclure à l'aide du filtre :</target>
+
 <source>Include all</source>
 <target>Inclure tout</target>
 
@@ -1080,8 +1149,8 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Do&n't save</source>
 <target>&Ne pas Sauvegarder</target>
 
-<source>Never save changes</source>
-<target>Ne jamais enregistrer les modifications</target>
+<source>Never save &changes</source>
+<target>Ne jamais sauvegarder les &modifications</target>
 
 <source>Show files that exist on left side only</source>
 <target>Afficher les fichiers existant seulement à gauche</target>
@@ -1134,8 +1203,8 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>All folders are in sync</source>
 <target>Tous les dossiers sont synchronisés</target>
 
-<source>Comma separated list</source>
-<target>Liste d'éléments séparés par une virgule</target>
+<source>Comma-separated values</source>
+<target>Valeurs séparées par une virgule</target>
 
 <source>File list exported</source>
 <target>Liste des fichiers exportée</target>
@@ -1143,8 +1212,8 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Searching for program updates...</source>
 <target>Recherche de mises à jour ...</target>
 
-<source>Ignore further errors</source>
-<target>Ignorer les erreurs suivantes</target>
+<source>&Ignore subsequent errors</source>
+<target>&Ignorer les erreurs suivantes</target>
 
 <source>&Ignore</source>
 <target>&Ignorer</target>
@@ -1152,8 +1221,8 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Fatal Error</source>
 <target>Erreur Fatale</target>
 
-<source>Don't show this warning again</source>
-<target>Ne plus afficher cet avertissement</target>
+<source>&Don't show this warning again</source>
+<target>&Ne plus afficher cet avertissement</target>
 
 <source>&Switch</source>
 <target>&Changer</target>
@@ -1188,14 +1257,11 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Completed</source>
 <target>Terminé</target>
 
-<source>Continue</source>
-<target>Continuer</target>
+<source>&Continue</source>
+<target>&Continuer</target>
 
-<source>Pause</source>
-<target>Pause</target>
-
-<source>Logging</source>
-<target>Connexion</target>
+<source>Log</source>
+<target>Log</target>
 
 <source>Cannot find %x</source>
 <target>Impossible de trouver %x</target>
@@ -1231,12 +1297,12 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <target>Filtre</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>Voulez-vous vraiment mettre dans la corbeille %x élément ?</pluralform>
-<pluralform>Voulez-vous vraiment mettre dans la corbeille ces %x éléments ?</pluralform>
+<pluralform>Etes-vous sûr de vouloir mettre à la Corbeille %x élément suivant ?</pluralform>
+<pluralform>Etes-vous sûr de vouloir mettre à la Corbeille les %x éléments suivants ?</pluralform>
 </target>
 
 <source>
@@ -1290,9 +1356,6 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Append a timestamp to each file name</source>
 <target>Ajouter un horodatage à chaque fichier</target>
 
-<source>Folder</source>
-<target>Dossier</target>
-
 <source>File</source>
 <target>Fichier</target>
 
@@ -1413,7 +1476,7 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Cannot change process I/O priorities.</source>
 <target>Impossible de modifier les priorités E/S des tâches</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
+<source>Unable to move %x to the recycle bin.</source>
 <target>Impossible de déplacer %x dans la Corbeille.</target>
 
 <source>Cannot determine final path for %x.</source>
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index 35c30a34..cd78dc28 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -25,13 +25,13 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Prüfe Verfügbarkeit des Papierkorbs für Ordner %x...</target>
 
-<source>Moving file %x to recycle bin</source>
+<source>Moving file %x to the recycle bin</source>
 <target>Verschiebe Datei %x in den Papierkorb</target>
 
-<source>Moving folder %x to recycle bin</source>
+<source>Moving folder %x to the recycle bin</source>
 <target>Verschiebe Ordner %x in den Papierkorb</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
+<source>Moving symbolic link %x to the recycle bin</source>
 <target>Verschiebe Symbolischen Link %x in den Papierkorb</target>
 
 <source>Deleting file %x</source>
@@ -43,7 +43,7 @@
 <source>Deleting symbolic link %x</source>
 <target>Lösche Symbolischen Link %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
 <target>Der Papierkorb ist für die folgenden Ordner nicht verfügbar. Die Dateien werden stattdessen permanent gelöscht:</target>
 
 <source>An exception occurred</source>
@@ -290,7 +290,7 @@
 <target>Speichere erweiterte Zeitinformation: %x</target>
 
 <source>/sec</source>
-<target>/s</target>
+<target>/sek</target>
 
 <source>%x items</source>
 <target>%x Elemente</target>
@@ -307,7 +307,7 @@
 <source>Browse directory</source>
 <target>Verzeichnis öffnen</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
+<source>Cannot access the Volume Shadow Copy Service.</source>
 <target>Auf den Volumenschattenkopiedienst kann nicht zugegriffen werden.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
@@ -528,12 +528,15 @@ Die Befehlszeile wird ausgelöst, wenn:
 <source>Generating database...</source>
 <target>Erzeuge Synchronisationsdatenbank...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Erstelle Volumenschattenkopie für %x...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Erstelle eine Volumenschattenkopie für %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Verifizierungsfehler: %x und %y haben unterschiedlichen Inhalt.</target>
 
+<source>job name</source>
+<target>Auftragsname</target>
+
 <source>Synchronization aborted</source>
 <target>Synchronisation abgebrochen</target>
 
@@ -670,7 +673,7 @@ Die Befehlszeile wird ausgelöst, wenn:
 <target>&Speichern</target>
 
 <source>Save as &batch job...</source>
-<target>Speichern als &Batch-Job...</target>
+<target>Speichern als &Batch-Auftrag...</target>
 
 <source>1. &Compare</source>
 <target>1. &Vergleichen</target>
@@ -684,8 +687,8 @@ Die Befehlszeile wird ausgelöst, wenn:
 <source>&Export file list...</source>
 <target>Dateiliste e&xportieren...</target>
 
-<source>&Global settings...</source>
-<target>&Globale Einstellungen...</target>
+<source>&Global settings</source>
+<target>&Globale Einstellungen</target>
 
 <source>&Tools</source>
 <target>E&xtras</target>
@@ -702,12 +705,6 @@ Die Befehlszeile wird ausgelöst, wenn:
 <source>Compare</source>
 <target>Vergleichen</target>
 
-<source>Comparison settings</source>
-<target>Vergleichseinstellungen</target>
-
-<source>Synchronization settings</source>
-<target>Synchronisationseinstellungen</target>
-
 <source>Synchronize</source>
 <target>Synchronisieren</target>
 
@@ -720,8 +717,17 @@ Die Befehlszeile wird ausgelöst, wenn:
 <source>Swap sides</source>
 <target>Seiten vertauschen</target>
 
+<source>Close search bar</source>
+<target>Suchleiste schließen</target>
+
+<source>Find what:</source>
+<target>Suchen nach:</target>
+
+<source>Match case</source>
+<target>Groß-/Kleinschreibung</target>
+
 <source>Save as batch job</source>
-<target>Als Batch-Job speichern</target>
+<target>Als Batch-Auftrag speichern</target>
 
 <source>Hide excluded items</source>
 <target>Ausgeschlossene Elemente verstecken</target>
@@ -774,8 +780,8 @@ Die Befehlszeile wird ausgelöst, wenn:
 <source>Statistics</source>
 <target>Statistiken</target>
 
-<source>Don't show this dialog again</source>
-<target>Diesen Dialog nicht mehr anzeigen</target>
+<source>&Don't show this dialog again</source>
+<target>&Diesen Dialog nicht mehr anzeigen</target>
 
 <source>Select a variant</source>
 <target>Variante auswählen</target>
@@ -825,6 +831,12 @@ gleich ist
 <source>Configure your own synchronization rules.</source>
 <target>Eigene Synchronisationsregeln definieren.</target>
 
+<source>Detect moved files</source>
+<target>Verschobene Dateien erkennen</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Benötigt Datenbankdateien. Wird nicht von allen Dateisystemen unterstützt.</target>
+
 <source>Error handling</source>
 <target>Fehlerbehandlung</target>
 
@@ -849,26 +861,26 @@ gleich ist
 <source>Delete or overwrite files permanently</source>
 <target>Dateien endgültig löschen oder überschreiben</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Papierkorb</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Verwende den Papierkorb für gelöschte und überschriebene Dateien</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Gelöschte und überschriebene Dateien im Papierkorb sichern</target>
 
 <source>Versioning</source>
 <target>Versionierung</target>
 
-<source>Move files to user-defined folder</source>
-<target>Dateien in den benutzerdefinierten Ordner verschieben</target>
+<source>Move files to a user-defined folder</source>
+<target>Dateien in einen benutzerdefinierten Ordner verschieben</target>
 
 <source>Naming convention:</source>
 <target>Namenskonvention:</target>
 
 <source>Batch job</source>
-<target>Batch-Job</target>
+<target>Batch-Auftrag</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Erstellt eine Batchdatei für die unbeaufsichtigte Synchronisation. Zum Starten die Datei doppelklicken oder in einen Taskplaner eintragen: %x</target>
 
 <source>Exit</source>
 <target>Beenden</target>
@@ -891,30 +903,6 @@ gleich ist
 <source>Limit maximum number of log files</source>
 <target>Maximale Anzahl der Logdateien begrenzen</target>
 
-<source>Source code written in C++ using:</source>
-<target>Sourcecode in C++ geschrieben mit Hilfe von:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Wenn Sie FreeFileSync mögen</target>
-
-<source>Donate with PayPal</source>
-<target>Mit PayPal spenden</target>
-
-<source>Many thanks for localization:</source>
-<target>Vielen Dank für die Lokalisation:</target>
-
-<source>Feedback and suggestions are welcome</source>
-<target>Feedback und Vorschläge sind willkommen</target>
-
-<source>Homepage</source>
-<target>Homepage</target>
-
-<source>Email</source>
-<target>Email</target>
-
-<source>Published under the GNU General Public License</source>
-<target>Veröffentlicht unter der Allgemeinen Öffentlichen GNU-Lizenz</target>
-
 <source>Delete on both sides</source>
 <target>Auf beiden Seiten löschen</target>
 
@@ -922,12 +910,12 @@ gleich ist
 <target>Lösche auf beiden Seiten, auch wenn die Datei nur auf einer Seite markiert ist</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Nur Dateien, die zu allen Filtereinstellungen passen, werden synchronisiert.
-Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
+Es werden nur Dateien synchronisiert, die zu allen Filterregeln passen.
+Achtung: Dateipfade müssen relativ zu den Basisverzeichnissen sein.
 </target>
 
 <source>Include</source>
@@ -957,20 +945,20 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Kopiere zunächst in eine temporäre Datei (*.ffs_tmp) und benenne diese anschließend um. Dadurch wird ein konsistenter Datenstand auch im größten Fehlerfall garantiert.</target>
 
 <source>Copy locked files</source>
 <target>Gesperrte Dateien kopieren</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Kopiere gesperrte Dateien mit Hilfe des Volumenschattenkopie-Dienstes (Benötigt Administratorrechte)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Kopiere gesperrte Dateien mit Hilfe des Volumenschattenkopie-Dienstes (benötigt Administratorrechte)</target>
 
 <source>Copy file access permissions</source>
 <target>Dateizugriffsberechtigungen kopieren</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Übertrage Datei- und Ordnerberechtigungen (Benötigt Administratorrechte)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Übertrage Datei- und Ordnerberechtigungen (benötigt Administratorrechte)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Versteckte Dialoge wiederherstellen</target>
@@ -984,26 +972,44 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>&Default</source>
 <target>&Standard</target>
 
-<source>Find what:</source>
-<target>Suchen nach:</target>
+<source>Source code written in C++ using:</source>
+<target>Sourcecode in C++ geschrieben mit Hilfe von:</target>
 
-<source>Match case</source>
-<target>Groß-/Kleinschreibung</target>
+<source>If you like FreeFileSync</source>
+<target>Wenn Sie FreeFileSync mögen</target>
 
-<source>&Find next</source>
-<target>&Weitersuchen</target>
+<source>Donate with PayPal</source>
+<target>Mit PayPal spenden</target>
+
+<source>Feedback and suggestions are welcome</source>
+<target>Feedback und Vorschläge sind willkommen</target>
+
+<source>Homepage</source>
+<target>Homepage</target>
+
+<source>Email</source>
+<target>Email</target>
+
+<source>Published under the GNU General Public License</source>
+<target>Veröffentlicht unter der Allgemeinen Öffentlichen GNU-Lizenz</target>
+
+<source>Many thanks for localization:</source>
+<target>Vielen Dank für die Lokalisation:</target>
 
 <source>Start synchronization</source>
 <target>Synchronisation starten</target>
 
+<source>Comparison settings</source>
+<target>Vergleichseinstellungen</target>
+
+<source>Synchronization settings</source>
+<target>Synchronisationseinstellungen</target>
+
 <source>Delete</source>
 <target>Löschen</target>
 
 <source>Configure filter</source>
-<target>Konfiguriere Filter</target>
-
-<source>Find</source>
-<target>Suchen</target>
+<target>Filter konfigurieren</target>
 
 <source>Select time span</source>
 <target>Zeitspanne auswählen</target>
@@ -1011,6 +1017,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>Folder pairs</source>
 <target>Ordnerpaare</target>
 
+<source>Find</source>
+<target>Suchen</target>
+
 <source>Overview</source>
 <target>Übersicht</target>
 
@@ -1050,9 +1059,6 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>&Execute</source>
 <target>&Ausführen</target>
 
-<source>&Don't show this dialog again</source>
-<target>&Diesen Dialog nicht mehr anzeigen</target>
-
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
@@ -1083,17 +1089,20 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>Set direction:</source>
 <target>Setze Richtung:</target>
 
-<source>Exclude temporarily</source>
-<target>Temporär ausschließen</target>
+<source>multiple selection</source>
+<target>Mehrfachauswahl</target>
 
-<source>Include temporarily</source>
-<target>Temporär einschließen</target>
+<source>Include via filter:</source>
+<target>Über Filter einschließen:</target>
 
 <source>Exclude via filter:</source>
 <target>Über Filter ausschließen:</target>
 
-<source>multiple selection</source>
-<target>Mehrfachauswahl</target>
+<source>Exclude temporarily</source>
+<target>Temporär ausschließen</target>
+
+<source>Include temporarily</source>
+<target>Temporär einschließen</target>
 
 <source>Include all</source>
 <target>Alle einschließen</target>
@@ -1140,8 +1149,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>Do&n't save</source>
 <target>&Nicht speichern</target>
 
-<source>Never save changes</source>
-<target>Änderungen nie speichern</target>
+<source>Never save &changes</source>
+<target>Änderungen nie &speichern</target>
 
 <source>Show files that exist on left side only</source>
 <target>Nur links existierende Dateien anzeigen</target>
@@ -1194,6 +1203,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>All folders are in sync</source>
 <target>Alle Ordner sind synchron</target>
 
+<source>Cannot find %x</source>
+<target>%x wurde nicht gefunden.</target>
+
 <source>Comma-separated values</source>
 <target>Kommagetrennte Werte</target>
 
@@ -1203,8 +1215,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>Searching for program updates...</source>
 <target>Suche nach aktualisierten Programmversionen...</target>
 
-<source>Ignore further errors</source>
-<target>Weitere Fehler ignorieren</target>
+<source>&Ignore subsequent errors</source>
+<target>&Nachfolgende Fehler ignorieren</target>
 
 <source>&Ignore</source>
 <target>&Ignorieren</target>
@@ -1212,8 +1224,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>Fatal Error</source>
 <target>Schwerer Fehler</target>
 
-<source>Don't show this warning again</source>
-<target>Diese Warnung nicht mehr anzeigen</target>
+<source>&Don't show this warning again</source>
+<target>&Diese Warnung nicht mehr anzeigen</target>
 
 <source>&Switch</source>
 <target>&Wechseln</target>
@@ -1254,9 +1266,6 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>Log</source>
 <target>Protokoll</target>
 
-<source>Cannot find %x</source>
-<target>%x wurde nicht gefunden.</target>
-
 <source>Inactive</source>
 <target>Inaktiv</target>
 
@@ -1288,8 +1297,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <target>Filter</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
 <pluralform>Soll das folgende Element wirklich in den Papierkorb verschoben werden?</pluralform>
@@ -1467,7 +1476,7 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>Cannot change process I/O priorities.</source>
 <target>Die Eingabe/Ausgabe Prioritäten für den Prozess konnten nicht geändert werden.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
+<source>Unable to move %x to the recycle bin.</source>
 <target>%x kann nicht in den Papierkorb verschoben werden.</target>
 
 <source>Cannot determine final path for %x.</source>
diff --git a/BUILD/Languages/greek.lng b/BUILD/Languages/greek.lng
index dc22668c..96df2f6b 100644
--- a/BUILD/Languages/greek.lng
+++ b/BUILD/Languages/greek.lng
@@ -1,6 +1,6 @@
 <header>
 	<language>Eλληνικά</language>
-	<translator>Γιώργος Γιαγλής</translator>
+	<translator>Γιώργος Δ. Γιαγλής</translator>
 	<locale>el_GR</locale>
 	<flag_image>flag_greece.png</flag_image>
 	<plural_form_count>2</plural_form_count>
@@ -25,13 +25,13 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Έλεγχος της διαθεσιμότητας του κάδου ανακύκλωσης για τον υποκατάλογο %x...</target>
 
-<source>Moving file %x to recycle bin</source>
+<source>Moving file %x to the recycle bin</source>
 <target>Μεταφορά του αρχείου %x στον κάδο ανακύκλωσης</target>
 
-<source>Moving folder %x to recycle bin</source>
+<source>Moving folder %x to the recycle bin</source>
 <target>Μεταφορά του υποκαταλόγου %x στον κάδο ανακύκλωσης</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
+<source>Moving symbolic link %x to the recycle bin</source>
 <target>Μεταφορά του συμβολικού δεσμού %x στον κάδο ανακύκλωσης</target>
 
 <source>Deleting file %x</source>
@@ -43,14 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>Διαγραφή του συμβολικού δεσμού %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>Ο Κάθος Ανακύκλωσης δεν είναι διαθέσιμος στους παρακάτω υποκαταλόγους. Τα αρχεία θα διαγραφούν μόνιμα:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Ο κάδος ανακύκλωσης δεν είναι διαθέσιμος για τους ακόλουθους υποκαταλόγους. Τα αρχεία θα διαγραφούν μόνιμα:</target>
 
 <source>An exception occurred</source>
 <target>Παρουσιάστηκε σφάλμα</target>
 
-<source>Cannot find file %x.</source>
-<target>Το αρχείο %x δε βρέθηκε.</target>
+<source>A directory path is expected after %x.</source>
+<target>Αναμένεται μια διαδρομή υποκαταλόγου μετά το %x.</target>
+
+<source>Syntax error</source>
+<target>Σφάλμα σύνταξης</target>
+
+<source>Cannot open file %x.</source>
+<target>Δεν είναι δυνατό το άνοιγμα του αρχείου %x.</target>
 
 <source>Error</source>
 <target>Σφάλματα</target>
@@ -58,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>Το αρχείο %x δεν περιέχει μια έγκυρη διάταξη.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Έχει οριστεί άνισος αριθμός υποκαταλόγων δεξιά από ό,τι αριστερά.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Το αρχείο διάταξης δεν πρέπει να περιλαμβάνει ρυθμίσεις στο επίπεδο του ζεύγους των υποκαταλόγων, όταν οι υποκατάλογοι ορίζονται μέσω της γραμμής εργασιών.</target>
+
+<source>Warning</source>
+<target>Προειδοποίηση</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Δεν μπορούν να οριστούν υποκατάλογοι για περισσότερα από ένα αρχεία διάταξης.</target>
+
+<source>Syntax:</source>
+<target>Σύνταξη:</target>
+
+<source>config files</source>
+<target>αρχεία διάταξης</target>
+
+<source>directory</source>
+<target>υποκατάλογος</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Οποιοσδήποτε αριθμός αρχείων διάταξης .ffs_gui ή/και .ffs_batch του FreeFileSync</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Οποιοσδήποτε αριθμός εναλλακτικών υποκαταλόγων για το πολύ ένα αρχείο διάταξης.</target>
+
+<source>Command line</source>
+<target>Γραμμή εντολών</target>
+
 <source>A folder input field is empty.</source>
 <target>Ένα πεδίο εισαγωγής υποκαταλόγων είναι άδειο.</target>
 
@@ -215,12 +251,12 @@
 <target>Συνολική διάρκεια:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -242,12 +278,12 @@
 <target>Ανίχνευση:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 Νήμα]</pluralform>
-<pluralform>[%x Νήματα]</pluralform>
+<pluralform>1 νήμα</pluralform>
+<pluralform>%x νήματα</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -256,6 +292,9 @@
 <source>/sec</source>
 <target>/δευτερόλεπτο</target>
 
+<source>%x items</source>
+<target>%x αντικείμενα</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Το αρχείο διάταξης %x έχει φορτωθεί μόνο κατά ένα μέρος.</target>
 
@@ -268,8 +307,8 @@
 <source>Browse directory</source>
 <target>Αναζήτηση υποκαταλόγου</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Δεν πέτυχε η πρόσφαση στην Υπηρεσεία Σκιώδους Αντίγραφου Τόμου.</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Δεν είναι δυνατή η πρόσβαση στην Υπηρεσία Σκιώδους Αντίγραφου Τόμου.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Χρησιμοποιήστε την 64-μπιτη έκδοση του FreeFileSync για να δημιουργήσετε σκιώδη αντίγραφα σε αυτόν τον υπολογιστή.</target>
@@ -280,8 +319,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Δεν μπορεί να προσδιοριστεί το όνομα τόμου για το %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Το όνομα τόμου %x δεν είναι μέρος του ονόματος του αρχείου %y.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>Το όνομα τόμου %x δεν είναι μέρος της διαδρομής %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Ζητήθηκε ματαίωση: Αναμονή για την λήξη της τρέχουσας εργασίας...</target>
@@ -349,9 +388,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Λανθάνων χρόνος μεταξύ τελευταίας αλλαγής που ανιχνεύθηκε και εκτέλεσης της εντολής</target>
 
-<source>Command line</source>
-<target>Γραμμή εντολών</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -375,9 +411,6 @@ The command is triggered if:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Αυτοματοποιημένος Συγχρονισμός</target>
 
-<source>Warning</source>
-<target>Προειδοποίηση</target>
-
 <source>Build: %x</source>
 <target>Δημιουργήθηκε : %x</target>
 
@@ -387,15 +420,21 @@ The command is triggered if:
 <source>All files</source>
 <target>Όλα τα αρχεία</target>
 
+<source>Directory monitoring active</source>
+<target>Η παρακολούθηση των υποκαταλόγων είναι ενεργή</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Αναμονή μέχρι να είναι διαθέσιμοι όλοι οι υποκατάλογοι...</target>
+
 <source>&Restore</source>
 <target>&Επαναφορά</target>
 
+<source>&Show error</source>
+<target>&Εμφάνιση σφάλματος</target>
+
 <source>&Exit</source>
 <target>Έ&ξοδος</target>
 
-<source>Waiting for missing directories...</source>
-<target>Αναμονή για τους υποκαταλόγους που απουσιάζουν...</target>
-
 <source>Invalid command line:</source>
 <target>Σφάλμα στη γραμμή εντολών:</target>
 
@@ -405,14 +444,14 @@ The command is triggered if:
 <source>File time and size</source>
 <target>Ημερομηνία και μέγεθος αρχείων</target>
 
-<source> Two way </source>
-<target> Διπλής κατεύθυνσης </target>
+<source>Two way</source>
+<target>Διπλής κατεύθυνσης</target>
 
 <source>Mirror</source>
-<target>Κατοπτρισμός </target>
+<target>Κατοπτρισμός</target>
 
 <source>Update</source>
-<target>Ενημέρωση </target>
+<target>Ενημέρωση</target>
 
 <source>Custom</source>
 <target>Εξατομίκευση</target>
@@ -468,11 +507,8 @@ The command is triggered if:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Τα ακόλουθα στοιχεία έχουν ανεπίλυτες διενέξεις και δε θα συγχρονιστούν:</target>
 
-<source>Significant difference detected:</source>
-<target>Ανιχνεύθηκαν σημαντικές διαφορές:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Περισσότερα από το 50% των αρχείων θα αντιγραφούν ή διαγραφούν.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Οι ακόλουθοι υποκατάλογοι είναι σημαντικά διαφορετικοί. Σιγουρευτείτε ότι έχετε επιλέξει τους κατάλληλους υποκαταλόγους για συγχρονισμό.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Δεν υπάρχει αρκετός διαθέσιμος χώρος στο δίσκο:</target>
@@ -492,11 +528,14 @@ The command is triggered if:
 <source>Generating database...</source>
 <target>Δημιουργία βάσης δεδομένων...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
+<source>Creating a Volume Shadow Copy for %x...</source>
 <target>Δημιουργία Σκιώδους Αντίγραφου Τόμου για το %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
-<target>Λάθος επαλήθευσης δεδομένων: το %x και το %y έχουν διαφορετικό περιεχόμενο.</target>
+<target>Σφάλμα επαλήθευσης δεδομένων: το %x και το %y έχουν διαφορετικό περιεχόμενο.</target>
+
+<source>job name</source>
+<target>όνομα ενέργειας</target>
 
 <source>Synchronization aborted</source>
 <target>Ο συγχρονισμός ματαιώθηκε</target>
@@ -522,6 +561,9 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog</source>
 <target>Εναλλαγή στο βασικό παράθυρο του FreeFileSync</target>
 
+<source>Retrying operation after error:</source>
+<target>Επανάληψη της προσπάθειας μετά από σφάλμα:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Μια νέα έκδοση του FreeFileSync είναι διαθέσιμη:</target>
 
@@ -645,8 +687,8 @@ The command is triggered if:
 <source>&Export file list...</source>
 <target>Ε&ξαγωγή καταλόγου αρχείων...</target>
 
-<source>&Global settings...</source>
-<target>Γενικές &ρυθμίσεις...</target>
+<source>&Global settings</source>
+<target>Γενικές &ρυθμίσεις</target>
 
 <source>&Tools</source>
 <target>&Εργαλεία</target>
@@ -717,6 +759,9 @@ The command is triggered if:
 <source>Synchronizing...</source>
 <target>Γίνεται συγχρονισμός...</target>
 
+<source>Minimize to notification area</source>
+<target>Ελαχιστοποίηση στην περιοχή ειδοποιήσεων</target>
+
 <source>On completion</source>
 <target>Μετά την ολοκλήρωση</target>
 
@@ -726,6 +771,15 @@ The command is triggered if:
 <source>&Pause</source>
 <target>&Παύση</target>
 
+<source>Variant</source>
+<target>Μέθοδος</target>
+
+<source>Statistics</source>
+<target>Στατιστικά</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Να μην εμφανιστεί ξανά αυτό το μήνυμα</target>
+
 <source>Select a variant</source>
 <target>Επιλέξτε μια μέθοδο</target>
 
@@ -774,6 +828,12 @@ is the same
 <source>Configure your own synchronization rules.</source>
 <target>Ορίστε τους δικούς σας κανόνες συγχρονισμού.</target>
 
+<source>Detect moved files</source>
+<target>Ανίχνευση των αρχείων που μεταφέρθηκαν</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Απαιτεί αρχεία βάσης δεδομένων. Δεν υποστηρίζεται από όλα τα συστήματα αρχείων.</target>
+
 <source>Error handling</source>
 <target>Διαχείριση σφαλμάτων</target>
 
@@ -798,17 +858,17 @@ is the same
 <source>Delete or overwrite files permanently</source>
 <target>Μόνιμη διαγραφή ή αντικατάσταση των αρχείων</target>
 
-<source>Recycle Bin</source>
-<target>Κάδος Ανακύκλωσης</target>
+<source>Recycle bin</source>
+<target>Κάδος ανακύκλωσης</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Χρήση του Κάδου Ανακύκλωσης για αρχεία που διαγράφηκαν ή αντικαταστάθηκαν</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Μεταφορά όλων των διαγραμμένων και αντικατεστημένων αρχείων στον κάδο ανακύκλωσης.</target>
 
 <source>Versioning</source>
 <target>Διατήρηση παλιών εκδόσεων</target>
 
-<source>Move files to user-defined folder</source>
-<target>Μεταφορά των αρχείων σε έναν υποκατάλογο που ορίζεται από το χρήστη</target>
+<source>Move files to a user-defined folder</source>
+<target>Μεταφορά αρχείων σε έναν υποκατάλογο που ορίζεται από το χρήστη</target>
 
 <source>Naming convention:</source>
 <target>Τρόπος ονομασίας:</target>
@@ -816,8 +876,8 @@ is the same
 <source>Batch job</source>
 <target>Δέσμη ενεργειών</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Δημιουργία ενός αρχείου δέσμης για αυτόματο συγχρονισμό. Για να ξεκινήσετε, κάντε διπλό κλικ σε αυτό το αρχείο ή ενσωματώστε το σε ένα χρονοδιάγραμμα εργασιών: %x</target>
 
 <source>Exit</source>
 <target>Έξοδος</target>
@@ -871,12 +931,12 @@ is the same
 <target>Διαγραφή και στις δυο πλευρές, ακόμα κι αν το αρχείο έχει επιλεχθεί μόνο στη μια πλευρά</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Θα συγχρονιστούν μόνον όσα αρχεία πληρούν όλες τις απαιτήσεις των φίλτρων.
-Σημείωση: Πρέπει να χρησιμοποιούνται οι σχετικές διαδρομές των αρχείων ως προς τους υποκαταλόγους που συγχρονίζονται.
+Θα συγχρονιστούν τα αρχεία που ικανοποιούν όλους τους κανόνες των φίλτρων.
+Σημείωση: Οι διαδρομές των αρχείων πρέπει να είναι σχετικές ως προς τους βασικούς υποκαταλόγους.
 </target>
 
 <source>Include</source>
@@ -906,20 +966,20 @@ Note: File names must be relative to base directories.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Αντιγραφή αρχικά σε ένα προσωρινό αρχείο (*.ffs_tmp) και στη συνέχεια μετονομασία του. Αυτό εγγυάται μια συνεπή κατάσταση ακόμα και σε περίπτωση μοιραίου σφάλματος.</target>
 
 <source>Copy locked files</source>
 <target>Αντιγραφή κλειδωμένων αρχείων</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Αντιγραφή κλειδωμένων ή διαμοιρασμένων αρχείων με την Yπηρεσία Σκιώδους Αντίγραφου Τόμου (απαιτεί δικαιώματα Administrator)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Αντιγραφή των κοινόχρηστων ή κλειδωμένων αρχείων με τη χρήση της Υπηρεσίας Σκιώδους Αντίγραφου Τόμου (απαιτεί δικαιώματα διαχειριστή)</target>
 
 <source>Copy file access permissions</source>
 <target>Αντιγραφή των αδειών προσπέλασης των αρχείων</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Μεταφορά των αδειών των αρχείων και των υποκαταλόγων (Απαιτεί δικαιώματα Διαχειριστή)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Μεταφορά των αδειών προσπέλασης των αρχείων και των υποκαταλόγων(απαιτεί δικαιώματα διαχειριστή)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Επανεμφάνιση κρυμμένων μηνυμάτων</target>
@@ -933,15 +993,6 @@ Note: File names must be relative to base directories.
 <source>&Default</source>
 <target>&Προεπιλογή</target>
 
-<source>Variant</source>
-<target>Μέθοδος</target>
-
-<source>Statistics</source>
-<target>Στατιστικά</target>
-
-<source>Don't show this dialog again</source>
-<target>Να μην εμφανιστεί ξανά αυτό το μήνυμα</target>
-
 <source>Find what:</source>
 <target>Αναζήτηση του:</target>
 
@@ -951,15 +1002,15 @@ Note: File names must be relative to base directories.
 <source>&Find next</source>
 <target>&Εύρεση επομένου</target>
 
+<source>Start synchronization</source>
+<target>Έναρξη του συγχρονισμού</target>
+
 <source>Delete</source>
 <target>Διαγραφή</target>
 
 <source>Configure filter</source>
 <target>Ρύθμιση του φίλτρου</target>
 
-<source>Start synchronization</source>
-<target>Έναρξη του συγχρονισμού</target>
-
 <source>Find</source>
 <target>Αναζήτηση</target>
 
@@ -994,6 +1045,21 @@ Note: File names must be relative to base directories.
 <target>Σύγκριση των δύο πλευρών</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Είστε σίγουροι ότι θέλετε να εκτελέσετε την εντολή %y για 1 αντικείμενο;</pluralform>
+<pluralform>Είστε σίγουροι ότι θέλετε να εκτελέσετε την εντολή %y για %x αντικείμενα;</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Επιβεβαίωση</target>
+
+<source>&Execute</source>
+<target>&Εκτέλεση</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1029,12 +1095,15 @@ Note: File names must be relative to base directories.
 <source>Include temporarily</source>
 <target>Προσωρινή συμπερίληψη</target>
 
-<source>Exclude via filter:</source>
-<target>Εξαίρεση με βάση το φίλτρο:</target>
-
 <source>multiple selection</source>
 <target>πολλαπλή επιλογή</target>
 
+<source>Include via filter:</source>
+<target>Συμπερίληψη μέσω του φίλτρου:</target>
+
+<source>Exclude via filter:</source>
+<target>Εξαίρεση με βάση το φίλτρο:</target>
+
 <source>Include all</source>
 <target>Συμπερίληψη όλων</target>
 
@@ -1080,8 +1149,8 @@ Note: File names must be relative to base directories.
 <source>Do&n't save</source>
 <target>Να &μην αποθηκευθούν</target>
 
-<source>Never save changes</source>
-<target>Να μην αποθηκεύονται οι αλλαγές</target>
+<source>Never save &changes</source>
+<target>Να &μην αποθηκεύονται οι αλλαγές</target>
 
 <source>Show files that exist on left side only</source>
 <target>Εμφάνιση των αρχείων που υπάρχουν μόνο στα αριστερά</target>
@@ -1134,8 +1203,8 @@ Note: File names must be relative to base directories.
 <source>All folders are in sync</source>
 <target>Όλοι οι υποκατάλογοι είναι συγχρονισμένοι</target>
 
-<source>Comma separated list</source>
-<target>Κατάλογος οριοθετημένος με κόμματα</target>
+<source>Comma-separated values</source>
+<target>Αρχείο χωρισμένο με κόμματα</target>
 
 <source>File list exported</source>
 <target>Ο κατάλογος των αρχείων έχει εξαχθεί</target>
@@ -1143,8 +1212,8 @@ Note: File names must be relative to base directories.
 <source>Searching for program updates...</source>
 <target>Αναζήτηση καινούριας έκδοσης...</target>
 
-<source>Ignore further errors</source>
-<target>Αγνόηση επόμενων σφαλμάτων</target>
+<source>&Ignore subsequent errors</source>
+<target>&Αγνόηση επόμενων σφαλμάτων</target>
 
 <source>&Ignore</source>
 <target>&Παράβλεψη</target>
@@ -1152,8 +1221,8 @@ Note: File names must be relative to base directories.
 <source>Fatal Error</source>
 <target>Σημαντικό Σφάλμα</target>
 
-<source>Don't show this warning again</source>
-<target>Να μην εμφανιστεί ξανά αυτή η προειδοποίηση</target>
+<source>&Don't show this warning again</source>
+<target>&Να μην εμφανιστεί ξανά αυτή η προειδοποίηση</target>
 
 <source>&Switch</source>
 <target>&Εναλλαγή</target>
@@ -1188,14 +1257,11 @@ Note: File names must be relative to base directories.
 <source>Completed</source>
 <target>Ολοκληρώθηκε</target>
 
-<source>Continue</source>
-<target>Συνέχιση</target>
+<source>&Continue</source>
+<target>&Συνέχεια</target>
 
-<source>Pause</source>
-<target>Παύση</target>
-
-<source>Logging</source>
-<target>Καταγραφέντα μηνύματα</target>
+<source>Log</source>
+<target>Καταγραφή</target>
 
 <source>Cannot find %x</source>
 <target>Δεν μπορεί να βρεθεί το %x</target>
@@ -1231,12 +1297,12 @@ Note: File names must be relative to base directories.
 <target>Φίλτρο</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>Είσαι σίγουρος ότι θέλεις να μεταφερθεί το ακόλουθο αντικείμενο στον Κάδο Ανακύκλωσης;</pluralform>
-<pluralform>Είσαι σίγουρος ότι θέλεις να μεταφερθούν τα ακόλουθα %x αντικείμενα στον Κάδο Ανακύκλωσης;</pluralform>
+<pluralform>Είστε σίγουροι ότι θέλετε να μετακινήσετε το ακόλουθο αντικείμενο στον κάδο ανακύκλωσης;</pluralform>
+<pluralform>Είστε σίγουροι ότι θέλετε να μετακινήσετε τα ακόλουθα %x αντικείμενα στον κάδο ανακύκλωσης;</pluralform>
 </target>
 
 <source>
@@ -1290,9 +1356,6 @@ Note: File names must be relative to base directories.
 <source>Append a timestamp to each file name</source>
 <target>Προσάρτηση χρονικής σήμανσης σε κάθε όνομα αρχείου</target>
 
-<source>Folder</source>
-<target>Υποκατάλογος</target>
-
 <source>File</source>
 <target>Αρχείο</target>
 
@@ -1413,8 +1476,8 @@ Note: File names must be relative to base directories.
 <source>Cannot change process I/O priorities.</source>
 <target>Δεν μπορούν να αλλάξουν οι προτεραιότητες I/O της διεργασίας.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Το αρχείο %x δεν ήταν δυνατό να μεταφερθεί στον Κάδο Ανακύκλωσης.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>Δεν ήταν δυνατή η μεταφορά του %x στον κάδο ανακύκλωσης.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>Δεν μπορεί να προσδιοριστεί η τελική διαδρομή για το %x.</target>
diff --git a/BUILD/Languages/hebrew.lng b/BUILD/Languages/hebrew.lng
index c7b0adcd..ede03515 100644
--- a/BUILD/Languages/hebrew.lng
+++ b/BUILD/Languages/hebrew.lng
@@ -7,6 +7,12 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target></target>
+
+<source>Close search bar</source>
+<target></target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>שני הצדדים שונו מאז הסנכרון האחרון.</target>
 
@@ -25,14 +31,14 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>בודק זמינות סל מחזור עבור מחיצה %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>מעביר קובץ %x לסל מחזור</target>
+<source>Moving file %x to the recycle bin</source>
+<target>מעביר קובץ %x לסל המיחזור</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>מעביר מחיצה %x לסל מחזור</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>מעביר תיקייה %x לסל המיחזור</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>מעביר קישור סימבולי %x לסל מחזור</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>מעביר קישור סימבולי %x לסל המיחזור</target>
 
 <source>Deleting file %x</source>
 <target>מוחק קובץ %x</target>
@@ -43,14 +49,20 @@
 <source>Deleting symbolic link %x</source>
 <target>מוחק קישור סימבולי %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>סל המיחזור אינו זמין עבור התיקיות הבאות. קבצים ימחקו סופית:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>סל המיחזור אינו זמין עבור התיקיות הבאות. הקבצים יימחקו לחלוטין:</target>
 
 <source>An exception occurred</source>
 <target>אירוע חריג</target>
 
-<source>Cannot find file %x.</source>
-<target>לא יכול למצוא קובץ %x.</target>
+<source>A directory path is expected after %x.</source>
+<target>נתיב מחיצה נדרש אחרי %x.</target>
+
+<source>Syntax error</source>
+<target>שגיאת תחביר</target>
+
+<source>Cannot open file %x.</source>
+<target>לא יכול לפתוח קובץ %x.</target>
 
 <source>Error</source>
 <target>שגיאה</target>
@@ -58,6 +70,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>קובץ %x אינו כולל תצורה תקינה.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>מספר בלתי שווה של מחיצות ימין ושמאל צוין.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>קבצי הקונפיגורציה אינם  יכולים לכלול הגדרות של זוגות מחיצות כאשר מחיצות מוגדרות באמצעות שורת הפקודה</target>
+
+<source>Warning</source>
+<target>אזהרה</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>מחיצות אינו יכולות להיות מוגדרות עבור יותר מקובץ קונפיגורציה אחד.</target>
+
+<source>Syntax:</source>
+<target>תחביר:</target>
+
+<source>config files</source>
+<target>קבצי קונפיגורציה</target>
+
+<source>directory</source>
+<target>מחיצה</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>כל כמות של קבצי FreeFileSync .ffs_gui ו\או קבצי קונפיגורציה .ffs_batch.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>כל כמות של מחיצות אלטרנטיביות עבור לפחות קובץ קונפיגורציה אחד.</target>
+
+<source>Command line</source>
+<target>שורת פקודות</target>
+
 <source>A folder input field is empty.</source>
 <target>שדה קלט תיקייה ריק.</target>
 
@@ -215,12 +257,12 @@
 <target>זמן כולל:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>1 בייט</pluralform>
-<pluralform>%x בייט</pluralform>
+<pluralform>בית 1</pluralform>
+<pluralform>%x בתים</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -242,12 +284,12 @@
 <target>סורק:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[תהליכון 1]</pluralform>
-<pluralform>[%x תהליכונים]</pluralform>
+<pluralform>תהליך 1</pluralform>
+<pluralform>%x תהליכים</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -256,6 +298,9 @@
 <source>/sec</source>
 <target>/שנ</target>
 
+<source>%x items</source>
+<target>%x פריטים</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>קובץ תצורה %x נטען חלקית בלבד.</target>
 
@@ -268,8 +313,8 @@
 <source>Browse directory</source>
 <target>עיין במחיצה</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>לא יכול לגשת אל volume shadow copy service.</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>לא ניתן לגשת אל שרות Volume Shadow Copy</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>אנא השתמש בגירסת 64-bit של FreeFileSync על מנת ליצר shadow copies במערכת הפעלה זו.</target>
@@ -280,8 +325,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>לא יכול לקבוע שם אמצעי אחסון %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>ככונן %x לא בנתיב של קובץ %y.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>כרך בשם %x אינו חלק של נתיב קובץ %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>התקבלה בקשת ביטול: מחכה לפעולה הנוכחית להסתיים...</target>
@@ -349,9 +394,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>זמן המתנה בין שינויי מאובחן אחרון לבין ביצוע של פקודה</target>
 
-<source>Command line</source>
-<target>שורת פקודות</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -375,9 +417,6 @@ The command is triggered if:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - סינכרון  אוטומטי</target>
 
-<source>Warning</source>
-<target>אזהרה</target>
-
 <source>Build: %x</source>
 <target>מבנה: %x</target>
 
@@ -387,15 +426,21 @@ The command is triggered if:
 <source>All files</source>
 <target>כל הקבצים</target>
 
+<source>Directory monitoring active</source>
+<target>ניטור מחיצות פעיל</target>
+
+<source>Waiting until all directories are available...</source>
+<target>מחכה עד שכל המחיצות יהיו זמינות...</target>
+
 <source>&Restore</source>
 <target>&טען מחדש</target>
 
+<source>&Show error</source>
+<target>&הראה שגיאה</target>
+
 <source>&Exit</source>
 <target>&יציאה</target>
 
-<source>Waiting for missing directories...</source>
-<target>מחכה למחיצות חסרות...</target>
-
 <source>Invalid command line:</source>
 <target>שורת פקודה בלתי חוקית:</target>
 
@@ -405,14 +450,14 @@ The command is triggered if:
 <source>File time and size</source>
 <target>זמן וגודל קובץ</target>
 
-<source> Two way </source>
+<source>Two way</source>
 <target>דו כווני</target>
 
 <source>Mirror</source>
-<target>מראה </target>
+<target>מראה</target>
 
 <source>Update</source>
-<target>שדרג </target>
+<target>שדרג</target>
 
 <source>Custom</source>
 <target>מותאם</target>
@@ -468,11 +513,8 @@ The command is triggered if:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>לפריטים הבאים יש קונפליקטים בלתי פתורים והם לא יסונכרנו:</target>
 
-<source>Significant difference detected:</source>
-<target>התגלה שוני גדול מידי:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>יותר מ 50% מהקבצים ימחקו או יועתקו.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>התיקיות הבאות שונות באופן מהותי. ודא את התאמת התיקיות לסינכרון.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>אין מספיק מקום דיסק פנוי ב:</target>
@@ -492,12 +534,15 @@ The command is triggered if:
 <source>Generating database...</source>
 <target>מייצר מסד נתונים...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>יוצר העתק  volume shadow עבור %x...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>מייצר Volume Shadow Copy עבור %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>שגיאת אימות נתונים. ל %x ו %y יש תוכן שונה.</target>
 
+<source>job name</source>
+<target>שם משימה</target>
+
 <source>Synchronization aborted</source>
 <target>סינכרון בוטל</target>
 
@@ -522,6 +567,9 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog</source>
 <target>מחליף לתיבת דו שיח ראשית של FreeFileSync</target>
 
+<source>Retrying operation after error:</source>
+<target>מנסה שנית לאחר שגיאה:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>גירסה חדשה של FreeFileSync זמינה:</target>
 
@@ -645,8 +693,8 @@ The command is triggered if:
 <source>&Export file list...</source>
 <target>&יצא רשימת קבצים...</target>
 
-<source>&Global settings...</source>
-<target>&משתנים גלובליים...</target>
+<source>&Global settings</source>
+<target>&משתנים גלובליים</target>
 
 <source>&Tools</source>
 <target>&כלים</target>
@@ -663,12 +711,6 @@ The command is triggered if:
 <source>Compare</source>
 <target>השוואה</target>
 
-<source>Comparison settings</source>
-<target>הגדרות השוואה</target>
-
-<source>Synchronization settings</source>
-<target>הגדרות סנכרון</target>
-
 <source>Synchronize</source>
 <target>סנכרן</target>
 
@@ -681,6 +723,12 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>החלף צדדים</target>
 
+<source>Find what:</source>
+<target>חפש מה:</target>
+
+<source>Match case</source>
+<target>התאם רישיות</target>
+
 <source>Save as batch job</source>
 <target>שמור כעבודת אצווה</target>
 
@@ -717,6 +765,9 @@ The command is triggered if:
 <source>Synchronizing...</source>
 <target>מסנכרן...</target>
 
+<source>Minimize to notification area</source>
+<target>הקטן לאיזור ההתרעות</target>
+
 <source>On completion</source>
 <target>לאחר סיום:</target>
 
@@ -726,6 +777,15 @@ The command is triggered if:
 <source>&Pause</source>
 <target>&עצור</target>
 
+<source>Variant</source>
+<target>משתנה</target>
+
+<source>Statistics</source>
+<target>סטטיסטיקה</target>
+
+<source>&Don't show this dialog again</source>
+<target>&אל תראה דושיח זה שנית</target>
+
 <source>Select a variant</source>
 <target>בחר גירסה</target>
 
@@ -774,6 +834,12 @@ is the same
 <source>Configure your own synchronization rules.</source>
 <target>סדר את כללי הסנכרון שלך.</target>
 
+<source>Detect moved files</source>
+<target>גלה קבצים מועברים</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>דורש קבצי בסיס נתונים. לא נתמך ע"י כל מערכות הקבצים.</target>
+
 <source>Error handling</source>
 <target>טיפול בשגיאות</target>
 
@@ -798,17 +864,17 @@ is the same
 <source>Delete or overwrite files permanently</source>
 <target>מחק או דרוס קבצים לצמיתות</target>
 
-<source>Recycle Bin</source>
-<target>סל מחזור</target>
+<source>Recycle bin</source>
+<target>סל מיחזור</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>השתמש בסל המחזור עבור קבצים נמחקים או נדרסים</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>גבה קבצים שנמחקו או שנדרסו בסל המיחזור</target>
 
 <source>Versioning</source>
 <target>עדכון גרסאות</target>
 
-<source>Move files to user-defined folder</source>
-<target>העבר קבצים למחיצה שהוגדרה ע"י המשתמש</target>
+<source>Move files to a user-defined folder</source>
+<target>העבר קבצים לתיקייה המוגדרת ע"י המפעיל</target>
 
 <source>Naming convention:</source>
 <target>מוסכמות לקביעת שמות:</target>
@@ -816,8 +882,8 @@ is the same
 <source>Batch job</source>
 <target>עבודת אצווה</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 <jobname>.ffs</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>צור קובץ אצווה לסינכרון ללא התערבות מפעיל. כדי להפעיל, הקלק הקלקה כפולה על הקובץ או תזמן במתכנן המשימות: %x</target>
 
 <source>Exit</source>
 <target>יציאה</target>
@@ -840,30 +906,6 @@ is the same
 <source>Limit maximum number of log files</source>
 <target>הגבל מספר מכסימלי של קבצי יומן</target>
 
-<source>Source code written in C++ using:</source>
-<target>קוד מקור נכתב ב- C++ באמצעות:</target>
-
-<source>If you like FreeFileSync</source>
-<target>במידה ו-FreeFileSync מוצאת חן בעינכם</target>
-
-<source>Donate with PayPal</source>
-<target>תרום עם פייפל</target>
-
-<source>Many thanks for localization:</source>
-<target>תודות עבור תרגום שפות:</target>
-
-<source>Feedback and suggestions are welcome</source>
-<target>משוב והצעות יתקבלו בברכה</target>
-
-<source>Homepage</source>
-<target>אתר-הבית:</target>
-
-<source>Email</source>
-<target>דוא"ל:</target>
-
-<source>Published under the GNU General Public License</source>
-<target>מפורסם במסגרת GNU General Public License</target>
-
 <source>Delete on both sides</source>
 <target>מחק בשני הצדדים</target>
 
@@ -871,12 +913,12 @@ is the same
 <target>מחק בשני הצדדים אף אם הקובץ נבחר בצד אחד בלבד</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-רק קבצים המתאימים לכל הגדרות המסנן יסונכרנו.
-הערה: שמות קבצים חייבים להיות מוגדרים באופן יחסי למחיצות הראשיות.
+קבצים יסונכרנו רק אם יקיימו את כל חוקי המסנן.
+הערה: נתיבי קבצים חייבים להיות יחסיים למחיצות הבסיס.
 </target>
 
 <source>Include</source>
@@ -906,20 +948,17 @@ Note: File names must be relative to base directories.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>העתק לקובץ זמני (*.ffs_tmp) ראשית ואז שנה את שמו. זה מבטיח במצ עיקבי במקרה של שגיאה חמורה.</target>
 
 <source>Copy locked files</source>
 <target>העתק קבצים נעולים</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>העתק קבצים בשיתוף או נעולים באמצעות שרות Volume Shadow Copy Service (דורש הרשאות מנהל מערכת)</target>
-
 <source>Copy file access permissions</source>
 <target>העתק הרשאות גישה של הקובץ</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>העבר הרשאות של תיקיות וקבצים (דורש זכויות מנהל)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>העבר הרשאות של קובץ ותיקיה (דורש זכויות מנהל)</target>
 
 <source>Restore hidden dialogs</source>
 <target>שחזר דיאלוגים מוסתרים</target>
@@ -933,35 +972,44 @@ Note: File names must be relative to base directories.
 <source>&Default</source>
 <target>&ברירת מחדל</target>
 
-<source>Variant</source>
-<target>משתנה</target>
+<source>Source code written in C++ using:</source>
+<target>קוד מקור נכתב ב- C++ באמצעות:</target>
 
-<source>Statistics</source>
-<target>סטטיסטיקה</target>
+<source>If you like FreeFileSync</source>
+<target>במידה ו-FreeFileSync מוצאת חן בעינכם</target>
 
-<source>Don't show this dialog again</source>
-<target>אל תראה דו-שיח זה שוב</target>
+<source>Donate with PayPal</source>
+<target>תרום עם פייפל</target>
 
-<source>Find what:</source>
-<target>חפש מה:</target>
+<source>Feedback and suggestions are welcome</source>
+<target>משוב והצעות יתקבלו בברכה</target>
 
-<source>Match case</source>
-<target>התאם רישיות</target>
+<source>Homepage</source>
+<target>אתר-הבית:</target>
 
-<source>&Find next</source>
-<target>&מצא הבא</target>
+<source>Email</source>
+<target>דוא"ל:</target>
 
-<source>Delete</source>
-<target>מחק</target>
+<source>Published under the GNU General Public License</source>
+<target>מפורסם במסגרת GNU General Public License</target>
 
-<source>Configure filter</source>
-<target>תצורת מסנן</target>
+<source>Many thanks for localization:</source>
+<target>תודות עבור תרגום שפות:</target>
 
 <source>Start synchronization</source>
 <target>התחל סנכרון</target>
 
-<source>Find</source>
-<target>חפש</target>
+<source>Comparison settings</source>
+<target>הגדרות השוואה</target>
+
+<source>Synchronization settings</source>
+<target>הגדרות סנכרון</target>
+
+<source>Delete</source>
+<target>מחק</target>
+
+<source>Configure filter</source>
+<target>תצורת מסנן</target>
 
 <source>Select time span</source>
 <target>בחר תחום זמן</target>
@@ -969,6 +1017,9 @@ Note: File names must be relative to base directories.
 <source>Folder pairs</source>
 <target>זוגות מחיצות</target>
 
+<source>Find</source>
+<target>חפש</target>
+
 <source>Overview</source>
 <target>מבט כללי</target>
 
@@ -994,6 +1045,21 @@ Note: File names must be relative to base directories.
 <target>השווה בין שני הצדדים</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>האם ברצונך לבצע את הפקודה %y עבור פריט אחד?</pluralform>
+<pluralform>האם ברצונל לבצע את הפקודה %y עבור %x פריטים?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>אשר</target>
+
+<source>&Execute</source>
+<target>&בצע</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1023,17 +1089,20 @@ Note: File names must be relative to base directories.
 <source>Set direction:</source>
 <target>בחר כוון:</target>
 
-<source>Exclude temporarily</source>
-<target>אל תכלול זמנית</target>
+<source>multiple selection</source>
+<target>בחירה מרובה</target>
 
-<source>Include temporarily</source>
-<target>כלול זמנית</target>
+<source>Include via filter:</source>
+<target>כלול באמצעות מסנן:</target>
 
 <source>Exclude via filter:</source>
 <target>אל תכלול בעזרת סנן:</target>
 
-<source>multiple selection</source>
-<target>בחירה מרובה</target>
+<source>Exclude temporarily</source>
+<target>אל תכלול זמנית</target>
+
+<source>Include temporarily</source>
+<target>כלול זמנית</target>
 
 <source>Include all</source>
 <target>הכלל הכל</target>
@@ -1080,8 +1149,8 @@ Note: File names must be relative to base directories.
 <source>Do&n't save</source>
 <target>אל &תשמור</target>
 
-<source>Never save changes</source>
-<target>אל תשמור שינויים לעולם</target>
+<source>Never save &changes</source>
+<target>לא לשמור שינויים ל&עולם</target>
 
 <source>Show files that exist on left side only</source>
 <target>הראה קבצים הנמצאים אך ורק בצד ימין</target>
@@ -1134,8 +1203,11 @@ Note: File names must be relative to base directories.
 <source>All folders are in sync</source>
 <target>כל התיקיות מסונכרנות</target>
 
-<source>Comma separated list</source>
-<target>רשימה מופרדת פסיקים</target>
+<source>Cannot find %x</source>
+<target>לא מוצא %x</target>
+
+<source>Comma-separated values</source>
+<target>ערכים מופרדים באמצעות פסיק</target>
 
 <source>File list exported</source>
 <target>רשימת קבצים יוצאה</target>
@@ -1143,8 +1215,8 @@ Note: File names must be relative to base directories.
 <source>Searching for program updates...</source>
 <target>מחפש עידכוני תוכנה...</target>
 
-<source>Ignore further errors</source>
-<target>התעלם משגיאות נוספות</target>
+<source>&Ignore subsequent errors</source>
+<target>&התעלם מאזהרות נוספות</target>
 
 <source>&Ignore</source>
 <target>&התעלם</target>
@@ -1152,8 +1224,8 @@ Note: File names must be relative to base directories.
 <source>Fatal Error</source>
 <target>שגיאה פטלית</target>
 
-<source>Don't show this warning again</source>
-<target>אל תראה אזהרה זו שוב</target>
+<source>&Don't show this warning again</source>
+<target>&לא להראות אזהרה זו שוב</target>
 
 <source>&Switch</source>
 <target>&החלפה</target>
@@ -1188,17 +1260,11 @@ Note: File names must be relative to base directories.
 <source>Completed</source>
 <target>הושלם</target>
 
-<source>Continue</source>
-<target>המשך</target>
-
-<source>Pause</source>
-<target>עצור</target>
+<source>&Continue</source>
+<target>&המשך</target>
 
-<source>Logging</source>
-<target>רישום ביומן</target>
-
-<source>Cannot find %x</source>
-<target>לא מוצא %x</target>
+<source>Log</source>
+<target>יומן</target>
 
 <source>Inactive</source>
 <target>בלתי פעיל</target>
@@ -1231,12 +1297,12 @@ Note: File names must be relative to base directories.
 <target>מסנן</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>האם ברצונך להעביר את הפריט הבא לסל המיחזור?</pluralform>
-<pluralform>האם ברצונך להעביר את הפריטים %x הבאים לסל המיחזור?</pluralform>
+<pluralform>האם  באמת ברצונך להעביר את הפריט הבא לסל המחזור?</pluralform>
+<pluralform>האם באמת ברצונך להעביר את הפריטים הבאים %x לסל המחזור?</pluralform>
 </target>
 
 <source>
@@ -1290,9 +1356,6 @@ Note: File names must be relative to base directories.
 <source>Append a timestamp to each file name</source>
 <target>הצמד תג זמן לכל שם קובץ</target>
 
-<source>Folder</source>
-<target>תיקייה</target>
-
 <source>File</source>
 <target>קובץ</target>
 
@@ -1413,8 +1476,8 @@ Note: File names must be relative to base directories.
 <source>Cannot change process I/O priorities.</source>
 <target>לא יכול לשנות קדימויות של תהליך קלט פלט.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>לא יכול להעביר את %x לסל המיחזור.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>לא יכול להעביר את %x לסל המחזור</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>לא יכול לקבוע את המסלול הסופי ל %x.</target>
diff --git a/BUILD/Languages/hungarian.lng b/BUILD/Languages/hungarian.lng
index a58698fb..8061b8bf 100644
--- a/BUILD/Languages/hungarian.lng
+++ b/BUILD/Languages/hungarian.lng
@@ -11,7 +11,7 @@
 <target>Mindkét oldal megváltozott az utolsó szikronizálás óta.</target>
 
 <source>Cannot determine sync-direction:</source>
-<target>Nem lehet meghatározni a szinkronizálás irányát:</target>
+<target>Nem meghatározható a szinkronizálás iránya:</target>
 
 <source>No change since last synchronization.</source>
 <target>Az utolsó szinkronizálás óta nem történt változás.</target>
@@ -23,19 +23,19 @@
 <target>Alapértelmezett szinkronizálási irányok beállítása: a régebbi fájlokat írja felül az újabbakkal.</target>
 
 <source>Checking recycle bin availability for folder %x...</source>
-<target>A Lomtár elérhetőségének ellenőrzése a következő könyvtár vonatkozásában: %x.</target>
+<target>A Lomtár elérhetőségének ellenőrzése %x könyvtár vonatkozásában...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>%x fájl mozgatása a Lomtárba (Recycle Bin)</target>
+<source>Moving file %x to the recycle bin</source>
+<target>%x fájlt a Lomtárba mozgatja</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>%x könyvtár mozgatása a Lomtárba (Recycle Bin)</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>%x könyvtárat a Lomtárba mozgatja</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>%x szimbolikus hivatkozás mozgatása a Lomtárba (Recycle Bin)</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>%x szimbolikus linket a Lomtárba mozgatja</target>
 
 <source>Deleting file %x</source>
-<target>%x Fájl törlése</target>
+<target>%x fájl törlése</target>
 
 <source>Deleting folder %x</source>
 <target>%x könyvtár törlése</target>
@@ -43,23 +43,59 @@
 <source>Deleting symbolic link %x</source>
 <target>%x szimbolikus hivatkozás törlése</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>A Lomtár nem elérhető a következő könytárak esetében. A fájlok ehelyett végleges törlésre kerülnek!</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>A Lomtár nem elérhető a következő könytárak esetében. A fájlok ezért véglegesen törlődnek:</target>
 
 <source>An exception occurred</source>
-<target>Kivétel lépett fel</target>
+<target>Kivétel történt</target>
 
-<source>Cannot find file %x.</source>
-<target>Nem található a következő fájl: %x.</target>
+<source>A directory path is expected after %x.</source>
+<target>%x után egy könyvtár elérési útvonalának kell következnie.</target>
+
+<source>Syntax error</source>
+<target>Szintaktikai hiba</target>
+
+<source>Cannot open file %x.</source>
+<target>%x fájl nem nyitható.</target>
 
 <source>Error</source>
 <target>Hiba</target>
 
 <source>File %x does not contain a valid configuration.</source>
-<target>A következő fájl nem tartalmaz érvényes beállításokat: %x.</target>
+<target>%x fájl nem tartalmaz érvényes beállításokat.</target>
+
+<source>Unequal number of left and right directories specified.</source>
+<target>Eltérő számú bal- és jobboldali könyvtárat határozott meg.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>A konfigurációs fájl nem tartalmazhat beállításokat könyvár-pár szinten, ha a könyvtárakat parancssorban állítjuk be.</target>
+
+<source>Warning</source>
+<target>Figyelmeztetés</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>A könyvtárakat nem lehet egynél több konfigurációs fájlra beállítani</target>
+
+<source>Syntax:</source>
+<target>Szintaxis:</target>
+
+<source>config files</source>
+<target>konfigurációs fájlok</target>
+
+<source>directory</source>
+<target>könyvtár</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Tetszőleges számú .ffs_gui és/vagy .ffs_batch konfigurációs fájl készíthető a FreeFileSync-hez</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Tetszőleges számú alternatív könyvtár legfeljebb egy konfigurációs fájlhoz</target>
+
+<source>Command line</source>
+<target>Parancssor</target>
 
 <source>A folder input field is empty.</source>
-<target>A könyvtár beviteli mezeje üres.</target>
+<target>A könyvtár beviteli mező üres.</target>
 
 <source>The corresponding folder will be considered as empty.</source>
 <target>A kapcsolódó könyvtárat üresként kezeli.</target>
@@ -68,7 +104,7 @@
 <target>A következő könyvtárak nem találhatóak:</target>
 
 <source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
-<target>Figyelmen kívül hagyhatod ezt a hibát ezzel üresnek tekintve minden egyes könyvtárat. A könytárak automatikusan létrejönnek a szinkronizálás folyamán.</target>
+<target>Figyelmen kívül hagyhatod ezt a hibát, ezzel üresnek tekintve minden egyes könyvtárat. A könytárak ekkor automatikusan létrejönnek a szinkronizálás folyamán.</target>
 
 <source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source>
 <target>A következő könytárak egymástól függő útvonalat tartalmaznak. Légy óvatos a szinkronizálás szabályainak meghatározásánál!</target>
@@ -215,12 +251,12 @@
 <target>Összes időszükségelet:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>1 Bájt</pluralform>
-<pluralform>%x Bájt</pluralform>
+<pluralform>1 bájt</pluralform>
+<pluralform>%x bájt</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -242,12 +278,12 @@
 <target>Vizsgálat:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 szál]</pluralform>
-<pluralform>[%x szál]</pluralform>
+<pluralform>1 szál</pluralform>
+<pluralform>%x szál</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -256,6 +292,9 @@
 <source>/sec</source>
 <target>/másodperc</target>
 
+<source>%x items</source>
+<target>%x elem</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>%x konfigurációs fájl csak részlegesen töltődött be: .</target>
 
@@ -268,8 +307,8 @@
 <source>Browse directory</source>
 <target>Tallózza a könyvtárat</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Nem sikerült elérni a kötet-árnyékmásolat (Volume Shadow Copy) szolgáltatást.</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Nem elérhető a Kötet Árnyék-másolat szolgáltatás.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Kérjük, használd a FreeFileSync 64 bites verzióját az árnyékmásolatok készítéséhez ezen a rendszeren.</target>
@@ -280,8 +319,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Nem lehet meghatározni a kötet-nevet a(z) %x számára</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>%x kötet-nevet nem tartalmazza a(z) %y fájlnév.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>%x kötet név nem része a(z) %y fájl elérési útvonalnak</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Megszakítást igényelt: Várakozás a folyamatban lévő művelet befejezésére...</target>
@@ -349,9 +388,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Üresjárat időtartama az utolsó változás észlelése és a parancs végrehajtása között</target>
 
-<source>Command line</source>
-<target>Parancssor</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -375,9 +411,6 @@ A parancs végrehajtódik, ha:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>Valós idejű - Automatikus szinkronizálás</target>
 
-<source>Warning</source>
-<target>Figyelem</target>
-
 <source>Build: %x</source>
 <target>Build: %x</target>
 
@@ -387,15 +420,21 @@ A parancs végrehajtódik, ha:
 <source>All files</source>
 <target>Összes fájl</target>
 
+<source>Directory monitoring active</source>
+<target>A könytár figyelés aktív</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Várakozik, amíg az összes könyvtár elérhetővé válik...</target>
+
 <source>&Restore</source>
 <target>&Visszaállít</target>
 
+<source>&Show error</source>
+<target>&Mutassa a hibákat</target>
+
 <source>&Exit</source>
 <target>&Kilép</target>
 
-<source>Waiting for missing directories...</source>
-<target>Várakozás a hiányzó könyvtárakra...</target>
-
 <source>Invalid command line:</source>
 <target>Érvénytelen parancssor:</target>
 
@@ -405,14 +444,14 @@ A parancs végrehajtódik, ha:
 <source>File time and size</source>
 <target>Fájl dátuma és mérete</target>
 
-<source> Two way </source>
-<target> Kétirányú </target>
+<source>Two way</source>
+<target>Kétirányú</target>
 
 <source>Mirror</source>
-<target>Tükröz </target>
+<target>Tükröz</target>
 
 <source>Update</source>
-<target>Frissít </target>
+<target>Frissít</target>
 
 <source>Custom</source>
 <target>Egyedi</target>
@@ -468,11 +507,8 @@ A parancs végrehajtódik, ha:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>A következő elemek feloldatlan ütközést tartalmaznak, így nem lesznek szinkronizálva:</target>
 
-<source>Significant difference detected:</source>
-<target>Jelentős különbség érzékelt:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Az összes fájl több mint 50%-át másolni vagy törölni fogja.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>A következő könyvtárak lényegileg különböznek. Győződjön meg róla, hogy a megfelelő könyvtárakat illesztette-e össze szinkronizáláshoz.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Nincs elég szabad lemezterület:</target>
@@ -492,12 +528,15 @@ A parancs végrehajtódik, ha:
 <source>Generating database...</source>
 <target>Adatbázis generálása...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Kötet árnyékmásolat (Volume Shadow Copy) létrehozása %x számára...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Készít egy ányékmásolat-kötetet %x számára</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Adat-ellenőrzési hiba: %x és %y tartalma különböző.</target>
 
+<source>job name</source>
+<target>feladat neve</target>
+
 <source>Synchronization aborted</source>
 <target>A szinkronizálás megszakítva</target>
 
@@ -522,6 +561,9 @@ A parancs végrehajtódik, ha:
 <source>Switching to FreeFileSync main dialog</source>
 <target>Váltás a FreeFileSync fő párbeszéd-ablakára</target>
 
+<source>Retrying operation after error:</source>
+<target>Újrapróbálja a műveletet a hiba után:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Elérhető a FreeFileSync új verziója:</target>
 
@@ -645,8 +687,8 @@ A parancs végrehajtódik, ha:
 <source>&Export file list...</source>
 <target>&Exportálja a fájllistát...</target>
 
-<source>&Global settings...</source>
-<target>&Globális beállítások...</target>
+<source>&Global settings</source>
+<target>&Globális beállítások</target>
 
 <source>&Tools</source>
 <target>Es&zközök</target>
@@ -717,6 +759,9 @@ A parancs végrehajtódik, ha:
 <source>Synchronizing...</source>
 <target>Szinkronizálás folyamatban...</target>
 
+<source>Minimize to notification area</source>
+<target>Minimalizálja a figyelmeztetési területre</target>
+
 <source>On completion</source>
 <target>Befejezés esetén</target>
 
@@ -726,6 +771,15 @@ A parancs végrehajtódik, ha:
 <source>&Pause</source>
 <target>&Várakozás</target>
 
+<source>Variant</source>
+<target>Variáns</target>
+
+<source>Statistics</source>
+<target>Statisztika</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Ne mutassa ismételten ezt a párbeszédablakot</target>
+
 <source>Select a variant</source>
 <target>Válassz egy variánst</target>
 
@@ -774,11 +828,17 @@ megegyezik
 <source>Configure your own synchronization rules.</source>
 <target>Állítsd be a saját szinkronizálási szabályaidat</target>
 
+<source>Detect moved files</source>
+<target>Érzékelje a mozgatott fájlokat</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Adatbázis fájlok szükségesek. Nem minden fájlrendszer támogatja.</target>
+
 <source>Error handling</source>
 <target>Hibakezelés</target>
 
 <source>Ignore</source>
-<target>Kihagy</target>
+<target>Figyelmen kívül hagy</target>
 
 <source>Hide all error and warning messages</source>
 <target>Rejtse el az összes hibaüzenetet és figyelmeztetést</target>
@@ -798,17 +858,17 @@ megegyezik
 <source>Delete or overwrite files permanently</source>
 <target>Törölje vagy írja felül véglegesen a fájlokat</target>
 
-<source>Recycle Bin</source>
-<target>Lomtár (Recycle Bin)</target>
+<source>Recycle bin</source>
+<target>Lomtár</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Használd a Lomtárat a törölt és felülírt fájlok számára</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Mentse a törölt és felülírt fájlokat a Lomtárba</target>
 
 <source>Versioning</source>
 <target>Verziókövetés</target>
 
-<source>Move files to user-defined folder</source>
-<target>Mozgasd a fájlokat  a felhasználó által megadott könyvtárba</target>
+<source>Move files to a user-defined folder</source>
+<target>Mozgassa a fájlokat egy a felhasználó által meghatározott könyvtárba</target>
 
 <source>Naming convention:</source>
 <target>Elnevezési konvenció:</target>
@@ -816,8 +876,8 @@ megegyezik
 <source>Batch job</source>
 <target>Kötegelt feladat</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ájlnévre vagy ütemezd a rendszered feladatütemezőjével: FreeFileSync.exe <feladatnév>.ffs_batch</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Készitsen egy parancsfájlt a felügyelet nélküli szinkronizáláshoz. Az indításhoz kattintson kétszer erre a fájlra vagy ütemezze a feladat-tervezőben: %x</target>
 
 <source>Exit</source>
 <target>Kilép</target>
@@ -871,12 +931,12 @@ megegyezik
 <target>Törlés mindkét oldalon, még akkor is, ha a fájl csak az egyik oldalon lett kijelölve</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Csak a valamennyi szűrő-beállításnak megfelelő fájlok lesznek szinkronizálva.
-Megjegyzés: A fájlneveket az alapkönyvtárakhoz képest kell vizsgálni.
+A fájlokat csak akkor szinkronizálja, ha azok valamennyi szűrőfeltételnek megfelelnek.
+Megjegyzés: Az útvonalakat az alapkönyvtárakhoz képest kell megadni.
 </target>
 
 <source>Include</source>
@@ -906,20 +966,20 @@ Megjegyzés: A fájlneveket az alapkönyvtárakhoz képest kell vizsgálni.
 <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>Írja egy ideiglenes fájlba (*.ffs_tmp), majd azt nevezze át. Ez garantálja az konzisztens állapotot még végzetes hiba esetén is.</target>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Másolja először egy ideiglenes fájlba (*.ffs_tmp) aztán nevezze át. Ez garantálja a konzisztents állapotot végzetes hibák esetén is.</target>
 
 <source>Copy locked files</source>
 <target>Másolja a zárolt fájlokat</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Másolja a megosztott vagy zárolt fájlokat  a Volume Shadow Copy szolgáltatással (Adminisztrátori jogosultság szükséges)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>A megosztott és zárolt fájlokat a kötet-árnyékmásolat szolgáltatás használatával másolja(adminisztrátori jogosultság szükséges)</target>
 
 <source>Copy file access permissions</source>
 <target>Másolja a fájl hozzáférési jogosultságokat</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Fájlok és könytárak jogosultságainak átvitele (Adminisztrátori jogosultság szükséges)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Örökítse át a fájl és könyvtár jogosultságokat (adminisztrátori jogosultság szükséges)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Állítsa vissza a rejtett párbeszédablakokat</target>
@@ -933,15 +993,6 @@ Megjegyzés: A fájlneveket az alapkönyvtárakhoz képest kell vizsgálni.
 <source>&Default</source>
 <target>&Alapértelmezett</target>
 
-<source>Variant</source>
-<target>Variáns</target>
-
-<source>Statistics</source>
-<target>Statisztika</target>
-
-<source>Don't show this dialog again</source>
-<target>Ne mutasd többé ezt a párbeszédablakot</target>
-
 <source>Find what:</source>
 <target>Mit keres:</target>
 
@@ -951,15 +1002,15 @@ Megjegyzés: A fájlneveket az alapkönyvtárakhoz képest kell vizsgálni.
 <source>&Find next</source>
 <target>&Keresse a következőt</target>
 
+<source>Start synchronization</source>
+<target>Indítja a szinkronizálást</target>
+
 <source>Delete</source>
 <target>Töröl</target>
 
 <source>Configure filter</source>
 <target>Beállítja a szűrőt</target>
 
-<source>Start synchronization</source>
-<target>Indítja a szinkronizálást</target>
-
 <source>Find</source>
 <target>Keres:</target>
 
@@ -994,6 +1045,21 @@ Megjegyzés: A fájlneveket az alapkönyvtárakhoz képest kell vizsgálni.
 <target>Vesse össze mindkét oldalt</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Tényleg a végre akarja hajtani a(z) %y parancsot a következő elemen?</pluralform>
+<pluralform>Tényleg a végre akarja hajtani a(z) %y parancsot a következő %x elemen?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Jóváhagy</target>
+
+<source>&Execute</source>
+<target>Vé&grehajt</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1029,12 +1095,15 @@ Megjegyzés: A fájlneveket az alapkönyvtárakhoz képest kell vizsgálni.
 <source>Include temporarily</source>
 <target>Csatolja ideiglenesen</target>
 
-<source>Exclude via filter:</source>
-<target>Zárja ki szűrő segítségével:</target>
-
 <source>multiple selection</source>
 <target>többszörös kijelölés</target>
 
+<source>Include via filter:</source>
+<target>A szűrőt figyelembe véve adja hozzá</target>
+
+<source>Exclude via filter:</source>
+<target>Zárja ki szűrő segítségével:</target>
+
 <source>Include all</source>
 <target>Csatolja az összest</target>
 
@@ -1080,8 +1149,8 @@ Megjegyzés: A fájlneveket az alapkönyvtárakhoz képest kell vizsgálni.
 <source>Do&n't save</source>
 <target>&ne mentse</target>
 
-<source>Never save changes</source>
-<target>Ne mentse a változtatásokat</target>
+<source>Never save &changes</source>
+<target>N&e mentse a változásokat</target>
 
 <source>Show files that exist on left side only</source>
 <target>Mutassa a csak a bal oldalon létező fájlokat</target>
@@ -1134,8 +1203,8 @@ Megjegyzés: A fájlneveket az alapkönyvtárakhoz képest kell vizsgálni.
 <source>All folders are in sync</source>
 <target>Minden könyvtár szinkronban</target>
 
-<source>Comma separated list</source>
-<target>CSV formátumú (vesszővel elválasztott) lista</target>
+<source>Comma-separated values</source>
+<target>Vesszővel elválasztott értékek (CSV)</target>
 
 <source>File list exported</source>
 <target>A fájllista exportálása befejeződött</target>
@@ -1143,8 +1212,8 @@ Megjegyzés: A fájlneveket az alapkönyvtárakhoz képest kell vizsgálni.
 <source>Searching for program updates...</source>
 <target>Programfrissítés keresése...</target>
 
-<source>Ignore further errors</source>
-<target>Hagyja figyelmen kívül a további hibákat</target>
+<source>&Ignore subsequent errors</source>
+<target>F&igyelmen kívül hagyja az utána következő hibákat</target>
 
 <source>&Ignore</source>
 <target>&Kihagy</target>
@@ -1152,8 +1221,8 @@ Megjegyzés: A fájlneveket az alapkönyvtárakhoz képest kell vizsgálni.
 <source>Fatal Error</source>
 <target>Kritikus hiba</target>
 
-<source>Don't show this warning again</source>
-<target>Ne mutassa ismét ezt a figyelmeztetést</target>
+<source>&Don't show this warning again</source>
+<target>&Ne mutassa ismételten ezt a figyelmeztetést</target>
 
 <source>&Switch</source>
 <target>&Váltás</target>
@@ -1188,14 +1257,11 @@ Megjegyzés: A fájlneveket az alapkönyvtárakhoz képest kell vizsgálni.
 <source>Completed</source>
 <target>Befejeződött</target>
 
-<source>Continue</source>
-<target>Folytat</target>
+<source>&Continue</source>
+<target>&Folytat</target>
 
-<source>Pause</source>
-<target>Szünet</target>
-
-<source>Logging</source>
-<target>Naplózás</target>
+<source>Log</source>
+<target>Napló</target>
 
 <source>Cannot find %x</source>
 <target>Nem található: %x</target>
@@ -1231,12 +1297,12 @@ Megjegyzés: A fájlneveket az alapkönyvtárakhoz képest kell vizsgálni.
 <target>Szűrő</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>Valóban a Lomtárba akarod mozgatni a következő elemet?</pluralform>
-<pluralform>Valóban a Lomtárba akarod mozgatni a következő %x elemet?</pluralform>
+<pluralform>Tényleg a Lomtárba akarja áthelyezni a következő elemet?</pluralform>
+<pluralform>Tényleg a Lomtárba akarja áthelyezni a következő %x elemet?</pluralform>
 </target>
 
 <source>
@@ -1290,9 +1356,6 @@ Megjegyzés: A fájlneveket az alapkönyvtárakhoz képest kell vizsgálni.
 <source>Append a timestamp to each file name</source>
 <target>Adjon időbélyeget minden fájlnévhez</target>
 
-<source>Folder</source>
-<target>Könyvtár</target>
-
 <source>File</source>
 <target>Fájl</target>
 
@@ -1413,8 +1476,8 @@ Megjegyzés: A fájlneveket az alapkönyvtárakhoz képest kell vizsgálni.
 <source>Cannot change process I/O priorities.</source>
 <target>Nem sikerült a folyamatok I/O prioritását megváltoztatni.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>%x Lomtárba helyezése sikertelen.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>%x nem helyezhető a Lomtárba</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>Nem lehet meghatározni a végső útvonalat a(z) %x számára.</target>
diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng
index 3dcac298..3a3f8e3d 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -7,78 +7,6 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
-<source>Log</source>
-<target></target>
-
-<source>Comma-separated values</source>
-<target></target>
-
-<source>Minimize to notification area</source>
-<target></target>
-
-<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
-<target></target>
-
-<source>&Show error</source>
-<target></target>
-
-<source>Waiting until all directories are available...</source>
-<target></target>
-
-<source>Directory monitoring active</source>
-<target></target>
-
-<source>Volume name %x is not part of file path %y.</source>
-<target></target>
-
-<source>%x items</source>
-<target></target>
-
-<source>
-<pluralform>1 thread</pluralform>
-<pluralform>%x threads</pluralform>
-</source>
-<target></target>
-
-<source>
-<pluralform>1 byte</pluralform>
-<pluralform>%x bytes</pluralform>
-</source>
-<target></target>
-
-<source>Any number of alternative directories for at most one config file.</source>
-<target></target>
-
-<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
-<target></target>
-
-<source>directory</source>
-<target></target>
-
-<source>config files</source>
-<target></target>
-
-<source>Syntax:</source>
-<target></target>
-
-<source>Directories cannot be set for more than one configuration file.</source>
-<target></target>
-
-<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
-<target></target>
-
-<source>Unequal number of left and right directories specified.</source>
-<target></target>
-
-<source>Cannot open file %x.</source>
-<target></target>
-
-<source>Syntax error</source>
-<target></target>
-
-<source>A directory path is expected after %x.</source>
-<target></target>
-
 <source>Both sides have changed since last synchronization.</source>
 <target>Entrambi i lati sono cambiati dall'ultima sincronizzazione.</target>
 
@@ -97,14 +25,14 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Controllo di disponibilità Cestino per la cartella %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>Spostamento file %x nel Cestino</target>
+<source>Moving file %x to the recycle bin</source>
+<target>Spostamento file %x nel cestino</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>Spostamento cartella %x nel Cestino</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>Spostamento delle cartelle %x nel cestino</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Spostamento collegamento %x nel Cestino</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>Spostamento collegamento %x nel cestino</target>
 
 <source>Deleting file %x</source>
 <target>Eliminazione file %x</target>
@@ -115,21 +43,54 @@
 <source>Deleting symbolic link %x</source>
 <target>Eliminazione collegamento %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>Il Cestino non è disponibile per le seguenti cartelle. I file verranno quindi eliminati in modo permanente:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Il cestino non è disponibile per le seguenti cartelle. I file verranno invece eliminati in modo permanente:</target>
 
 <source>An exception occurred</source>
 <target>Si è verificata una eccezione</target>
 
+<source>A directory path is expected after %x.</source>
+<target>Un percorso di directory è previsto dopo %x.</target>
+
+<source>Syntax error</source>
+<target>Errore di sintassi</target>
+
+<source>Cannot open file %x.</source>
+<target>Impossibile aprire il file %x.</target>
+
 <source>Error</source>
 <target>Errore</target>
 
 <source>File %x does not contain a valid configuration.</source>
 <target>Il file %x non contiene una configurazione valida.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Numero disuguale di directory sinistra e destra specificate.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Il file di configurazione non deve contenere le impostazioni a livello di coppia di directory quando le directory sono impostati tramite linea di comando.</target>
+
 <source>Warning</source>
 <target>Attenzione</target>
 
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Directory non possono essere impostate per più di un file di configurazione.</target>
+
+<source>Syntax:</source>
+<target>Sintassi:</target>
+
+<source>config files</source>
+<target>file di configurazione</target>
+
+<source>directory</source>
+<target>directory</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Qualsiasi numero di FreeFileSync.ffs_gui e/o File di configurazione .ffs_batch.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Qualsiasi numero di directory alternativa per al massimo un file di configurazione.</target>
+
 <source>Command line</source>
 <target>Linea di comando</target>
 
@@ -289,6 +250,15 @@
 <source>Total time:</source>
 <target>Tempo totale:</target>
 
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
+<target>
+<pluralform>1 byte</pluralform>
+<pluralform>%x byte</pluralform>
+</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -307,12 +277,24 @@
 <source>Scanning:</source>
 <target>Scansione di:</target>
 
+<source>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
+</source>
+<target>
+<pluralform>1 thread</pluralform>
+<pluralform>%x thread</pluralform>
+</target>
+
 <source>Encoding extended time information: %x</source>
 <target>Codifica estesa informazioni orario: %x</target>
 
 <source>/sec</source>
 <target>/sec</target>
 
+<source>%x items</source>
+<target>%x articoli</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>File di configurazione %x caricato solo parzialmente.</target>
 
@@ -325,8 +307,8 @@
 <source>Browse directory</source>
 <target>Sfoglia cartelle</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Impossibile accedere al servizio Volume Shadow Copy.</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Impossibile accedere al Volume Shadow Copy Service.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>E' necessario utilizzare FreeFileSync versione 64-bit per creare copie shadow su questo sistema.</target>
@@ -337,6 +319,9 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Impossibile determinare nome del volume per %x.</target>
 
+<source>Volume name %x is not part of file path %y.</source>
+<target>Nome volume %x non fa parte del percorso del file %y.</target>
+
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Richiesta interruazione: attendere conclusione dell'operazione...</target>
 
@@ -435,9 +420,18 @@ Il comando è attivato se:
 <source>All files</source>
 <target>Tutti i file</target>
 
+<source>Directory monitoring active</source>
+<target>Directory di monitoraggio attiva</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Aspettare fino a quando sono disponibili tutte le directory...</target>
+
 <source>&Restore</source>
 <target>&Ripristina</target>
 
+<source>&Show error</source>
+<target>&Mostra errore</target>
+
 <source>&Exit</source>
 <target>&Esci</target>
 
@@ -513,6 +507,9 @@ Il comando è attivato se:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>I seguenti oggetti hanno conflitti irrisolti e non saranno sincronizzati:</target>
 
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Le seguenti cartelle sono significativamente differenti. Assicurarsi che si sta confrontando le cartelle corrette per la sincronizzazione.</target>
+
 <source>Not enough free disk space available in:</source>
 <target>Spazio libero su disco insufficiente in:</target>
 
@@ -531,12 +528,15 @@ Il comando è attivato se:
 <source>Generating database...</source>
 <target>Generazione database...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Creazione di Volume Shadow Copy per %x...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Creazione di un Volume Shadow Copy per %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Dati di verifica errore: %x e %y hanno un contenuto diverso.</target>
 
+<source>job name</source>
+<target>nome del lavoro</target>
+
 <source>Synchronization aborted</source>
 <target>Sincronizzazione abortita</target>
 
@@ -687,8 +687,8 @@ Il comando è attivato se:
 <source>&Export file list...</source>
 <target>&Esporta l'elenco dei file...</target>
 
-<source>&Global settings...</source>
-<target>&Preferenze...</target>
+<source>&Global settings</source>
+<target>&Preferenze</target>
 
 <source>&Tools</source>
 <target>&Strumenti</target>
@@ -759,6 +759,9 @@ Il comando è attivato se:
 <source>Synchronizing...</source>
 <target>Sincronizzazione...</target>
 
+<source>Minimize to notification area</source>
+<target>Ridurre al minimo l'area di notifica</target>
+
 <source>On completion</source>
 <target>In completamento</target>
 
@@ -774,8 +777,8 @@ Il comando è attivato se:
 <source>Statistics</source>
 <target>Statistiche</target>
 
-<source>Don't show this dialog again</source>
-<target>Non mostrare più questo messaggio</target>
+<source>&Don't show this dialog again</source>
+<target>&Non mostrare più questo avviso</target>
 
 <source>Select a variant</source>
 <target>Seleziona una variante</target>
@@ -825,6 +828,12 @@ I file sono considerati identici se
 <source>Configure your own synchronization rules.</source>
 <target>Configura le tue regole di sincronizzazione.</target>
 
+<source>Detect moved files</source>
+<target>Rileva file spostati</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Richiede il file di database. Non è supportato da tutti i sistemi di file.</target>
+
 <source>Error handling</source>
 <target>Gestione degli errori</target>
 
@@ -849,17 +858,17 @@ I file sono considerati identici se
 <source>Delete or overwrite files permanently</source>
 <target>Elimina o sovrascrivi i file definitivamente</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Cestino</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Utilizza il Cestino per file cancellati e sovrascritti</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Eseguire il backup di file sovrascritti e cancellati nel cestino</target>
 
 <source>Versioning</source>
 <target>Versione</target>
 
-<source>Move files to user-defined folder</source>
-<target>Sposta file in cartella personalizzata</target>
+<source>Move files to a user-defined folder</source>
+<target>Spostare i file in una cartella definita dall'utente</target>
 
 <source>Naming convention:</source>
 <target>Modalità di rinomina:</target>
@@ -867,8 +876,8 @@ I file sono considerati identici se
 <source>Batch job</source>
 <target>Attività 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>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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Creare un file batch per la sincronizzazione automatica. Per iniziare, fare doppio clic su questo file o programmarlo in un pianificatore di compiti: %x</target>
 
 <source>Exit</source>
 <target>Esci</target>
@@ -922,12 +931,12 @@ I file sono considerati identici se
 <target>Elimina su entrambi i lati anche se il file è selezionato su un solo lato.</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Solo i file che corrispondono esattamente a tutti i parametri dei filtri  verrranno sincronizzati.
-Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
+I file verranno sincronizzati solo se passano tutte le regole di filtraggio.
+Nota: percorso dei file deve essere relativo alla directory di base.
 </target>
 
 <source>Include</source>
@@ -957,20 +966,20 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>Fail-safe file copy</source>
 <target>Copia file di 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>Scrivi in un file temporaneo (*.ffs_tmp) prima di rinominarlo. Ciò garantisce uno stato consistente anche in caso di errore fatale.</target>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Copiare prima in un file temporaneo (*.ffs_tmp) poi rinominarlo. Questo garantisce uno stato costante anche in caso di un errore fatale.</target>
 
 <source>Copy locked files</source>
 <target>Copia file bloccati</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Copia file condivisi o bloccati usando il Servizio Volume Shadow Copy (richiede diritti di amministratore)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Copiare i file condivisi o bloccati usando il Volume Shadow Copy Service (richiede i diritti di amministratore)</target>
 
 <source>Copy file access permissions</source>
 <target>Copia permessi di accesso file</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Permessi di traferimento file e cartelle (Richiede diritti di Amministratore)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Trasferimento di file e autorizzazioni cartelle (richiede i diritti di amministratore)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Ripristina i messaggi nascosti</target>
@@ -1050,9 +1059,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>&Execute</source>
 <target>&Esecuzione</target>
 
-<source>&Don't show this dialog again</source>
-<target>&Non mostrare più questo avviso</target>
-
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
@@ -1089,12 +1095,15 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>Include temporarily</source>
 <target>Includi temporaneamente</target>
 
-<source>Exclude via filter:</source>
-<target>Escludi tramite filtro:</target>
-
 <source>multiple selection</source>
 <target>selezione multipla</target>
 
+<source>Include via filter:</source>
+<target>Includi tramite filtro:</target>
+
+<source>Exclude via filter:</source>
+<target>Escludi tramite filtro:</target>
+
 <source>Include all</source>
 <target>Includi tutto</target>
 
@@ -1140,8 +1149,8 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>Do&n't save</source>
 <target>No&n salvare</target>
 
-<source>Never save changes</source>
-<target>Non salvare mai le modifiche</target>
+<source>Never save &changes</source>
+<target>Non salvare mai &modifiche</target>
 
 <source>Show files that exist on left side only</source>
 <target>Mostra file esistenti solo a sinistra</target>
@@ -1194,14 +1203,17 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>All folders are in sync</source>
 <target>Tutte le cartelle sono sincronizzate</target>
 
+<source>Comma-separated values</source>
+<target>Valori separati da virgole</target>
+
 <source>File list exported</source>
 <target>Elenco file esportato</target>
 
 <source>Searching for program updates...</source>
 <target>Ricerca di aggiornamenti al programma...</target>
 
-<source>Ignore further errors</source>
-<target>Ignora i prossimi errori</target>
+<source>&Ignore subsequent errors</source>
+<target>&Ignora errori successivi</target>
 
 <source>&Ignore</source>
 <target>&Ignora</target>
@@ -1209,8 +1221,8 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>Fatal Error</source>
 <target>Errore fatale</target>
 
-<source>Don't show this warning again</source>
-<target>Non mostrare più questo avviso</target>
+<source>&Don't show this warning again</source>
+<target>&Non mostrare più questo avviso</target>
 
 <source>&Switch</source>
 <target>&Passa</target>
@@ -1248,6 +1260,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>&Continue</source>
 <target>&Continuare</target>
 
+<source>Log</source>
+<target>Log</target>
+
 <source>Cannot find %x</source>
 <target>Impossibile trovare %x</target>
 
@@ -1282,12 +1297,12 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <target>Filtro</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>Vuoi veramente spostare il seguente oggetto nel Cestino?</pluralform>
-<pluralform>Vuoi veramente spostare i seguenti %x oggetti nel Cestino?</pluralform>
+<pluralform>Vuoi davvero spostare la seguente voce nel cestino?</pluralform>
+<pluralform>Vuoi davvero spostare i seguenti %x articoli nel cestino?</pluralform>
 </target>
 
 <source>
@@ -1461,8 +1476,8 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>Cannot change process I/O priorities.</source>
 <target>Impossibile modificare le priorità I/O del processo.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Impossibile spostare %x nel Cestino.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>Impossibile spostare %x nel cestino.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>Impossibile determinare il percorso finale per %x.</target>
diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng
index fb3de4e8..d27d0ff2 100644
--- a/BUILD/Languages/japanese.lng
+++ b/BUILD/Languages/japanese.lng
@@ -25,13 +25,13 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>フォルダ %x をゴミ箱として使用できるかを確認中...</target>
 
-<source>Moving file %x to recycle bin</source>
+<source>Moving file %x to the recycle bin</source>
 <target>ファイル %x をゴミ箱に移動中</target>
 
-<source>Moving folder %x to recycle bin</source>
+<source>Moving folder %x to the recycle bin</source>
 <target>フォルダ %x をゴミ箱に移動中</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
+<source>Moving symbolic link %x to the recycle bin</source>
 <target>シンボリックリンク %x をゴミ箱に移動中</target>
 
 <source>Deleting file %x</source>
@@ -43,14 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>シンボリックリンク %x を削除中</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>以下のフォルダでは、ゴミ箱を使用する事が出来ません。代替手段としてファイルは完全に削除されます:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>以下のフォルダではゴミ箱を利用できません。代替手段としてファイルの完全削除を利用することが出来ます:</target>
 
 <source>An exception occurred</source>
 <target>例外が発生しました</target>
 
-<source>Cannot find file %x.</source>
-<target>ファイル %x がみつかりません.</target>
+<source>A directory path is expected after %x.</source>
+<target>%x の後にはディレクトリ・パスが必要です</target>
+
+<source>Syntax error</source>
+<target>構文エラー</target>
+
+<source>Cannot open file %x.</source>
+<target>ファイル %x を開けません</target>
 
 <source>Error</source>
 <target>エラー</target>
@@ -58,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>ファイル %x には有効な構成が含まれていません.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>誤った数の左右ディレクトリが指定されています.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>コマンドライン経由でディレクトリが設定されている時は、構成設定にペア・レベルのディレクトリは含められません.</target>
+
+<source>Warning</source>
+<target>警告</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>構成設定ファイルにひとつ以上のディレクトリは設定できません.</target>
+
+<source>Syntax:</source>
+<target>構文:</target>
+
+<source>config files</source>
+<target>構成設定ファイル</target>
+
+<source>directory</source>
+<target>ディレクトリ</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>任意の数の FreeFileSync 構成設定ファイル(.ffs_gui および/または .ffs_batch).</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>ひとつの構成設定ファイルに対して任意の数の代替ディレクトリ.</target>
+
+<source>Command line</source>
+<target>コマンドライン</target>
+
 <source>A folder input field is empty.</source>
 <target>フォルダ入力欄が空白です.</target>
 
@@ -214,8 +250,8 @@
 <target>合計時間:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
 <pluralform>%x バイト</pluralform>
@@ -240,11 +276,11 @@
 <target>スキャン:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[%x スレッド]</pluralform>
+<pluralform>%x スレッド</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -253,6 +289,9 @@
 <source>/sec</source>
 <target>/秒</target>
 
+<source>%x items</source>
+<target>%x 個の項目</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>構成ファイル %x は部分的のみ読み込まれます.</target>
 
@@ -265,8 +304,8 @@
 <source>Browse directory</source>
 <target>ディレクトリを参照</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>ﾎﾞﾘｭｰﾑｼｬﾄﾞｳｺﾋﾟｰｻｰﾋﾞｽにアクセス出来ません.</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>ボリュームシャドウコピーサービスにアクセス出来ません.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>FreeFileSync 64-bit 版を使用してこのシステムにシャドウコピーを作成してください.</target>
@@ -277,8 +316,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>%x のボリューム名が決定されていません</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>ボリューム名 %x にファイル名 %y はありません.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>ボリューム名 %x は、ファイルパス %y の一部ではありません.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>ユーザによる中断: 現在の処理を終了しています.. お待ちください...</target>
@@ -346,9 +385,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>最後にコマンドを実行してから、次に変更を検出するまでの待機時間</target>
 
-<source>Command line</source>
-<target>コマンドライン</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -372,9 +408,6 @@ The command is triggered if:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>リアルタイム同期 - 自動同期</target>
 
-<source>Warning</source>
-<target>警告</target>
-
 <source>Build: %x</source>
 <target>ビルド: %x</target>
 
@@ -384,15 +417,21 @@ The command is triggered if:
 <source>All files</source>
 <target>すべてのファイル</target>
 
+<source>Directory monitoring active</source>
+<target>ディレクトリの監視アクティブ</target>
+
+<source>Waiting until all directories are available...</source>
+<target>全ディレクトリが利用可能になるまで待機中...</target>
+
 <source>&Restore</source>
 <target>修復(&R)</target>
 
+<source>&Show error</source>
+<target>エラー表示(&S)</target>
+
 <source>&Exit</source>
 <target>終了(&E)</target>
 
-<source>Waiting for missing directories...</source>
-<target>見失ったディレクトリの待機中...</target>
-
 <source>Invalid command line:</source>
 <target>無効なコマンドライン:</target>
 
@@ -402,14 +441,14 @@ The command is triggered if:
 <source>File time and size</source>
 <target>ファイル時刻とサイズ</target>
 
-<source> Two way </source>
-<target> 両方向 </target>
+<source>Two way</source>
+<target>両方向</target>
 
 <source>Mirror</source>
-<target>ミラー </target>
+<target>ミラー</target>
 
 <source>Update</source>
-<target>更新 </target>
+<target>更新</target>
 
 <source>Custom</source>
 <target>カスタム</target>
@@ -465,11 +504,8 @@ The command is triggered if:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>以下の項目は、未解決の競合が存在するため同期処理を実行できませんでした:</target>
 
-<source>Significant difference detected:</source>
-<target>重大な差異が検出されました:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>ファイル合計総数の 50% 以上が削除、またはコピーされます。</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>以下のフォルダには大量の差異が存在します。同期フォルダの双方が正確にセットされているかどうかをもう一度慎重にご確認ください.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>利用可能なディスク空き容量が足りません:</target>
@@ -489,12 +525,15 @@ The command is triggered if:
 <source>Generating database...</source>
 <target>データベースを作成中...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>%x のボリュームシャドウコピーを作成中...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>ボリュームシャドウコピーを作成中 %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>データ検証エラー: %x と %y には異なる内容が含まれています.</target>
 
+<source>job name</source>
+<target>ジョブ名</target>
+
 <source>Synchronization aborted</source>
 <target>同期処理を中断</target>
 
@@ -519,6 +558,9 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog</source>
 <target>FreeFileSync メインダイアログを切り替え中</target>
 
+<source>Retrying operation after error:</source>
+<target>エラーの後で処理を再試行:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>FreeFileSync の新しいバージョンが利用できます:</target>
 
@@ -642,8 +684,8 @@ The command is triggered if:
 <source>&Export file list...</source>
 <target>ファイル一覧をエクスポート(&E)...</target>
 
-<source>&Global settings...</source>
-<target>全般的な設定(&G)...</target>
+<source>&Global settings</source>
+<target>全般的な設定(&G)</target>
 
 <source>&Tools</source>
 <target>ツール(&T)</target>
@@ -714,6 +756,9 @@ The command is triggered if:
 <source>Synchronizing...</source>
 <target>同期処理中...</target>
 
+<source>Minimize to notification area</source>
+<target>通知領域に最小化</target>
+
 <source>On completion</source>
 <target>完了時の動作</target>
 
@@ -723,6 +768,15 @@ The command is triggered if:
 <source>&Pause</source>
 <target>一時停止(&P)</target>
 
+<source>Variant</source>
+<target>変化</target>
+
+<source>Statistics</source>
+<target>統計</target>
+
+<source>&Don't show this dialog again</source>
+<target>次回以降から表示しない(&D)</target>
+
 <source>Select a variant</source>
 <target>バリアントを選択</target>
 
@@ -771,6 +825,12 @@ is the same
 <source>Configure your own synchronization rules.</source>
 <target>あなたの設定した同期規則を使用します。</target>
 
+<source>Detect moved files</source>
+<target>移動済みのファイルを検出する</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>データベースファイルが必要です(すべてのシステムには未対応).</target>
+
 <source>Error handling</source>
 <target>ハンドリングのエラー時:</target>
 
@@ -795,17 +855,17 @@ is the same
 <source>Delete or overwrite files permanently</source>
 <target>ファイルを上書き、または完全に削除</target>
 
-<source>Recycle Bin</source>
-<target>ゴミ箱に移動</target>
+<source>Recycle bin</source>
+<target>ゴミ箱</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>ファイルの削除、上書き時にゴミ箱を使用する</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>ファイルを削除/上書きする時、ゴミ箱にバックアップをとる</target>
 
 <source>Versioning</source>
 <target>バージョン付け</target>
 
-<source>Move files to user-defined folder</source>
-<target>ユーザ定義フォルダにファイルを移動</target>
+<source>Move files to a user-defined folder</source>
+<target>ユーザ定義のフォルダにファイルを移動</target>
 
 <source>Naming convention:</source>
 <target>命名規則:</target>
@@ -813,8 +873,8 @@ is the same
 <source>Batch job</source>
 <target>一括処理</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>無人で同期を行う為のバッチファイルを作成 - このファイルか、タスクプランナーからスケジュールをダブルクリックすることで開始: %x</target>
 
 <source>Exit</source>
 <target>終了</target>
@@ -868,12 +928,12 @@ is the same
 <target>片側のペインのみ選択されている場合でも両方を削除する</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-すべてのフィルターに合致するファイルのみが同期されます.
-注意: ファイル名は基準ディレクトリに比例する必要があります.
+すべてのフィルター規則に適合した場合のみ、ファイルの同期が行われます.
+注意: ファイルパスは基準ディレクトリからの相対パスを使用してください.
 </target>
 
 <source>Include</source>
@@ -903,20 +963,20 @@ Note: File names must be relative to base directories.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>リネームする前に一時ファイル(*.ffs_tmp)へコピーする。これにより、予期せぬエラーが発生した場合も一貫性を保つことが可能です.</target>
 
 <source>Copy locked files</source>
 <target>ロックされたファイルをコピーする</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>ボリュームシャドウコピーを使用して共有/ロックされたファイルをコピーします(管理者権限が必要)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>共有のコピーとファイルのロックにﾎﾞﾘｭｰﾑ ｼｬﾄﾞｳ ｺﾋﾟｰｻｰﾋﾞｽを使用する (管理者権限が必要)</target>
 
 <source>Copy file access permissions</source>
 <target>ファイルのアクセスパーミッションをコピーする</target>
 
-<source>Transfer file and folder 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>
@@ -930,15 +990,6 @@ Note: File names must be relative to base directories.
 <source>&Default</source>
 <target>デフォルト(&D)</target>
 
-<source>Variant</source>
-<target>変化</target>
-
-<source>Statistics</source>
-<target>統計</target>
-
-<source>Don't show this dialog again</source>
-<target>次回からダイアログを表示しない</target>
-
 <source>Find what:</source>
 <target>検索語:</target>
 
@@ -948,15 +999,15 @@ Note: File names must be relative to base directories.
 <source>&Find next</source>
 <target>次を検索(&F)</target>
 
+<source>Start synchronization</source>
+<target>同期の開始</target>
+
 <source>Delete</source>
 <target>削除</target>
 
 <source>Configure filter</source>
 <target>フィルター設定</target>
 
-<source>Start synchronization</source>
-<target>同期の開始</target>
-
 <source>Find</source>
 <target>検索</target>
 
@@ -991,6 +1042,20 @@ Note: File names must be relative to base directories.
 <target>両方を比較</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>本当に合計 %x この項目に対してコマンド %y を実行しますか?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>確認</target>
+
+<source>&Execute</source>
+<target>実行(&E)</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1003,7 +1068,7 @@ Note: File names must be relative to base directories.
 <pluralform>%x files</pluralform>
 </source>
 <target>
-<pluralform>%x ファイル</pluralform>
+<pluralform>%x 個のファイル</pluralform>
 </target>
 
 <source>
@@ -1011,24 +1076,27 @@ Note: File names must be relative to base directories.
 <pluralform>%y of %x rows in view</pluralform>
 </source>
 <target>
-<pluralform>%y の %x 行(表示内)</pluralform>
+<pluralform>%y / %x 行(表示内)</pluralform>
 </target>
 
 <source>Set direction:</source>
 <target>方向の設定:</target>
 
 <source>Exclude temporarily</source>
-<target>一時フォルダを除外</target>
+<target>一時的に除外</target>
 
 <source>Include temporarily</source>
-<target>一時フォルダを含める</target>
-
-<source>Exclude via filter:</source>
-<target>フィルターを通して除外</target>
+<target>一時的に含める</target>
 
 <source>multiple selection</source>
 <target>複数選択</target>
 
+<source>Include via filter:</source>
+<target>フィルター経由で含める:</target>
+
+<source>Exclude via filter:</source>
+<target>フィルターを経由して除外</target>
+
 <source>Include all</source>
 <target>すべて含める</target>
 
@@ -1074,8 +1142,8 @@ Note: File names must be relative to base directories.
 <source>Do&n't save</source>
 <target>保存しない(&N)</target>
 
-<source>Never save changes</source>
-<target>変更を保存しない</target>
+<source>Never save &changes</source>
+<target>変更の保存をしない(&C)</target>
 
 <source>Show files that exist on left side only</source>
 <target>左側のみに存在するファイルを表示</target>
@@ -1128,8 +1196,8 @@ Note: File names must be relative to base directories.
 <source>All folders are in sync</source>
 <target>すべてのフォルダを同期</target>
 
-<source>Comma separated list</source>
-<target>カンマ区切り</target>
+<source>Comma-separated values</source>
+<target>カンマ区切りの値</target>
 
 <source>File list exported</source>
 <target>ファイル一覧のエクスポートが完了</target>
@@ -1137,8 +1205,8 @@ Note: File names must be relative to base directories.
 <source>Searching for program updates...</source>
 <target>アップデートを検索しています...</target>
 
-<source>Ignore further errors</source>
-<target>以降のエラーを無視</target>
+<source>&Ignore subsequent errors</source>
+<target>以降のエラーは無視する(&I)</target>
 
 <source>&Ignore</source>
 <target>無視(&I)</target>
@@ -1146,8 +1214,8 @@ Note: File names must be relative to base directories.
 <source>Fatal Error</source>
 <target>致命的なエラー</target>
 
-<source>Don't show this warning again</source>
-<target>次回からこの警告は表示しない</target>
+<source>&Don't show this warning again</source>
+<target>次回からこの警告を表示しない(&D)</target>
 
 <source>&Switch</source>
 <target>切り替え(&S)</target>
@@ -1180,15 +1248,12 @@ Note: File names must be relative to base directories.
 <target>中断</target>
 
 <source>Completed</source>
-<target>完了しました</target>
+<target>完了しました!</target>
 
-<source>Continue</source>
-<target>続行</target>
+<source>&Continue</source>
+<target>続行(&C)</target>
 
-<source>Pause</source>
-<target>一時停止</target>
-
-<source>Logging</source>
+<source>Log</source>
 <target>ログ</target>
 
 <source>Cannot find %x</source>
@@ -1225,11 +1290,11 @@ Note: File names must be relative to base directories.
 <target>フィルター</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>本当に以下の %x 個の項目をゴミ箱に移動しますか</pluralform>
+<pluralform>本当に以下 %x 個の項目をゴミ箱に移動しますか?</pluralform>
 </target>
 
 <source>
@@ -1282,9 +1347,6 @@ Note: File names must be relative to base directories.
 <source>Append a timestamp to each file name</source>
 <target>各ファイル名にタイムスタンプを追加</target>
 
-<source>Folder</source>
-<target>フォルダ</target>
-
 <source>File</source>
 <target>ファイル</target>
 
@@ -1402,7 +1464,7 @@ Note: File names must be relative to base directories.
 <source>Cannot change process I/O priorities.</source>
 <target>プロセスの I/O 優先度を変更できません</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
+<source>Unable to move %x to the recycle bin.</source>
 <target>%x をゴミ箱に移動できません.</target>
 
 <source>Cannot determine final path for %x.</source>
diff --git a/BUILD/Languages/korean.lng b/BUILD/Languages/korean.lng
index d25b490b..01ec80b0 100644
--- a/BUILD/Languages/korean.lng
+++ b/BUILD/Languages/korean.lng
@@ -11,7 +11,7 @@
 <target>마지막 동기화 작업 이후, 양측 모두 변경 되었습니다.</target>
 
 <source>Cannot determine sync-direction:</source>
-<target>동기화 방향을 결정할 수 없습니다 :</target>
+<target>동기화 방향을 결정할 수 없습니다:</target>
 
 <source>No change since last synchronization.</source>
 <target>마지막 동기화 이후 변경사항 없음.</target>
@@ -20,18 +20,18 @@
 <target>데이터베이스 항목이 현재 설정을 고려하여 동기화 되지 않았습니다.</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
-<target>기본값 동기화 방향 설정 : 이전 파일들은 보다 최신 파일들로 덮어 쓰여집니다.</target>
+<target>기본값 동기화 방향 설정: 이전 파일들은 보다 최신 파일들로 덮어 쓰여집니다.</target>
 
 <source>Checking recycle bin availability for folder %x...</source>
-<target>폴더 %x 을(를) 위한 휴지통 가용성 여부 확인 중...</target>
+<target>폴더 %x을(를) 위한 휴지통 가용성 여부 확인 중...</target>
 
-<source>Moving file %x to recycle bin</source>
+<source>Moving file %x to the recycle bin</source>
 <target>파일 %x을(를) 휴지통으로 이동 중</target>
 
-<source>Moving folder %x to recycle bin</source>
+<source>Moving folder %x to the recycle bin</source>
 <target>폴더 %x을(를) 휴지통으로 이동 중</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
+<source>Moving symbolic link %x to the recycle bin</source>
 <target>심볼릭 링크 %x을(를) 휴지통으로 이동 중</target>
 
 <source>Deleting file %x</source>
@@ -43,14 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>심볼릭 링크 %x 삭제 중</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>다음 폴더들을 위해 휴지통을 사용할 수 없어 대신 파일들을 영구 삭제합니다 :</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>다음 폴더들을 위해 휴지통을 사용할 수 없습니다. 대신 파일들을 영구 삭제합니다:</target>
 
 <source>An exception occurred</source>
 <target>예외 발생</target>
 
-<source>Cannot find file %x.</source>
-<target>파일 %x 을(를) 찾을 수 없습니다.</target>
+<source>A directory path is expected after %x.</source>
+<target>%x 이후 일반적으로 디렉토리 경로가 하나 나옵니다.</target>
+
+<source>Syntax error</source>
+<target>구문 오류</target>
+
+<source>Cannot open file %x.</source>
+<target>파일 %x을(를) 열 수 없습니다.</target>
 
 <source>Error</source>
 <target>오류</target>
@@ -58,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>파일 %x 의 구성이 유효하지 않습니다.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>지정된 좌측 및 우측 디렉터리 개수가 같지 않음.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>명령줄을 통해 설정된 디렉토리의 경우, 설정 파일은 디렉토리 페어 상의 설정을 포함할 수 없습니다.</target>
+
+<source>Warning</source>
+<target>경고</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>디렉토리는 하나 이상의 설정 파일을 위해 설정될 수 없습니다.</target>
+
+<source>Syntax:</source>
+<target>구문(Syntax):</target>
+
+<source>config files</source>
+<target>설정 파일</target>
+
+<source>directory</source>
+<target>디렉토리</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>FreeFileSync .ffs_gui 또는 .ffs_batch 설정파일 개수</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>최대 한개 설정파일에 대한 대체 디렉토리 개수</target>
+
+<source>Command line</source>
+<target>명령줄(커맨드라인)</target>
+
 <source>A folder input field is empty.</source>
 <target>폴더 입력 필드 하나가 비어 있습니다.</target>
 
@@ -65,25 +101,25 @@
 <target>해당 폴더를 비어 있는 상태로 간주합니다.</target>
 
 <source>Cannot find the following folders:</source>
-<target>다음 폴더를 찾을 수 없습니다 :</target>
+<target>다음 폴더를 찾을 수 없습니다:</target>
 
 <source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
 <target>각 폴더를 비어있는 상태로 간주할 경우 이 오류는 무시될 수 있습니다. 폴더들은 동기화가 진행되는 동안 자동 생성됩니다.</target>
 
 <source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source>
-<target>다음 폴더들에는 종속 경로가 있습니다. 동기화 규칙을 설정 시 주의하시기 바랍니다 :</target>
+<target>다음 폴더들에는 종속 경로가 있습니다. 동기화 규칙을 설정 시 주의하시기 바랍니다:</target>
 
 <source>File %x has an invalid date.</source>
 <target>파일 %x 의 날짜가 유효하지 않습니다.</target>
 
 <source>Date:</source>
-<target>날짜 :</target>
+<target>날짜:</target>
 
 <source>Files %x have the same date but a different size.</source>
 <target>파일 %x 의 날짜는 같으나, 크기가 다릅니다.</target>
 
 <source>Size:</source>
-<target>크기 :</target>
+<target>크기:</target>
 
 <source>Items differ in attributes only</source>
 <target>항목들이 속성에서만 차이가 있습니다.</target>
@@ -164,19 +200,19 @@
 <target>데이터베이스 파일 %x 은(는) 호환 불가능합니다.</target>
 
 <source>Initial synchronization:</source>
-<target>초기 동기화 :</target>
+<target>초기 동기화:</target>
 
 <source>Database file %x does not yet exist.</source>
 <target>데이터베이스 파일 %x 은(는) 아직 존재하지 않습니다.</target>
 
 <source>Database file is corrupt:</source>
-<target>데이터베이스 파일 손상 :</target>
+<target>데이터베이스 파일 손상:</target>
 
 <source>Cannot write file %x.</source>
-<target>파일 %x 을(를) 쓸 수 없습니다.</target>
+<target>파일 %x을(를) 쓸 수 없습니다.</target>
 
 <source>Cannot read file %x.</source>
-<target>파일 %x 을(를) 읽을 수 없습니다.</target>
+<target>파일 %x을(를) 읽을 수 없습니다.</target>
 
 <source>Database files do not share a common session.</source>
 <target>데이터베이스 파일이 일반/공동 세션을 공유하지 않습니다.</target>
@@ -205,17 +241,17 @@
 <target>파일 %x 생성 중</target>
 
 <source>Items processed:</source>
-<target>처리된 항목 :</target>
+<target>처리된 항목:</target>
 
 <source>Items remaining:</source>
-<target>남은 항목 :</target>
+<target>남은 항목:</target>
 
 <source>Total time:</source>
-<target>전체 시간 :</target>
+<target>전체 시간:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
 <pluralform>%x 바이트</pluralform>
@@ -237,24 +273,27 @@
 <target>%x 에 대한 디렉토리 잠금을 설정할 수 없습니다.</target>
 
 <source>Scanning:</source>
-<target>스캔 :</target>
+<target>스캔 중:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[%x 스레드]</pluralform>
+<pluralform>%x 스레드</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
-<target>인코딩 확장 시간 정보 : %x</target>
+<target>인코딩 확장 시간 정보: %x</target>
 
 <source>/sec</source>
 <target>/초</target>
 
+<source>%x items</source>
+<target>%x 항목</target>
+
 <source>Configuration file %x loaded partially only.</source>
-<target>구성 파일 %x 이(가) 부분적으로만 로드 되었음.</target>
+<target>구성 파일 %x이(가) 부분적으로만 로드 되었음.</target>
 
 <source>Show in Explorer</source>
 <target>탐색기에 표시</target>
@@ -265,29 +304,29 @@
 <source>Browse directory</source>
 <target>디렉토리 찾아보기</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Volume Shadow Copy Service 접근 불가</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Volume Shadow Copy Service에 접근할 수 없습니다.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>본 운영체제에서의 Shadow Copy 생성은 FreeFileSync 64-비트 버전을 사용하세요.</target>
 
 <source>Cannot load file %x.</source>
-<target>파일 %x 을(를) 로드할 수 없습니다.</target>
+<target>파일 %x을(를) 로드할 수 없습니다.</target>
 
 <source>Cannot determine volume name for %x.</source>
 <target>%x 에 대한 볼륨 이름을 결정할 수 없습니다.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>볼륨 이름 %x 은(는) 파일 이름 %y 의 일부가 아님.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>볼륨 이름 %x은(는) 파일 경로 %y의 일부가 아닙니다.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
-<target>사용자에 의한 작업 중단 : 현재 작업 종료 대기 중...</target>
+<target>사용자에 의한 작업 중단: 현재 작업 종료 대기 중...</target>
 
 <source>Failure to create timestamp for versioning:</source>
-<target>버저닝을 위한 타임 스탬프 생성 실패 :</target>
+<target>버저닝을 위한 타임 스탬프 생성 실패:</target>
 
 <source>Cannot read the following XML elements:</source>
-<target>다음 XML 요소를 읽을 수 없습니다 :</target>
+<target>다음 XML 요소를 읽을 수 없습니다:</target>
 
 <source>&Open...</source>
 <target>열기(&O)</target>
@@ -311,7 +350,7 @@
 <target>도움말(&H)</target>
 
 <source>Usage:</source>
-<target>사용 :</target>
+<target>사용:</target>
 
 <source>1. Select folders to watch.</source>
 <target>1. 열어 볼 폴더를 선택하세요.</target>
@@ -346,18 +385,15 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>마지막으로 감지된 변화와 명령 실행 간의 유휴 시간</target>
 
-<source>Command line</source>
-<target>명령줄(커맨드라인)</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
 - new folders arrive (e.g. USB stick insert)
 </source>
 <target>
-명령은 다음과 같은 경우에 실행됩니다 :
+명령은 다음과 같은 경우에 실행됩니다:
 - 파일이나 하위 폴더 변경 시
-- 새 폴더가 생겼을 시 (예 : USB 스틱 삽입)
+- 새 폴더가 생겼을 시 (예: USB 스틱 삽입)
 </target>
 
 <source>Start</source>
@@ -372,9 +408,6 @@ The command is triggered if:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>실시간 동기화 - 자동 동기화</target>
 
-<source>Warning</source>
-<target>경고</target>
-
 <source>Build: %x</source>
 <target>빌드: %x</target>
 
@@ -384,17 +417,23 @@ The command is triggered if:
 <source>All files</source>
 <target>모든 파일</target>
 
+<source>Directory monitoring active</source>
+<target>디렉토리 모니터링 활성화</target>
+
+<source>Waiting until all directories are available...</source>
+<target>모든 디렉토리가 사용 가능할 때까지 대기 중...</target>
+
 <source>&Restore</source>
 <target>복원(&R)</target>
 
+<source>&Show error</source>
+<target>오류 표시(&S)</target>
+
 <source>&Exit</source>
 <target>나가기(&E)</target>
 
-<source>Waiting for missing directories...</source>
-<target>누락 디렉토리 대기 중...</target>
-
 <source>Invalid command line:</source>
-<target>잘못된 명령줄 :</target>
+<target>잘못된 명령줄:</target>
 
 <source>File content</source>
 <target>파일 내용</target>
@@ -402,14 +441,14 @@ The command is triggered if:
 <source>File time and size</source>
 <target>파일 시간 및 크기</target>
 
-<source> Two way </source>
-<target> 양방/양면 (Two Way) </target>
+<source>Two way</source>
+<target>양방/양면 (Two Way)</target>
 
 <source>Mirror</source>
-<target>미러 </target>
+<target>미러</target>
 
 <source>Update</source>
-<target>업데이트 </target>
+<target>업데이트</target>
 
 <source>Custom</source>
 <target>개인 설정</target>
@@ -463,22 +502,19 @@ The command is triggered if:
 <target>소스 폴더 %x을(를) 찾을 수 없음.</target>
 
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
-<target>아래의 항목들은 해결치 못 한 충돌로 인해 동기화할 수 없습니다 :</target>
+<target>아래의 항목들은 해결치 못 한 충돌로 인해 동기화할 수 없습니다:</target>
 
-<source>Significant difference detected:</source>
-<target>상당한 차이가 감지됐습니다 :</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>총 파일 개수의 50% 이상이 복사되거나 삭제 됩니다.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>다음 폴더들의 차이가 상당합니다. 동기화를 위해 올바른 폴더들이 매치되었는지 확인해 보십시오.</target>
 
 <source>Not enough free disk space available in:</source>
-<target>사용 가능한 디스크 여유 공간이 부족합니다 :</target>
+<target>사용 가능한 디스크 여유 공간이 부족합니다:</target>
 
 <source>Required:</source>
-<target>필요 공간(크기) :</target>
+<target>필요 공간(크기):</target>
 
 <source>Available:</source>
-<target>여유 공간(크기) :</target>
+<target>여유 공간(크기):</target>
 
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>다중 폴더 페어의 일부인 폴더가 변경됩니다. 동기화 설정을 재검토하세요.</target>
@@ -489,11 +525,14 @@ The command is triggered if:
 <source>Generating database...</source>
 <target>데이터베이스 생성 중...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
+<source>Creating a Volume Shadow Copy for %x...</source>
 <target>%x을(를) 위한 Volume Shadow Copy 생성 중...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
-<target>데이터 확인 오류 : %x 및 %y 의 내용이 서로 다릅니다.</target>
+<target>데이터 확인 오류: %x 및 %y 의 내용이 서로 다릅니다.</target>
+
+<source>job name</source>
+<target>작업 이름</target>
 
 <source>Synchronization aborted</source>
 <target>동기화 중단</target>
@@ -514,13 +553,16 @@ The command is triggered if:
 <target>로그 파일 %x 저장 중...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>FreeFileSync 메인 다이얼로그에서 문제 해결을 하려면 "Switch" [전환]을 누르십시오.</target>
+<target>FreeFileSync 기본 대화 창에서 문제 해결을 하려면 "Switch" [전환]을 누르십시오.</target>
 
 <source>Switching to FreeFileSync main dialog</source>
 <target>FreeFileSync 기본 대화 창으로 전환</target>
 
+<source>Retrying operation after error:</source>
+<target>오류 발생 후, 작업 재시도 중:</target>
+
 <source>A new version of FreeFileSync is available:</source>
-<target>새로운 버전의 FreeFileSync가 나왔습니다 :</target>
+<target>새로운 버전의 FreeFileSync가 나왔습니다:</target>
 
 <source>Download now?</source>
 <target>지금 다운로드 하시겠습니까?</target>
@@ -580,7 +622,7 @@ The command is triggered if:
 <target>드래그 앤 드랍(&&) [마우스로 파일 끌어다 놓기]</target>
 
 <source>Close progress dialog</source>
-<target>프로그레스 다이얼로그 (진행 표시 창) 닫기</target>
+<target>진행 표시 창 닫기</target>
 
 <source>Standby</source>
 <target>대기</target>
@@ -642,7 +684,7 @@ The command is triggered if:
 <source>&Export file list...</source>
 <target>파일 리스트 내보내기(&E)</target>
 
-<source>&Global settings...</source>
+<source>&Global settings</source>
 <target>전체 설정(&G)</target>
 
 <source>&Tools</source>
@@ -700,20 +742,23 @@ The command is triggered if:
 <target>복사할 전체 바이트 크기</target>
 
 <source>Items found:</source>
-<target>발견된 항목 :</target>
+<target>발견된 항목:</target>
 
 <source>Speed:</source>
-<target>속도 :</target>
+<target>속도:</target>
 
 <source>Time remaining:</source>
-<target>남은 시간 :</target>
+<target>남은 시간:</target>
 
 <source>Time elapsed:</source>
-<target>경과 시간 :</target>
+<target>경과 시간:</target>
 
 <source>Synchronizing...</source>
 <target>동기화 작업 중...</target>
 
+<source>Minimize to notification area</source>
+<target>알림 영역으로 최소화</target>
+
 <source>On completion</source>
 <target>완료 시</target>
 
@@ -723,6 +768,15 @@ The command is triggered if:
 <source>&Pause</source>
 <target>일시정지(&P)</target>
 
+<source>Variant</source>
+<target>베어리언트</target>
+
+<source>Statistics</source>
+<target>통계</target>
+
+<source>&Don't show this dialog again</source>
+<target>이 대화 창을 다시 표시 안 함 (&D)</target>
+
 <source>Select a variant</source>
 <target>베어리언트 선택</target>
 
@@ -771,8 +825,14 @@ is the same
 <source>Configure your own synchronization rules.</source>
 <target>개인 동기화 규칙 설정</target>
 
+<source>Detect moved files</source>
+<target>이동 파일 탐지</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>데이터베이스 파일이 필요합니다. 모든 파일 시스템에서 지원되지는 않습니다.</target>
+
 <source>Error handling</source>
-<target>오류 발생시 :</target>
+<target>오류 발생시:</target>
 
 <source>Ignore</source>
 <target>무시</target>
@@ -795,26 +855,26 @@ is the same
 <source>Delete or overwrite files permanently</source>
 <target>파일 영구 삭제 또는 덮어쓰기</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>휴지통</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>삭제 또는 덮어 써진 파일들은 휴지통으로 이동</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>휴지통에 삭제되고 덮어 씌어진 파일 백업</target>
 
 <source>Versioning</source>
 <target>버저닝</target>
 
-<source>Move files to user-defined folder</source>
+<source>Move files to a user-defined folder</source>
 <target>사용자 정의 폴더로 파일 이동</target>
 
 <source>Naming convention:</source>
-<target>이름 지정 :</target>
+<target>이름 지정:</target>
 
 <source>Batch job</source>
 <target>일괄 작업</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>직접 지켜보지 않는 자동 동기화의 경우, 배치 파일을 만듭니다. 시작하려면 파일을 더블 클릭하거나 작업 플래너에서 일정을 만듭니다: %x</target>
 
 <source>Exit</source>
 <target>종료</target>
@@ -823,7 +883,7 @@ is the same
 <target>첫 번째 오류 시 동기화 중지</target>
 
 <source>Show progress dialog</source>
-<target>프로그레스 다이얼로그 (진행 표시 창) 보기</target>
+<target>진행 표시 창 보기</target>
 
 <source>Save log</source>
 <target>로그 저장</target>
@@ -838,7 +898,7 @@ is the same
 <target>로그 파일의 최대 개수 제한</target>
 
 <source>Source code written in C++ using:</source>
-<target>소스코드는 C++ 언어로 아래 툴을 사용하여 작성되었습니다 :</target>
+<target>소스코드는 C++ 언어로 아래 툴을 사용하여 작성되었습니다:</target>
 
 <source>If you like FreeFileSync</source>
 <target>FreeFileSync를 위한 기부</target>
@@ -868,12 +928,12 @@ is the same
 <target>어느 한쪽의 파일만 선택하더라도 양측 모두 삭제</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-모든 필터 설정과 일치하는 파일만 동기화 됩니다.
-참고 : 파일 이름은 기본 디렉토리와 상응해야 합니다.
+모든 필터 규칙에 준할 경우에만 파일을 동기화 시킵니다.
+참고: 파일 경로가 기본 디렉토리에 연결돼 있어야 합니다.
 </target>
 
 <source>Include</source>
@@ -903,20 +963,20 @@ Note: File names must be relative to base directories.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>일단 임시파일(*.ffs_tmp)로 복사한 후 이름 바꾸기. 이 같이 함으로써 치명적인 오류 발생시에도 일관된 상태 유지를 보장합니다.</target>
 
 <source>Copy locked files</source>
 <target>락 걸린 파일 복사</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Volume Shadow Copy Service를 사용하여 공유 또는 락 걸린 파일을 복사 (관리자 권한 필요)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Volume Shadow Copy Service를 사용하여 공유 또는 잠긴 파일 복사 (관리자 권한 필요)</target>
 
 <source>Copy file access permissions</source>
 <target>파일 접근 권한 복사</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>파일 및 폴더 사용 권한 전송 (관리자 권한 필요)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>파일 및 폴더 권한 전송 (관리자 권한 필요)</target>
 
 <source>Restore hidden dialogs</source>
 <target>숨겨진 대화 창 복원</target>
@@ -930,17 +990,8 @@ Note: File names must be relative to base directories.
 <source>&Default</source>
 <target>기본 설정/값(&D)</target>
 
-<source>Variant</source>
-<target>베어리언트</target>
-
-<source>Statistics</source>
-<target>통계</target>
-
-<source>Don't show this dialog again</source>
-<target>이 대화 창을 다시 표시하지 않음</target>
-
 <source>Find what:</source>
-<target>검색어 :</target>
+<target>검색어:</target>
 
 <source>Match case</source>
 <target>대문자/소문자 구분</target>
@@ -948,15 +999,15 @@ Note: File names must be relative to base directories.
 <source>&Find next</source>
 <target>다음 검색(&F)</target>
 
+<source>Start synchronization</source>
+<target>동기화 시작</target>
+
 <source>Delete</source>
 <target>삭제</target>
 
 <source>Configure filter</source>
 <target>필터 설정</target>
 
-<source>Start synchronization</source>
-<target>동기화 시작</target>
-
 <source>Find</source>
 <target>검색</target>
 
@@ -991,6 +1042,20 @@ Note: File names must be relative to base directories.
 <target>양측 비교</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>정말로 %x 항목을 위해 %y 명령을 실행하기를 원하십니까?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>확인</target>
+
+<source>&Execute</source>
+<target>실행(&E)</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1015,7 +1080,7 @@ Note: File names must be relative to base directories.
 </target>
 
 <source>Set direction:</source>
-<target>방향 설정 :</target>
+<target>방향 설정:</target>
 
 <source>Exclude temporarily</source>
 <target>임시 제외</target>
@@ -1023,12 +1088,15 @@ Note: File names must be relative to base directories.
 <source>Include temporarily</source>
 <target>임시 포함</target>
 
-<source>Exclude via filter:</source>
-<target>필터를 통하여 제외</target>
-
 <source>multiple selection</source>
 <target>복수 선택</target>
 
+<source>Include via filter:</source>
+<target>필터를 통해 다음을 포함:</target>
+
+<source>Exclude via filter:</source>
+<target>필터를 통하여 제외</target>
+
 <source>Include all</source>
 <target>모두 포함</target>
 
@@ -1036,7 +1104,7 @@ Note: File names must be relative to base directories.
 <target>모두 제외</target>
 
 <source>Show icons:</source>
-<target>아이콘 표시 :</target>
+<target>아이콘 표시:</target>
 
 <source>Small</source>
 <target>작게</target>
@@ -1074,8 +1142,8 @@ Note: File names must be relative to base directories.
 <source>Do&n't save</source>
 <target>저장하기 않기(&n)</target>
 
-<source>Never save changes</source>
-<target>변경사항 절대 저장 안 함.</target>
+<source>Never save &changes</source>
+<target>변경사항을 절대 저장하기 않기(&c)</target>
 
 <source>Show files that exist on left side only</source>
 <target>좌측에만 존재하는 파일 표시</target>
@@ -1128,8 +1196,8 @@ Note: File names must be relative to base directories.
 <source>All folders are in sync</source>
 <target>모든 폴더가 동기화 되었음</target>
 
-<source>Comma separated list</source>
-<target>콤마 분리 목록</target>
+<source>Comma-separated values</source>
+<target>쉼표로 구분된 값</target>
 
 <source>File list exported</source>
 <target>파일 리스트 내보내기 완료</target>
@@ -1137,8 +1205,8 @@ Note: File names must be relative to base directories.
 <source>Searching for program updates...</source>
 <target>프로그램 업데이트 검색 중...</target>
 
-<source>Ignore further errors</source>
-<target>더 이상의 오류는 무시</target>
+<source>&Ignore subsequent errors</source>
+<target>이후 오류 무시(&I)</target>
 
 <source>&Ignore</source>
 <target>무시(&I)</target>
@@ -1146,8 +1214,8 @@ Note: File names must be relative to base directories.
 <source>Fatal Error</source>
 <target>치명적 오류</target>
 
-<source>Don't show this warning again</source>
-<target>이 경고를 다시 표시하지 않음</target>
+<source>&Don't show this warning again</source>
+<target>이 경고를 다시 표시하지 않음(&D)</target>
 
 <source>&Switch</source>
 <target>스위치[전환](&S)</target>
@@ -1182,17 +1250,14 @@ Note: File names must be relative to base directories.
 <source>Completed</source>
 <target>완료</target>
 
-<source>Continue</source>
-<target>계속</target>
-
-<source>Pause</source>
-<target>일시정지</target>
+<source>&Continue</source>
+<target>계속(&C)</target>
 
-<source>Logging</source>
-<target>로깅</target>
+<source>Log</source>
+<target>로그</target>
 
 <source>Cannot find %x</source>
-<target>%x 을(를) 찾을 수 없습니다.</target>
+<target>%x을(를) 찾을 수 없습니다.</target>
 
 <source>Inactive</source>
 <target>비활성화</target>
@@ -1225,11 +1290,11 @@ Note: File names must be relative to base directories.
 <target>필터</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>정말로 다음 %x 항목(들)을 휴지통으로 이동하시겠습니까?</pluralform>
+<pluralform>다음 %x 항목을 정말로 휴지통으로 이동하기를 원하십니까?</pluralform>
 </target>
 
 <source>
@@ -1250,7 +1315,7 @@ Note: File names must be relative to base directories.
 <target>NTFS 권한 복사</target>
 
 <source>Integrate external applications into context menu. The following macros are available:</source>
-<target>외부 응용 프로그램을 Context Menu에 통합. 다음 매크로가 사용 가능합니다 :</target>
+<target>외부 응용 프로그램을 Context Menu에 통합. 다음 매크로가 사용 가능합니다:</target>
 
 <source>- full file or folder name</source>
 <target>- 전체 파일 또는 폴더 이름</target>
@@ -1282,9 +1347,6 @@ Note: File names must be relative to base directories.
 <source>Append a timestamp to each file name</source>
 <target>각 파일 이름마다 타임스탬프 추가</target>
 
-<source>Folder</source>
-<target>폴더</target>
-
 <source>File</source>
 <target>파일</target>
 
@@ -1301,22 +1363,22 @@ Note: File names must be relative to base directories.
 <target>백분율(%)</target>
 
 <source>Cannot monitor directory %x.</source>
-<target>디렉토리 %x 을(를) 모니터링 할 수 없습니다.</target>
+<target>디렉토리 %x을(를) 모니터링 할 수 없습니다.</target>
 
 <source>Conversion error:</source>
-<target>변환 오류 :</target>
+<target>변환 오류:</target>
 
 <source>Cannot delete file %x.</source>
-<target>파일 %x 을(를) 삭제할 수 없습니다.</target>
+<target>파일 %x을(를) 삭제할 수 없습니다.</target>
 
 <source>The file is locked by another process:</source>
-<target>파일이 다른 프로세스에 의해 잠겨 있습니다 :</target>
+<target>파일이 다른 프로세스에 의해 잠겨 있습니다:</target>
 
 <source>Cannot move file %x to %y.</source>
-<target>파일 %x 을(를) %y (으)로 이동할 수 없습니다.</target>
+<target>파일 %x을(를) %y(으)로 이동할 수 없습니다.</target>
 
 <source>Cannot delete directory %x.</source>
-<target>디렉토리 %x 을(를) 삭제할 수 없습니다.</target>
+<target>디렉토리 %x을(를) 삭제할 수 없습니다.</target>
 
 <source>Cannot write file attributes of %x.</source>
 <target>%x의 파일 속성을 쓸 수 없습니다.</target>
@@ -1337,28 +1399,28 @@ Note: File names must be relative to base directories.
 <target>%x의 권한을 쓸 수 없습니다.</target>
 
 <source>Cannot create directory %x.</source>
-<target>디렉토리 %x 을(를) 생성할 수 없습니다.</target>
+<target>디렉토리 %x을(를) 생성할 수 없습니다.</target>
 
 <source>Cannot create symbolic link %x.</source>
-<target>심볼릭 링크 %x 을(를) 생성할 수 없습니다.</target>
+<target>심볼릭 링크 %x을(를) 생성할 수 없습니다.</target>
 
 <source>Cannot find system function %x.</source>
-<target>시스템 함수 %x 을(를) 찾을 수 없습니다.</target>
+<target>시스템 함수 %x을(를) 찾을 수 없습니다.</target>
 
 <source>Cannot copy file %x to %y.</source>
-<target>파일 %x 을(를) %y (으)로 복사할 수 없습니다.</target>
+<target>파일 %x을(를) %y(으)로 복사할 수 없습니다.</target>
 
 <source>Type of item %x is not supported:</source>
-<target>항목 %x의 형식은 지원되지 않습니다 :</target>
+<target>항목 %x의 형식은 지원되지 않습니다:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
-<target>심볼릭 링크 %x 을(를) 해결할 수 없습니다.</target>
+<target>심볼릭 링크 %x을(를) 해결할 수 없습니다.</target>
 
 <source>Cannot open directory %x.</source>
-<target>디렉토리 %x 을(를) 열 수 없습니다.</target>
+<target>디렉토리 %x을(를) 열 수 없습니다.</target>
 
 <source>Cannot enumerate directory %x.</source>
-<target>디렉토리 %x 을(를) 열거할 수 없습니다.</target>
+<target>디렉토리 %x을(를) 열거할 수 없습니다.</target>
 
 <source>%x TB</source>
 <target>%x TB</target>
@@ -1394,7 +1456,7 @@ Note: File names must be relative to base directories.
 <target>시스템 메시지를 받기 위한 등록에 실패하였습니다.</target>
 
 <source>Cannot set privilege %x.</source>
-<target>권한 %x 을(를) 설정할 수 없습니다.</target>
+<target>권한 %x을(를) 설정할 수 없습니다.</target>
 
 <source>Failed to suspend system sleep mode.</source>
 <target>시스템 절전모드 중지 실패</target>
@@ -1402,8 +1464,8 @@ Note: File names must be relative to base directories.
 <source>Cannot change process I/O priorities.</source>
 <target>I/O 우선순위 프로세스 변경 불가</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>%x 을(를) 휴지통으로 이동할 수 없습니다.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>휴지통으로 %x을(를) 이동할 수 없습니다.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>%x 에 대한 최종 경로를 결정할 수 없습니다.</target>
diff --git a/BUILD/Languages/lithuanian.lng b/BUILD/Languages/lithuanian.lng
index e3bfed10..032b8ee6 100644
--- a/BUILD/Languages/lithuanian.lng
+++ b/BUILD/Languages/lithuanian.lng
@@ -1,61 +1,38 @@
 <header>
 	<language>Lietuvių</language>
-	<translator>Liudas Ališauskas</translator>
+	<translator>Tadas Norbutas</translator>
 	<locale>lt_LT</locale>
 	<flag_image>flag_lithuania.png</flag_image>
 	<plural_form_count>4</plural_form_count>
 	<plural_definition>n==1 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3</plural_definition>
 </header>
 
-<source>Cannot determine final path for %x.</source>
-<target></target>
-
-<source>Failed to register to receive system messages.</source>
-<target></target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target></target>
-
-<source>Cannot create symbolic link %x.</source>
+<source>&Continue</source>
 <target></target>
 
-<source>Items</source>
+<source>&Don't show this warning again</source>
 <target></target>
 
-<source>Log</source>
+<source>&Ignore subsequent errors</source>
 <target></target>
 
-<source>&Continue</source>
-<target></target>
-
-<source>Comma-separated values</source>
+<source>Never save &changes</source>
 <target></target>
 
 <source>
 <pluralform>%y of 1 row in view</pluralform>
 <pluralform>%y of %x rows in view</pluralform>
 </source>
-<target></target>
-
-<source>&Don't show this dialog again</source>
-<target></target>
+<target>
+</target>
 
 <source>&Execute</source>
 <target></target>
 
-<source>Confirm</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
+<source>&Don't show this dialog again</source>
 <target></target>
 
-<source>Select a variant</source>
-<target></target>
-
-<source>Minimize to notification area</source>
+<source>Close search bar</source>
 <target></target>
 
 <source>Check for new &version</source>
@@ -64,110 +41,25 @@
 <source>&Tools</source>
 <target></target>
 
-<source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source>
-<target></target>
-
 <source>&Download</source>
 <target></target>
 
-<source>New version found</source>
-<target></target>
-
-<source>Retrying operation after error:</source>
-<target></target>
-
-<source>Switching to FreeFileSync main dialog</source>
-<target></target>
-
-<source>Data verification error: %x and %y have different content.</source>
-<target></target>
-
-<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
-<target></target>
-
 <source>&Show error</source>
 <target></target>
 
-<source>Waiting until all directories are available...</source>
-<target></target>
-
-<source>Directory monitoring active</source>
-<target></target>
-
-<source>Volume name %x is not part of file path %y.</source>
-<target></target>
-
-<source>Cannot determine volume name for %x.</source>
-<target></target>
-
-<source>%x items</source>
-<target></target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
 </source>
-<target></target>
+<target>
+</target>
 
 <source>
 <pluralform>1 byte</pluralform>
 <pluralform>%x bytes</pluralform>
 </source>
-<target></target>
-
-<source>Cannot read file attributes of %x.</source>
-<target></target>
-
-<source>Starting comparison</source>
-<target></target>
-
-<source>Resolving symbolic link %x</source>
-<target></target>
-
-<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source>
-<target></target>
-
-<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
-<target></target>
-
-<source>Any number of alternative directories for at most one config file.</source>
-<target></target>
-
-<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
-<target></target>
-
-<source>directory</source>
-<target></target>
-
-<source>config files</source>
-<target></target>
-
-<source>Syntax:</source>
-<target></target>
-
-<source>Directories cannot be set for more than one configuration file.</source>
-<target></target>
-
-<source>The config file must not contain settings at folder pair level when directories are set via command line.</source>
-<target></target>
-
-<source>Unequal number of left and right directories specified.</source>
-<target></target>
-
-<source>Cannot open file %x.</source>
-<target></target>
-
-<source>Syntax error</source>
-<target></target>
-
-<source>A directory path is expected after %x.</source>
-<target></target>
-
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target></target>
-
-<source>The database entry is not in sync considering current settings.</source>
-<target></target>
+<target>
+</target>
 
 <source>Both sides have changed since last synchronization.</source>
 <target>Abi pusės buvo pakeistos nuo paskutinio sinchronizavimo.</target>
@@ -178,20 +70,23 @@
 <source>No change since last synchronization.</source>
 <target>Nėra pakitimo nuo pakutinio sinchronizavimo.</target>
 
+<source>The database entry is not in sync considering current settings.</source>
+<target>Duomenų bazės įrašas nesinchronizuotas remiantis šiais nustatymais.</target>
+
 <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>Checking recycle bin availability for folder %x...</source>
 <target>Tikrinamas šiukšliadėžės prieinamumas aplankui %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>Perkeliamas failas %x į šiukšliadėžę</target>
+<source>Moving file %x to the recycle bin</source>
+<target>%x failas perkeliamas į šiukšliadėžę</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>Perkeliamas aplankas %x į šiukšliadėžę</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>%x katalogas perkeliamas į šiukšliadėžę</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Perkeliama simbolinė nuoroda %x į šiukšliadėžę</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>Simbolinė nuoroda %x perkeliama į šiukšliadėžę</target>
 
 <source>Deleting file %x</source>
 <target>Trinamas failas %x</target>
@@ -202,18 +97,54 @@
 <source>Deleting symbolic link %x</source>
 <target>Tinama simbolinė nuoroda %x</target>
 
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Šiuklšlių dėžė šiems katalogams yra nepasiekiama. Failai bus negrįžtamai ištrinti:</target>
+
 <source>An exception occurred</source>
 <target>Atsirado išimtis</target>
 
+<source>A directory path is expected after %x.</source>
+<target>Reikalingas katalogo kelias po %x</target>
+
+<source>Syntax error</source>
+<target>Sintaksės klaida</target>
+
+<source>Cannot open file %x.</source>
+<target>%x failo nepavyko atidaryti.</target>
+
 <source>Error</source>
 <target>Klaida</target>
 
 <source>File %x does not contain a valid configuration.</source>
 <target>Failas %x neturi tinkamų nustatymų.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Nustatytas nevienodas skaičius katalogų kairėje ir dešinėje.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Config failas negali turėti katalogų poros lygio nustatymų kai katalogai nustatomi per komandinę eilutę.</target>
+
 <source>Warning</source>
 <target>Perspėjimas</target>
 
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Katalogai negali būti nustatyti daugiau nei viename konfigūracijos faile.</target>
+
+<source>Syntax:</source>
+<target>Sintaksė:</target>
+
+<source>config files</source>
+<target>config failai</target>
+
+<source>directory</source>
+<target>katalogas</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Keletas FreeFileSync .ffs_gui ir/arba .ffs_batch configūracijos failų</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Daugiausia vienam config failui, n alternatyvių katalogų</target>
+
 <source>Command line</source>
 <target>Komandinė eilutė</target>
 
@@ -226,6 +157,12 @@
 <source>Cannot find the following folders:</source>
 <target>Nepavyksta rasti šių aplankų:</target>
 
+<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>Jei žinote, kad kiekvienas katalogas yra tuščias, šią klaidą galite ignoruoti. Katalogai bus automatiškai sukurti sinchronizacijos metu.</target>
+
+<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source>
+<target>Šie katalogai turi tarpusavyje susijusių kelių. Būkite atsargūs nustatydami sinchronizacijos taisykles:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Failas %x turi netinkamą datą.</target>
 
@@ -241,12 +178,18 @@
 <source>Items differ in attributes only</source>
 <target>Elementai skiriasi tik atributais</target>
 
+<source>Resolving symbolic link %x</source>
+<target>Ieškoma simbolinės nuorodos %x</target>
+
 <source>Comparing content of files %x</source>
 <target>Sulyginamas failų turinys %x</target>
 
 <source>Generating file list...</source>
 <target>Generuojamas failų sąrašas...</target>
 
+<source>Starting comparison</source>
+<target>Pradedamas palyginimas</target>
+
 <source>Calculating sync directions...</source>
 <target>Apskaičiuojamos sinchrinizacijos kryptys...</target>
 
@@ -331,6 +274,9 @@
 <source>Searching for folder %x...</source>
 <target>Ieškoma aplanko %x...</target>
 
+<source>Cannot read file attributes of %x.</source>
+<target>Nepavyko perskaityti failo %x atributų</target>
+
 <source>Cannot get process information.</source>
 <target>Nepavyksta gauti eigos informacijos.</target>
 
@@ -384,6 +330,9 @@
 <source>/sec</source>
 <target>/sek.</target>
 
+<source>%x items</source>
+<target>%x pozicijos</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Nustatymų failas %x įkeltas tik dalinai.</target>
 
@@ -396,8 +345,8 @@
 <source>Browse directory</source>
 <target>Naršyti katalogą</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Nepavyksta apsiekti tomo šėšėlinio kopijavimo tarnybos.</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Volume Shadow Copy paslauga nepasiekiama.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Prašome naudoti 64-bit FreeFileSync versiją, kad sukurti šėšėlines kopijas šioje sistemoje.</target>
@@ -405,6 +354,12 @@
 <source>Cannot load file %x.</source>
 <target>Nepavyksta įkelti failo %x.</target>
 
+<source>Cannot determine volume name for %x.</source>
+<target>Vietos vardo %x nustatyti nepavyko</target>
+
+<source>Volume name %x is not part of file path %y.</source>
+<target>Vietos vardas %x nėra failo kelio %y dalis.</target>
+
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Nutraukti: laukiama kol baigsis esama operacija...</target>
 
@@ -503,6 +458,12 @@ Komanda inicijuojama jei:
 <source>All files</source>
 <target>Visi failai</target>
 
+<source>Directory monitoring active</source>
+<target>Katalogų stebėjimas yra aktyvus</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Laukiama kol katalogai bus prieinami...</target>
+
 <source>&Restore</source>
 <target>&Atstatyti</target>
 
@@ -581,6 +542,9 @@ Komanda inicijuojama jei:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Šie elementai turi neišspręstų konfliktų ir nebus sinchronizuoti:</target>
 
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Šie katalogai yra labai skirtingi. Įsitikinkite, kad sinchronizacijai pasirinkote teisingus katalogus.</target>
+
 <source>Not enough free disk space available in:</source>
 <target>Nepakanka laisvos disko vietos:</target>
 
@@ -599,8 +563,14 @@ Komanda inicijuojama jei:
 <source>Generating database...</source>
 <target>Generuojama duomenų bazė...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Kuriama vietos šėšėlinė kopija dėl %x...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>%x kuriamas Volume Shadow Copy...</target>
+
+<source>Data verification error: %x and %y have different content.</source>
+<target>Duomenų patikros klaida: %x ir %y turinys yra skirtingas.</target>
+
+<source>job name</source>
+<target>Užduoties pavadinimas</target>
 
 <source>Synchronization aborted</source>
 <target>Synchronizavimas nutrauktas</target>
@@ -623,12 +593,21 @@ Komanda inicijuojama jei:
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Spauskite „Perjungti“, kad išspręsti problemas pagrindiniame FreeFileSync lange.</target>
 
+<source>Switching to FreeFileSync main dialog</source>
+<target>Keičiama į pagrindinį FreeFileSync langą</target>
+
+<source>Retrying operation after error:</source>
+<target>Po klaidos kartojama operacija:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Yra nauja FreeFileSync versija:</target>
 
 <source>Download now?</source>
 <target>Atsiųsti dabar?</target>
 
+<source>New version found</source>
+<target>Rasta nauja versija</target>
+
 <source>FreeFileSync is up to date.</source>
 <target>FreeFileSync yra naujausia.</target>
 
@@ -638,11 +617,14 @@ Komanda inicijuojama jei:
 <source>Unable to connect to sourceforge.net.</source>
 <target>Nepavyksta prisijungti prie sourceforge.net.</target>
 
+<source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source>
+<target>Dabartinės FreeFileSync versijos numeris internete nerastas. Ar norėtumėte patikrinti rankiniu būdu?</target>
+
 <source>Symlink</source>
 <target>Simbolinė nuoroda</target>
 
 <source>Folder</source>
-<target>Aplankas</target>
+<target>Katalogas</target>
 
 <source>Full path</source>
 <target>Pilnas kelias</target>
@@ -651,10 +633,10 @@ Komanda inicijuojama jei:
 <target>Pavadinimas</target>
 
 <source>Relative path</source>
-<target>Atitinkamas kelias</target>
+<target>Elemento kelias</target>
 
 <source>Base folder</source>
-<target>Bazinis aplankas</target>
+<target>Bazinis katalogas</target>
 
 <source>Size</source>
 <target>Dydis</target>
@@ -737,8 +719,8 @@ Komanda inicijuojama jei:
 <source>&Export file list...</source>
 <target>&Eksportuoti failų sąrašą...</target>
 
-<source>&Global settings...</source>
-<target>&Bendri nustatymai...</target>
+<source>&Global settings</source>
+<target>&Bendri nustatymai</target>
 
 <source>&Check now</source>
 <target>&Tikrinti dabar</target>
@@ -749,12 +731,6 @@ Komanda inicijuojama jei:
 <source>Compare</source>
 <target>Sulyginti</target>
 
-<source>Comparison settings</source>
-<target>Sulyginimo nustatymai</target>
-
-<source>Synchronization settings</source>
-<target>Sinchronizavimo nustatymai</target>
-
 <source>Synchronize</source>
 <target>Sinchronizuoti</target>
 
@@ -767,6 +743,12 @@ Komanda inicijuojama jei:
 <source>Swap sides</source>
 <target>Sukeisti puses</target>
 
+<source>Find what:</source>
+<target>Rasti kas:</target>
+
+<source>Match case</source>
+<target>Atitikti atveją</target>
+
 <source>Save as batch job</source>
 <target>Išsaugoti kaip paketinį darbą</target>
 
@@ -803,6 +785,9 @@ Komanda inicijuojama jei:
 <source>Synchronizing...</source>
 <target>Sinchronizuojama...</target>
 
+<source>Minimize to notification area</source>
+<target>Nuleisti į apačią dešinėje</target>
+
 <source>On completion</source>
 <target>Baigus</target>
 
@@ -818,8 +803,8 @@ Komanda inicijuojama jei:
 <source>Statistics</source>
 <target>Statistika</target>
 
-<source>Don't show this dialog again</source>
-<target>Daugiau nerodyti šio dialogo</target>
+<source>Select a variant</source>
+<target>Pasirinkti</target>
 
 <source>
 Files are found equal if
@@ -866,6 +851,12 @@ yra toks pats
 <source>Configure your own synchronization rules.</source>
 <target>Nustatyti Jūsų pačių sinchronizavimo taisykles.</target>
 
+<source>Detect moved files</source>
+<target>Rasti perkeltus failus</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Reikalauja duomenų bazės failų. Visų failų sistemų nėra palaikoma.</target>
+
 <source>Error handling</source>
 <target>Klaidų valdymas</target>
 
@@ -890,17 +881,17 @@ yra toks pats
 <source>Delete or overwrite files permanently</source>
 <target>Trinti ar perrašyti failus visam laikui</target>
 
-<source>Recycle Bin</source>
-<target>Šiukšliadėžė</target>
+<source>Recycle bin</source>
+<target>Šiukšlių dėžė</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Naudoti šiukšliadėžę ištrintiems ir perrašytiems failams</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Padaryti šiukšlių dėžėje esančių ištrintų ar perrašytų failų atsarginę kopiją</target>
 
 <source>Versioning</source>
 <target>Versijavimas</target>
 
-<source>Move files to user-defined folder</source>
-<target>Perkelti failus į naudotojo nurodytą aplanką</target>
+<source>Move files to a user-defined folder</source>
+<target>Perkelti failus į vartotojo nustatytą katalogą</target>
 
 <source>Naming convention:</source>
 <target>Pavadinimų taisyklės:</target>
@@ -908,8 +899,8 @@ yra toks pats
 <source>Batch job</source>
 <target>Paketinė užduotis</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Sukurti paleidimo failą sinchronizacijai be priežiūros. Norint jį paleisti reikia paspausti and failo du kartus pele arba nustatyti su užduočių planuotoju: %x</target>
 
 <source>Exit</source>
 <target>Išeiti</target>
@@ -932,30 +923,6 @@ yra toks pats
 <source>Limit maximum number of log files</source>
 <target>Apriboti ataskaitų failų skaičių</target>
 
-<source>Source code written in C++ using:</source>
-<target>Šaltinio kodas parašytas su C++ naudojant:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Jei Jums patinka FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Paremkite per PayPal</target>
-
-<source>Many thanks for localization:</source>
-<target>Labai dėkojame už vertimą:</target>
-
-<source>Feedback and suggestions are welcome</source>
-<target>Nuomonė ir patarimai laukiami</target>
-
-<source>Homepage</source>
-<target>Namų puslapis</target>
-
-<source>Email</source>
-<target>El. paštas</target>
-
-<source>Published under the GNU General Public License</source>
-<target>Platinama su GNU General Public licenzija</target>
-
 <source>Delete on both sides</source>
 <target>Ištrinti abiejose pusėse</target>
 
@@ -963,12 +930,12 @@ yra toks pats
 <target>Ištrinti abiejose pusėse net jei failas yra pažymėtas tik vienoje pusėje</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Tik failai, kurie atitinka visus filtro nustatymus bus sinchronizuoti.
-Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
+Failai gali būti sinchronizuoti tik tada, kai atitinka filtrų taisykles
+Pastaba: Failų keliai turi būti nurodyti tik iki pagrindinių katalogų
 </target>
 
 <source>Include</source>
@@ -998,20 +965,20 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Kopijuoti į laikiną failą (*.ffs_tmp), o tik po to pervadinti. Tai garantuoją stabilią būseną net įvykus nepataisomai klaidai.</target>
 
 <source>Copy locked files</source>
 <target>Kopijuoti užrakintus failus</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Kopijuoti viešinamus ar užrakintus failus naudojant tomo šėšėlinio kopijavimo tarnybą (Reikalingos administratoriaus teisės)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Kopijuoti bendrintus ar užrakintus failus naudojant Volume Shadow Copy paslaugą (administratoriaus teisės privalomos)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopijuoti failo leidimus</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Perkelti failo ir aplanko leidimus (Reikalauja administratoriaus teisų)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Išsaugoti failų ir katalogų teises (administratoriaus teisės privalomos)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Atstatyti paslėptus langus</target>
@@ -1025,33 +992,54 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <source>&Default</source>
 <target>&Numatyta</target>
 
-<source>Find what:</source>
-<target>Rasti kas:</target>
+<source>Source code written in C++ using:</source>
+<target>Šaltinio kodas parašytas su C++ naudojant:</target>
 
-<source>Match case</source>
-<target>Atitikti atveją</target>
+<source>If you like FreeFileSync</source>
+<target>Jei Jums patinka FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>Paremkite per PayPal</target>
+
+<source>Feedback and suggestions are welcome</source>
+<target>Nuomonė ir patarimai laukiami</target>
+
+<source>Homepage</source>
+<target>Namų puslapis</target>
+
+<source>Email</source>
+<target>El. paštas</target>
+
+<source>Published under the GNU General Public License</source>
+<target>Platinama su GNU General Public licenzija</target>
 
-<source>&Find next</source>
-<target>&Rasti kitą</target>
+<source>Many thanks for localization:</source>
+<target>Labai dėkojame už vertimą:</target>
 
 <source>Start synchronization</source>
 <target>Pradėti sinchronizavimą</target>
 
+<source>Comparison settings</source>
+<target>Sulyginimo nustatymai</target>
+
+<source>Synchronization settings</source>
+<target>Sinchronizavimo nustatymai</target>
+
 <source>Delete</source>
 <target>Trinti</target>
 
 <source>Configure filter</source>
 <target>Nustatyti filtrą</target>
 
-<source>Find</source>
-<target>Rasti</target>
-
 <source>Select time span</source>
 <target>Pažymėti laiko trukmę</target>
 
 <source>Folder pairs</source>
 <target>Aplankų poros</target>
 
+<source>Find</source>
+<target>Rasti</target>
+
 <source>Overview</source>
 <target>Apžvalga</target>
 
@@ -1077,6 +1065,20 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <target>Sulyginti abi puses</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Ar tikrai norite paleisti %y komandą 1-ai pozicijai?</pluralform>
+<pluralform>Ar tikrai norite paleisti %y komandą %x pozicijoms?</pluralform>
+<pluralform>Ar tikrai norite paleisti %y komandą %x pozicijų?</pluralform>
+<pluralform>Ar tikrai norite paleisti %y komandą %x pozicijai?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Patvirtinti</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1101,17 +1103,20 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <source>Set direction:</source>
 <target>Nustatyti kryptį:</target>
 
-<source>Exclude temporarily</source>
-<target>Neįtraukti laikinai</target>
+<source>multiple selection</source>
+<target>keletos pažymėjimas</target>
 
-<source>Include temporarily</source>
-<target>Įtraukti laikinai</target>
+<source>Include via filter:</source>
+<target>Įtraukti naudojant filtrą:</target>
 
 <source>Exclude via filter:</source>
 <target>Neįtraukti per filtrą:</target>
 
-<source>multiple selection</source>
-<target>keletos pažymėjimas</target>
+<source>Exclude temporarily</source>
+<target>Neįtraukti laikinai</target>
+
+<source>Include temporarily</source>
+<target>Įtraukti laikinai</target>
 
 <source>Include all</source>
 <target>Įtraukti visus</target>
@@ -1158,9 +1163,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <source>Do&n't save</source>
 <target>&Nesaugoti</target>
 
-<source>Never save changes</source>
-<target>Niekada nesaugoti pakeitimų</target>
-
 <source>Show files that exist on left side only</source>
 <target>Rodyti failus, kurie egzistuoja tik kairėje pusėje</target>
 
@@ -1212,24 +1214,24 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <source>All folders are in sync</source>
 <target>Visi aplankai susinchronizuoti</target>
 
+<source>Cannot find %x</source>
+<target>Nepavyksta rasti %x</target>
+
+<source>Comma-separated values</source>
+<target>Kableliu atskirtos reikšmės</target>
+
 <source>File list exported</source>
 <target>Failų sąrašas eksportuotas</target>
 
 <source>Searching for program updates...</source>
 <target>Ieškoma programos atnaujinimų...</target>
 
-<source>Ignore further errors</source>
-<target>Ignoruoti tolimesnes klaidas</target>
-
 <source>&Ignore</source>
 <target>&Ignoruoti</target>
 
 <source>Fatal Error</source>
 <target>Kritinė klaida</target>
 
-<source>Don't show this warning again</source>
-<target>Neberodyti daugiau šio perspėjimo</target>
-
 <source>&Switch</source>
 <target>&Perjungti</target>
 
@@ -1263,8 +1265,8 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <source>Completed</source>
 <target>Baigta</target>
 
-<source>Cannot find %x</source>
-<target>Nepavyksta rasti %x</target>
+<source>Log</source>
+<target>Archyvas</target>
 
 <source>Inactive</source>
 <target>Neaktyvus</target>
@@ -1297,14 +1299,14 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <target>Filtras</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>Ar tikrai norite perkelti šį elementą į šiukšliadėžę?</pluralform>
-<pluralform>Ar tikrai norite perkelti šiuos %x elementus į šiukšliadėžę?</pluralform>
-<pluralform>Ar tikrai norite perkelti šiuos %x elementų į šiukšliadėžę?</pluralform>
-<pluralform>Ar tikrai norite perkelti šį %x elementą į šiukšliadėžę?</pluralform>
+<pluralform>Ar tikrai norite perkelti poziciją į šiukšklių dėžę?</pluralform>
+<pluralform>Ar tikrai norite perkelti šias %x pozicijas į šiukšklių dėžę?</pluralform>
+<pluralform>Ar tikrai norite perkelti šias %x pozicijų į šiukšklių dėžę?</pluralform>
+<pluralform>Ar tikrai norite perkelti poziciją %x į šiukšklių dėžę?</pluralform>
 </target>
 
 <source>
@@ -1369,6 +1371,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <source>Files</source>
 <target>Failai</target>
 
+<source>Items</source>
+<target>Pozicijos</target>
+
 <source>Percentage</source>
 <target>Procentai</target>
 
@@ -1411,6 +1416,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <source>Cannot create directory %x.</source>
 <target>Nepavyksta sukurti katalogo %x.</target>
 
+<source>Cannot create symbolic link %x.</source>
+<target>Nepavyko sukurti simbolinės nuorodos %x</target>
+
 <source>Cannot find system function %x.</source>
 <target>Nepavyksta rasti sistemos funkcijos %x.</target>
 
@@ -1420,6 +1428,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <source>Type of item %x is not supported:</source>
 <target>Element tipas %x nepalaikomas:</target>
 
+<source>Cannot resolve symbolic link %x.</source>
+<target>Nepavyko rasti simbolinės nuorodos %x reikšmės</target>
+
 <source>Cannot open directory %x.</source>
 <target>Nepavyksta atverti direktorijos %x.</target>
 
@@ -1465,6 +1476,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <pluralform>%x diena</pluralform>
 </target>
 
+<source>Failed to register to receive system messages.</source>
+<target>Užregistruoti sistemos pranešimų gavimui nepavyko</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Nepavyksta nustatyti privilegijos %x.</target>
 
@@ -1474,8 +1488,11 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <source>Cannot change process I/O priorities.</source>
 <target>Nepavyksta pakeisti proceso I/O prioritetų.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Nepavyksta perkelti %x į šiukšliadėžę.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>%x į šiukšlinę perkelti nepavyko</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Galutinio %x kelio rasti nepavyko</target>
 
 <source>Error Code %x:</source>
 <target>Klaidos kodas %x:</target>
diff --git a/BUILD/Languages/norwegian.lng b/BUILD/Languages/outdated/norwegian.lng
index 4ebcd3a5..2e50c49d 100644
--- a/BUILD/Languages/norwegian.lng
+++ b/BUILD/Languages/outdated/norwegian.lng
@@ -10,6 +10,9 @@
 <source>Cannot determine final path for %x.</source>
 <target></target>
 
+<source>Unable to move %x to the recycle bin.</source>
+<target></target>
+
 <source>Failed to register to receive system messages.</source>
 <target></target>
 
@@ -26,30 +29,94 @@
 <pluralform>Do you really want to delete the following item?</pluralform>
 <pluralform>Do you really want to delete the following %x items?</pluralform>
 </source>
-<target></target>
+<target>
+</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
+<target>
+</target>
+
+<source>Log</source>
+<target></target>
+
+<source>&Continue</source>
+<target></target>
+
+<source>&Don't show this warning again</source>
 <target></target>
 
-<source>Don't show this warning again</source>
+<source>&Ignore subsequent errors</source>
 <target></target>
 
 <source>Searching for program updates...</source>
 <target></target>
 
+<source>Comma-separated values</source>
+<target></target>
+
+<source>Never save &changes</source>
+<target></target>
+
+<source>Include via filter:</source>
+<target></target>
+
 <source>
 <pluralform>%y of 1 row in view</pluralform>
 <pluralform>%y of %x rows in view</pluralform>
 </source>
+<target>
+</target>
+
+<source>&Execute</source>
+<target></target>
+
+<source>Confirm</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target></target>
+
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target></target>
+
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
 <target></target>
 
 <source>&Clear</source>
 <target></target>
 
-<source>Move files to user-defined folder</source>
+<source>
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
+</source>
+<target></target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target></target>
+
+<source>Move files to a user-defined folder</source>
+<target></target>
+
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target></target>
+
+<source>Recycle bin</source>
+<target></target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target></target>
+
+<source>Detect moved files</source>
 <target></target>
 
 <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
@@ -58,6 +125,12 @@
 <source>Select a variant</source>
 <target></target>
 
+<source>&Don't show this dialog again</source>
+<target></target>
+
+<source>Minimize to notification area</source>
+<target></target>
+
 <source>Check for new &version</source>
 <target></target>
 
@@ -82,21 +155,62 @@
 <source>New version found</source>
 <target></target>
 
+<source>Retrying operation after error:</source>
+<target></target>
+
 <source>Switching to FreeFileSync main dialog</source>
 <target></target>
 
+<source>job name</source>
+<target></target>
+
 <source>Data verification error: %x and %y have different content.</source>
 <target></target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target></target>
+
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target></target>
+
+<source>&Show error</source>
+<target></target>
+
+<source>Waiting until all directories are available...</source>
+<target></target>
+
+<source>Directory monitoring active</source>
+<target></target>
+
+<source>Volume name %x is not part of file path %y.</source>
 <target></target>
 
 <source>Cannot determine volume name for %x.</source>
 <target></target>
 
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target></target>
+
+<source>%x items</source>
+<target></target>
+
+<source>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
+</source>
+<target>
+</target>
+
 <source>Cannot set directory lock for %x.</source>
 <target></target>
 
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
+<target>
+</target>
+
 <source>Calculating sync directions...</source>
 <target></target>
 
@@ -115,7 +229,49 @@
 <source>The corresponding folder will be considered as empty.</source>
 <target></target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<source>Any number of alternative directories for at most one config file.</source>
+<target></target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target></target>
+
+<source>directory</source>
+<target></target>
+
+<source>config files</source>
+<target></target>
+
+<source>Syntax:</source>
+<target></target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target></target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target></target>
+
+<source>Unequal number of left and right directories specified.</source>
+<target></target>
+
+<source>Cannot open file %x.</source>
+<target></target>
+
+<source>Syntax error</source>
+<target></target>
+
+<source>A directory path is expected after %x.</source>
+<target></target>
+
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target></target>
+
+<source>Moving symbolic link %x to the recycle bin</source>
+<target></target>
+
+<source>Moving folder %x to the recycle bin</source>
+<target></target>
+
+<source>Moving file %x to the recycle bin</source>
 <target></target>
 
 <source>The database entry is not in sync considering current settings.</source>
@@ -136,15 +292,6 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Sjekker søppelbøtte for tilgjengelig mappe %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>Flytter fil %x til papirkurv</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Flytter mappe %x til papirkurv</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Flytter symbolsk lenke %x til papirkurv</target>
-
 <source>Deleting file %x</source>
 <target>Sletter fil %x</target>
 
@@ -157,15 +304,18 @@
 <source>An exception occurred</source>
 <target>Et avvik har oppstått</target>
 
-<source>Cannot find file %x.</source>
-<target>Kan ikke finne filen %x.</target>
-
 <source>Error</source>
 <target>Feil</target>
 
 <source>File %x does not contain a valid configuration.</source>
 <target>Filen %x inneholder en ugyldig innstilling.</target>
 
+<source>Warning</source>
+<target>Advarsel</target>
+
+<source>Command line</source>
+<target>Kommandolinje</target>
+
 <source>A folder input field is empty.</source>
 <target>Et mappefelt er tomt.</target>
 
@@ -304,15 +454,6 @@
 <source>Total time:</source>
 <target>Total tid:</target>
 
-<source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</source>
-<target>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</target>
-
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -328,15 +469,6 @@
 <source>Scanning:</source>
 <target>Skanner:</target>
 
-<source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
-</source>
-<target>
-<pluralform>[1 Tråd]</pluralform>
-<pluralform>[%x Tråder]</pluralform>
-</target>
-
 <source>Encoding extended time information: %x</source>
 <target>Koder utvided tidsinformasjon: %x</target>
 
@@ -355,18 +487,12 @@
 <source>Browse directory</source>
 <target>Utforsk mappe</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Kan ikke få adgang til Volume Shadow Copy Service.</target>
-
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Bruk FreeFileSync 64-bit-versjon til å opprette skyggekopier på dette systemet.</target>
 
 <source>Cannot load file %x.</source>
 <target>Kan ikke laste filen %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Volumnavn %x ikke del av filnavn %y.</target>
-
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Handling avbrutt: Venter på at nåværende handling fullføres...</target>
 
@@ -433,9 +559,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Inaktiv tid mellom forrige endring og utførelse av kommando</target>
 
-<source>Command line</source>
-<target>Kommandolinje</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -459,9 +582,6 @@ Kommandoen utløses hvis:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatisk synkronisering</target>
 
-<source>Warning</source>
-<target>Advarsel</target>
-
 <source>Build: %x</source>
 <target>Build: %x</target>
 
@@ -477,9 +597,6 @@ Kommandoen utløses hvis:
 <source>&Exit</source>
 <target>&Avslutt</target>
 
-<source>Waiting for missing directories...</source>
-<target>Venter på manglende mapper...</target>
-
 <source>Invalid command line:</source>
 <target>Ugyldig kommando:</target>
 
@@ -489,14 +606,14 @@ Kommandoen utløses hvis:
 <source>File time and size</source>
 <target>Filtid og størrelse</target>
 
-<source> Two way </source>
-<target> Toveis </target>
+<source>Two way</source>
+<target>Toveis</target>
 
 <source>Mirror</source>
-<target>Speile </target>
+<target>Speile</target>
 
 <source>Update</source>
-<target>Oppdatere </target>
+<target>Oppdatere</target>
 
 <source>Custom</source>
 <target>Brukerdefinert</target>
@@ -552,12 +669,6 @@ Kommandoen utløses hvis:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>De følgende elementene har uoppklarte konflikter og vil ikke bli synkroniserte:</target>
 
-<source>Significant difference detected:</source>
-<target>Betydelig forskjell oppdaget:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Mer enn 50% av det totale antall filer blir kopiert eller slettet.</target>
-
 <source>Not enough free disk space available in:</source>
 <target>Ikke nok ledig diskplass tilgjengelig på:</target>
 
@@ -708,8 +819,8 @@ Kommandoen utløses hvis:
 <source>&Export file list...</source>
 <target>&Eksporter filliste...</target>
 
-<source>&Global settings...</source>
-<target>&Felles innstillinger...</target>
+<source>&Global settings</source>
+<target>&Felles innstillinger</target>
 
 <source>Compare</source>
 <target>Sammenlign</target>
@@ -777,6 +888,12 @@ Kommandoen utløses hvis:
 <source>&Pause</source>
 <target>&Pause</target>
 
+<source>Variant</source>
+<target>Variant</target>
+
+<source>Statistics</source>
+<target>Statistikk</target>
+
 <source>
 Files are found equal if
      - last write time and date
@@ -843,12 +960,6 @@ er det samme
 <source>Delete or overwrite files permanently</source>
 <target>Slett eller overskriv filer permanent</target>
 
-<source>Recycle Bin</source>
-<target>Papirkurv</target>
-
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Bruk papirkurv for slettede og overskrevne filer</target>
-
 <source>Versioning</source>
 <target>Versjonshåndtering</target>
 
@@ -858,9 +969,6 @@ er det samme
 <source>Batch job</source>
 <target>Batch-jobb</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>Lag en batch-fil for å automatisere synkronisering. Dobbelklikk denne filen eller legg til i ditt systems planlegger: FreFileSync.exe <job name>.ffs_batch</target>
-
 <source>Exit</source>
 <target>Avslutt</target>
 
@@ -912,15 +1020,6 @@ er det samme
 <source>Delete on both sides even if the file is selected on one side only</source>
 <target>Slett på begge sider selv om filen bare er valgt på en side</target>
 
-<source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
-</source>
-<target>
-Synkroniserer kun filer som passer til alle filterinnstillinger.
-Merk: Filnavn må være relative til basismapper.
-</target>
-
 <source>Include</source>
 <target>Inkluder</target>
 
@@ -945,21 +1044,12 @@ Merk: Filnavn må være relative til basismapper.
 <source>Fail-safe file copy</source>
 <target>Trygg filkopi</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>
-
 <source>Copy locked files</source>
 <target>Kopier låste filer</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Kopier delte eller låste filer ved å bruke Volume Shadow Copy Service (Krever administratorrettigheter)</target>
-
 <source>Copy file access permissions</source>
 <target>Kopier filadgangstillatelser</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Overfør tilgangspreferanser for filer og mapper (krever administratortilgang)</target>
-
 <source>Restore hidden dialogs</source>
 <target>Gjenopprett skjulte dialoger</target>
 
@@ -972,15 +1062,6 @@ Merk: Filnavn må være relative til basismapper.
 <source>&Default</source>
 <target>&Standard</target>
 
-<source>Variant</source>
-<target>Variant</target>
-
-<source>Statistics</source>
-<target>Statistikk</target>
-
-<source>Don't show this dialog again</source>
-<target>Ikke vis dette vinduet igjen</target>
-
 <source>Find what:</source>
 <target>Søk hva:</target>
 
@@ -990,15 +1071,15 @@ Merk: Filnavn må være relative til basismapper.
 <source>&Find next</source>
 <target>&Søk neste</target>
 
+<source>Start synchronization</source>
+<target>Start synkronisering</target>
+
 <source>Delete</source>
 <target>Slett</target>
 
 <source>Configure filter</source>
 <target>Still inn filter</target>
 
-<source>Start synchronization</source>
-<target>Start synkronisering</target>
-
 <source>Find</source>
 <target>Søk</target>
 
@@ -1059,12 +1140,12 @@ Merk: Filnavn må være relative til basismapper.
 <source>Include temporarily</source>
 <target>Inkluder midlertidig</target>
 
-<source>Exclude via filter:</source>
-<target>Ekskluder via filter:</target>
-
 <source>multiple selection</source>
 <target>flervalg</target>
 
+<source>Exclude via filter:</source>
+<target>Ekskluder via filter:</target>
+
 <source>Include all</source>
 <target>Inkluder alle</target>
 
@@ -1110,9 +1191,6 @@ Merk: Filnavn må være relative til basismapper.
 <source>Do&n't save</source>
 <target>&Ikke lagre</target>
 
-<source>Never save changes</source>
-<target>Aldri lagre endringer</target>
-
 <source>Show files that exist on left side only</source>
 <target>Vis filer som bare finnes på venstre side</target>
 
@@ -1164,15 +1242,9 @@ Merk: Filnavn må være relative til basismapper.
 <source>All folders are in sync</source>
 <target>Alle mapper er synkroniserte</target>
 
-<source>Comma separated list</source>
-<target>Komma-separert liste</target>
-
 <source>File list exported</source>
 <target>Filliste eksportert</target>
 
-<source>Ignore further errors</source>
-<target>Ignorer ytterligere feil</target>
-
 <source>&Ignore</source>
 <target>&Ignorer</target>
 
@@ -1212,15 +1284,6 @@ Merk: Filnavn må være relative til basismapper.
 <source>Completed</source>
 <target>Fullført</target>
 
-<source>Continue</source>
-<target>Fortsett</target>
-
-<source>Pause</source>
-<target>Pause</target>
-
-<source>Logging</source>
-<target>Logging</target>
-
 <source>Cannot find %x</source>
 <target>Kan ikke finne %x</target>
 
@@ -1293,9 +1356,6 @@ Merk: Filnavn må være relative til basismapper.
 <source>Append a timestamp to each file name</source>
 <target>Legg til et tidsstempel til hvert filnavn</target>
 
-<source>Folder</source>
-<target>Mappe</target>
-
 <source>File</source>
 <target>Fil</target>
 
@@ -1407,9 +1467,6 @@ Merk: Filnavn må være relative til basismapper.
 <source>Cannot change process I/O priorities.</source>
 <target>Kan ikke endre I/O prioriet på prosess</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Ikke i stand til å flytte %x til papirkurven.</target>
-
 <source>Error Code %x:</source>
 <target>Feil kode %x:</target>
 
diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng
index 78b97d59..8e0ead7f 100644
--- a/BUILD/Languages/polish.lng
+++ b/BUILD/Languages/polish.lng
@@ -7,7 +7,7 @@
 	<plural_definition>n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2</plural_definition>
 </header>
 
-<source>Retrying operation after error:</source>
+<source>Close search bar</source>
 <target></target>
 
 <source>Both sides have changed since last synchronization.</source>
@@ -28,13 +28,13 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Sprawdzanie dostępności kosza dla katalogu %x...</target>
 
-<source>Moving file %x to recycle bin</source>
+<source>Moving file %x to the recycle bin</source>
 <target>Przenoszenie pliku %x do kosza</target>
 
-<source>Moving folder %x to recycle bin</source>
+<source>Moving folder %x to the recycle bin</source>
 <target>Przenoszenie katalogu %x do kosza</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
+<source>Moving symbolic link %x to the recycle bin</source>
 <target>Przenoszenie dowiązania symbolicznego %x do kosza</target>
 
 <source>Deleting file %x</source>
@@ -46,14 +46,20 @@
 <source>Deleting symbolic link %x</source>
 <target>Usuwanie dowiązania symbolicznego %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>Kosz systemowy nie jest dostępny dla podanych katalogów. Katalogi zostaną usunięte permanentnie:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Dla następujących katalogów kosz nie jest dostępny. Pliki zostaną usunięte bez możliwości ich przywrócenia:</target>
 
 <source>An exception occurred</source>
 <target>Wystąpił wyjątek</target>
 
-<source>Cannot find file %x.</source>
-<target>Nie można znaleźć pliku %x.</target>
+<source>A directory path is expected after %x.</source>
+<target>Za %x oczekiwana jest ścieżka katalogu.</target>
+
+<source>Syntax error</source>
+<target>Błąd składni</target>
+
+<source>Cannot open file %x.</source>
+<target>Nie można otworzyć pliku %x.</target>
 
 <source>Error</source>
 <target>Błąd</target>
@@ -61,6 +67,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>Plik %x nie zawiera prawidłowej konfiguracji</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Wprowadzona liczba katalogów do synchronizacji jest nierówna.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Plik konfiguracyjny nie może zawierać informacji o synchronizowanych katalogach gdy nazwy ścieżek przekazywane są w linii poleceń.</target>
+
+<source>Warning</source>
+<target>Ostrzeżenie</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Dla więcej niż jednego pliku konfiguracyjnego, nie można ustawić wielu katalogów.</target>
+
+<source>Syntax:</source>
+<target>Składnia:</target>
+
+<source>config files</source>
+<target>pliki konfiguracyjne</target>
+
+<source>directory</source>
+<target>katalog</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Dowolna ilość plików konfiguracyjnych FreeFileSync .ffs_gui/.ffs_batch.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Dowolna liczba katalogów w przypadku użycia jednego pliku konfiguracyjnego.</target>
+
+<source>Command line</source>
+<target>Linia komend</target>
+
 <source>A folder input field is empty.</source>
 <target>Pole katalog źródłowy jest puste.</target>
 
@@ -219,13 +255,13 @@
 <target>Całkowity czas:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>1 Bajt</pluralform>
-<pluralform>%x Bajty</pluralform>
-<pluralform>%x Bajtów</pluralform>
+<pluralform>1 bajt</pluralform>
+<pluralform>%x bajty</pluralform>
+<pluralform>%x bajtów</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -247,13 +283,13 @@
 <target>Skanowanie:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 Wątek]</pluralform>
-<pluralform>[%x Wątki]</pluralform>
-<pluralform>[%x Wątków]</pluralform>
+<pluralform>1 wątek</pluralform>
+<pluralform>%x wątki</pluralform>
+<pluralform>%x wątków</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -262,6 +298,9 @@
 <source>/sec</source>
 <target>/sekundę</target>
 
+<source>%x items</source>
+<target>%x elementy</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Plik konfiguracyjny %x został wczytany tylko częściowo.</target>
 
@@ -274,7 +313,7 @@
 <source>Browse directory</source>
 <target>Przeglądaj katalog</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
+<source>Cannot access the Volume Shadow Copy Service.</source>
 <target>Nie można uzyskać dostępu do usługi Volume Shadow Copy.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
@@ -286,8 +325,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Nie można określić nazwy dysku dla %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Dysk %x nie jest częścią pliku %y.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>Nazwa zasobu %x ni jest częścią ścieżki %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Żądanie przerwania: Oczekiwanie na koniec aktualnie wykonywanego zadania...</target>
@@ -355,9 +394,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Czas pomiędzy ostatnią wykrytą zmianą, a uruchomieniem komendy</target>
 
-<source>Command line</source>
-<target>Linia komend</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -381,9 +417,6 @@ Komenda jest wykonywana gdy:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatyczna Synchronizacja</target>
 
-<source>Warning</source>
-<target>Ostrzeżenie</target>
-
 <source>Build: %x</source>
 <target>Zbudowano: %x</target>
 
@@ -393,15 +426,21 @@ Komenda jest wykonywana gdy:
 <source>All files</source>
 <target>Wszystkie pliki</target>
 
+<source>Directory monitoring active</source>
+<target>Monitorowanie katalogów aktywne</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Oczekiwanie na dostępność wszystkich katalogów...</target>
+
 <source>&Restore</source>
 <target>&Przywróć</target>
 
+<source>&Show error</source>
+<target>Pokaż &błędy</target>
+
 <source>&Exit</source>
 <target>&Wyjście</target>
 
-<source>Waiting for missing directories...</source>
-<target>Oczekiwanie na brakujące katalogi...</target>
-
 <source>Invalid command line:</source>
 <target>Nieprawidłowa komenda:</target>
 
@@ -411,14 +450,14 @@ Komenda jest wykonywana gdy:
 <source>File time and size</source>
 <target>Czas modyfikacji i rozmiar</target>
 
-<source> Two way </source>
-<target> Obustronna </target>
+<source>Two way</source>
+<target>Obustronna</target>
 
 <source>Mirror</source>
-<target>Lustrzana </target>
+<target>Lustrzana</target>
 
 <source>Update</source>
-<target>Uaktualnij </target>
+<target>Uaktualnij</target>
 
 <source>Custom</source>
 <target>Własne</target>
@@ -474,11 +513,8 @@ Komenda jest wykonywana gdy:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Te elementy znajdują się w konflikcie, którego nie można rozwiązać. Pliki nie zostaną zsynchronizowane:</target>
 
-<source>Significant difference detected:</source>
-<target>Wykryto znaczące zmiany:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Ponad 50% plików zostanie skopiowanych lub usuniętych.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Poniższe katalogi znacznie się różnią. Upewnij się, że określone zostały prawiłowe katalogi.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Brak wystarczającej przestrzeni dyskowej na:</target>
@@ -498,12 +534,15 @@ Komenda jest wykonywana gdy:
 <source>Generating database...</source>
 <target>Generowanie bazy danych...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
+<source>Creating a Volume Shadow Copy for %x...</source>
 <target>Tworzenie Volume Shadow Copy dla %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Nastąpił błąd weryfikacji: %x oraz %y różnią się zawartością.</target>
 
+<source>job name</source>
+<target>nazwa zadania</target>
+
 <source>Synchronization aborted</source>
 <target>Synchronizacja przerwana</target>
 
@@ -528,6 +567,9 @@ Komenda jest wykonywana gdy:
 <source>Switching to FreeFileSync main dialog</source>
 <target>Przełączanie do głównego okna FreeFileSync</target>
 
+<source>Retrying operation after error:</source>
+<target>Ponawianie czynności po błędzie:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Dostępna jest nowa wersja FreeFileSync:</target>
 
@@ -651,8 +693,8 @@ Komenda jest wykonywana gdy:
 <source>&Export file list...</source>
 <target>&Eksportuj listę plików...</target>
 
-<source>&Global settings...</source>
-<target>&Ustawienia programu...</target>
+<source>&Global settings</source>
+<target>&Ustawienia programu</target>
 
 <source>&Tools</source>
 <target>&Narzędzia</target>
@@ -669,12 +711,6 @@ Komenda jest wykonywana gdy:
 <source>Compare</source>
 <target>Porównaj</target>
 
-<source>Comparison settings</source>
-<target>Ustawienia porównywania</target>
-
-<source>Synchronization settings</source>
-<target>Ustawienia synchronizacji</target>
-
 <source>Synchronize</source>
 <target>Synchronizuj</target>
 
@@ -687,6 +723,12 @@ Komenda jest wykonywana gdy:
 <source>Swap sides</source>
 <target>Zamień stronami</target>
 
+<source>Find what:</source>
+<target>Co:</target>
+
+<source>Match case</source>
+<target>Uwzględnij wielkość liter</target>
+
 <source>Save as batch job</source>
 <target>Zapisz w trybie wsadowym</target>
 
@@ -723,6 +765,9 @@ Komenda jest wykonywana gdy:
 <source>Synchronizing...</source>
 <target>Synchronizuję...</target>
 
+<source>Minimize to notification area</source>
+<target>Minimalizuj do obszaru powiadomiń</target>
+
 <source>On completion</source>
 <target>Po zakończeniu</target>
 
@@ -732,6 +777,15 @@ Komenda jest wykonywana gdy:
 <source>&Pause</source>
 <target>&Pauza</target>
 
+<source>Variant</source>
+<target>Wariant</target>
+
+<source>Statistics</source>
+<target>Statystyki</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Nie pokazuj więcej tego okna</target>
+
 <source>Select a variant</source>
 <target>Określ wariant</target>
 
@@ -780,6 +834,12 @@ jest identyczna
 <source>Configure your own synchronization rules.</source>
 <target>Skonfiguruj swoje własne reguły synchronizacji.</target>
 
+<source>Detect moved files</source>
+<target>Wykryj przeniesione pliki.</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Wymaga plików bazy danych. Nie wspierane przez wszystkie systemy plików.</target>
+
 <source>Error handling</source>
 <target>Obsługa błędów</target>
 
@@ -804,17 +864,17 @@ jest identyczna
 <source>Delete or overwrite files permanently</source>
 <target>Usuń lub nadpisz pliki na stałe</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Kosz</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Użyj Kosza dla plików usuwanych i nadpisywanych</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Przechowuj pliki, które zostały usunięte lub nadpisane w koszu.</target>
 
 <source>Versioning</source>
 <target>Wersjonowanie</target>
 
-<source>Move files to user-defined folder</source>
-<target>Przenieś pliki do katalogu wskazanego przez użytkownika</target>
+<source>Move files to a user-defined folder</source>
+<target>Przenieś pliki do katalogu zdefiniowanego przez użytkownika</target>
 
 <source>Naming convention:</source>
 <target>Konwencja nazewnictwa:</target>
@@ -822,8 +882,8 @@ jest identyczna
 <source>Batch job</source>
 <target>Plik wsadowy</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 Twoim systemie: FreeFileSync.exe <nazwa_pliku>.ffs_batch</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Utwórz plik wsadowy do zautomatyzowania procesu synchronizacji. Aby rozpocząć, klknij dwa razy plik lub zaplanuj zadanie w: %x</target>
 
 <source>Exit</source>
 <target>Wyjście</target>
@@ -846,30 +906,6 @@ jest identyczna
 <source>Limit maximum number of log files</source>
 <target>Określ maksymalną liczbę plików z logami</target>
 
-<source>Source code written in C++ using:</source>
-<target>Kod stworzony w C++ z wykorzystaniem:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Podoba Ci się FreeFileSync?</target>
-
-<source>Donate with PayPal</source>
-<target>Wesprzyj z PayPal</target>
-
-<source>Many thanks for localization:</source>
-<target>Podziękowania za tłumaczenia:</target>
-
-<source>Feedback and suggestions are welcome</source>
-<target>Wszelkie opinie i sugestie mile widziane</target>
-
-<source>Homepage</source>
-<target>Strona domowa</target>
-
-<source>Email</source>
-<target>Poczta</target>
-
-<source>Published under the GNU General Public License</source>
-<target>Udostępnione na zasadach licencji GNU General Public License</target>
-
 <source>Delete on both sides</source>
 <target>Usuń po obu stronach</target>
 
@@ -877,12 +913,12 @@ jest identyczna
 <target>Usuń po obu stronach nawet jeżeli plik zaznaczony jest tylko po jednej stronie</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Tylko pliki pasujące do wszystkich filtrów będą synchronizowane.
-Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowego.
+Pliki zostaną zsynchronizowane tylko w przypadku przejścia przez wszystkie regóły filtra.
+Uwaga: Ścieżki plików muszą być względne do katalogów bazowych.
 </target>
 
 <source>Include</source>
@@ -912,20 +948,20 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Aby zagwarantować spójność synchronizacji nawet podczas błędu, program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp) po czym zmienia nazwę pliku na docelową.</target>
 
 <source>Copy locked files</source>
 <target>Kopiuj zablokowane pliki</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Kopiuj udostępnione lub zablokowane pliki używając usługi Volume Shadow Copy (Wymaga uprawnień administratora)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Kopiuj współdzielone lub zablokowane pliki używając Volume Shadow Copy Service (wymaga uprawnień administratora)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopiuj uprawnienia plików</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Kopiuj uprawnienia plików i katalogów (Wymaga uprawnień Administratora)</target>
+<source>Transfer file and folder permissions (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>
@@ -939,35 +975,44 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>&Default</source>
 <target>&Domyślne</target>
 
-<source>Variant</source>
-<target>Wariant</target>
+<source>Source code written in C++ using:</source>
+<target>Kod stworzony w C++ z wykorzystaniem:</target>
 
-<source>Statistics</source>
-<target>Statystyki</target>
+<source>If you like FreeFileSync</source>
+<target>Podoba Ci się FreeFileSync?</target>
 
-<source>Don't show this dialog again</source>
-<target>Nie pokazuj więcej tego okna</target>
+<source>Donate with PayPal</source>
+<target>Wesprzyj z PayPal</target>
 
-<source>Find what:</source>
-<target>Co:</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Wszelkie opinie i sugestie mile widziane</target>
 
-<source>Match case</source>
-<target>Uwzględnij wielkość liter</target>
+<source>Homepage</source>
+<target>Strona domowa</target>
 
-<source>&Find next</source>
-<target>&Znajdź następny</target>
+<source>Email</source>
+<target>Poczta</target>
 
-<source>Delete</source>
-<target>Usuń</target>
+<source>Published under the GNU General Public License</source>
+<target>Udostępnione na zasadach licencji GNU General Public License</target>
 
-<source>Configure filter</source>
-<target>Konfiguruj filtr</target>
+<source>Many thanks for localization:</source>
+<target>Podziękowania za tłumaczenia:</target>
 
 <source>Start synchronization</source>
 <target>Rozpocznij synchronizację</target>
 
-<source>Find</source>
-<target>Znajdź</target>
+<source>Comparison settings</source>
+<target>Ustawienia porównywania</target>
+
+<source>Synchronization settings</source>
+<target>Ustawienia synchronizacji</target>
+
+<source>Delete</source>
+<target>Usuń</target>
+
+<source>Configure filter</source>
+<target>Konfiguruj filtr</target>
 
 <source>Select time span</source>
 <target>Określ przedział czasowy</target>
@@ -975,6 +1020,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Folder pairs</source>
 <target>Pary folderów</target>
 
+<source>Find</source>
+<target>Znajdź</target>
+
 <source>Overview</source>
 <target>Przegląd</target>
 
@@ -1000,6 +1048,22 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <target>Porównaj foldery</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Czy na pewno chcesz wykonać polecenie %y dla 1 elementu?</pluralform>
+<pluralform>Czy na pewno chcesz wykonać polecenie %y dla %x elementów?</pluralform>
+<pluralform>Czy na pewno chcesz wykonać polecenie %y dla %x elementów?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Potwierdź</target>
+
+<source>&Execute</source>
+<target>&Wykonaj</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1032,17 +1096,20 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Set direction:</source>
 <target>Kierunek  synchronizacji:</target>
 
-<source>Exclude temporarily</source>
-<target>Wyklucz tymczasowo</target>
+<source>multiple selection</source>
+<target>zaznaczone elementy</target>
 
-<source>Include temporarily</source>
-<target>Dołącz tymczasowo</target>
+<source>Include via filter:</source>
+<target>Dodaj pliki:</target>
 
 <source>Exclude via filter:</source>
 <target>Dodaj filtr:</target>
 
-<source>multiple selection</source>
-<target>zaznaczone elementy</target>
+<source>Exclude temporarily</source>
+<target>Wyklucz tymczasowo</target>
+
+<source>Include temporarily</source>
+<target>Dołącz tymczasowo</target>
 
 <source>Include all</source>
 <target>Zaznacz wszystko</target>
@@ -1089,8 +1156,8 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Do&n't save</source>
 <target>&Nie zapisuj</target>
 
-<source>Never save changes</source>
-<target>Nigdy nie zapisuj zmian</target>
+<source>Never save &changes</source>
+<target>Nigdy nie zapisuj &zmian</target>
 
 <source>Show files that exist on left side only</source>
 <target>Pokaż pliki istniejące tylko po lewej stronie</target>
@@ -1143,8 +1210,11 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>All folders are in sync</source>
 <target>Wszystkie katalogi są zsynchronizowane</target>
 
-<source>Comma separated list</source>
-<target>Lista oddzielona przecinkami</target>
+<source>Cannot find %x</source>
+<target>Nie można znaleźć %x</target>
+
+<source>Comma-separated values</source>
+<target>Wartości rozdzielone przecinkiem</target>
 
 <source>File list exported</source>
 <target>Lista plików wyeksportowana</target>
@@ -1152,8 +1222,8 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Searching for program updates...</source>
 <target>Wyszukiwanie aktualizacji...</target>
 
-<source>Ignore further errors</source>
-<target>Ignoruj kolejne błędy</target>
+<source>&Ignore subsequent errors</source>
+<target>&Ignoruj kolejne błędy</target>
 
 <source>&Ignore</source>
 <target>&Ignoruj</target>
@@ -1161,8 +1231,8 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Fatal Error</source>
 <target>Błąd krytyczny</target>
 
-<source>Don't show this warning again</source>
-<target>Nie pokazuj więcej tego ostrzeżenia</target>
+<source>&Don't show this warning again</source>
+<target>&Nie pokazuj ponownie tego ostrzeżenia</target>
 
 <source>&Switch</source>
 <target>&Zamień</target>
@@ -1197,17 +1267,11 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Completed</source>
 <target>Zakończono</target>
 
-<source>Continue</source>
-<target>Kontynuuj</target>
-
-<source>Pause</source>
-<target>Pauza</target>
+<source>&Continue</source>
+<target>&Kontynuuj</target>
 
-<source>Logging</source>
-<target>Tworzenie logów</target>
-
-<source>Cannot find %x</source>
-<target>Nie można znaleźć %x</target>
+<source>Log</source>
+<target>Log</target>
 
 <source>Inactive</source>
 <target>Nieaktywny</target>
@@ -1240,13 +1304,13 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <target>Filtr</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>Czy na pewno chcesz przenieść do kosza następujący element?</pluralform>
-<pluralform>Czy na pewno chcesz przenieść do kosza %x następujące elementy?</pluralform>
-<pluralform>Czy na pewno chcesz przenieść do kosza %x następujących elementów?</pluralform>
+<pluralform>Czy na pewno chcesz przenieść ten element do kosza?</pluralform>
+<pluralform>Czy na pewno chcesz przenieść te %x elementy do kosza?</pluralform>
+<pluralform>Czy na pewno chcesz przenieść te %x elemntów do kosza?</pluralform>
 </target>
 
 <source>
@@ -1301,9 +1365,6 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Append a timestamp to each file name</source>
 <target>Dołącz znacznik czasu do nazwy każdego pliku</target>
 
-<source>Folder</source>
-<target>Katalog</target>
-
 <source>File</source>
 <target>Plik</target>
 
@@ -1427,7 +1488,7 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Cannot change process I/O priorities.</source>
 <target>Nie można zmienić priorytetu I/O procesu.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
+<source>Unable to move %x to the recycle bin.</source>
 <target>Nie można przenieść %x do kosza.</target>
 
 <source>Cannot determine final path for %x.</source>
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index e7529706..5557ada4 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -7,9 +7,6 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
-<source>Retrying operation after error:</source>
-<target></target>
-
 <source>Both sides have changed since last synchronization.</source>
 <target>Ambos os lados tiveram alterações desde a última sincronização.</target>
 
@@ -28,14 +25,14 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>A verificar a disponibilidade da reciclagem para a pasta %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>Mover ficheiro %x para a Reciclagem</target>
+<source>Moving file %x to the recycle bin</source>
+<target>Mover ficheiro %x para a reciclagem</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>Mover pasta %x para a Reciclagem</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>Mover pasta %x para a reciclagem</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Mover link simbólico %x para a Reciclagem</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>Mover link simbólico %x para a reciclagem</target>
 
 <source>Deleting file %x</source>
 <target>Eliminar ficheiro %x</target>
@@ -46,14 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>Eliminar link simbólico %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>A Reciclagem não está disponível para as seguintes pastas. Os ficheiros serão eliminados permanentemente:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>A reciclagem não está disponível para as seguintes pastas. Os ficheiros serão, em alternativa, eliminados permanentemente:</target>
 
 <source>An exception occurred</source>
 <target>Ocorreu uma excepção</target>
 
-<source>Cannot find file %x.</source>
-<target>Não é possível encontrar o ficheiro %x.</target>
+<source>A directory path is expected after %x.</source>
+<target>É esperado um caminho de directório após %x.</target>
+
+<source>Syntax error</source>
+<target>Erro de sintaxe</target>
+
+<source>Cannot open file %x.</source>
+<target>Não é possível abrir o ficheiro %x.</target>
 
 <source>Error</source>
 <target>Erro</target>
@@ -61,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>Ficheiro %x não tem uma configuração válida.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Número desigual de directórios à esquerda e à direita.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>O ficheiro de configuração não deve conter configurações ao nível de par-directório quando os directórios são definidos pela linha de comandos.</target>
+
+<source>Warning</source>
+<target>Atenção</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Os directórios não podem ser definidos em mais do que um ficheiro de configuração.</target>
+
+<source>Syntax:</source>
+<target>Sintaxe:</target>
+
+<source>config files</source>
+<target>ficheiros de configuração</target>
+
+<source>directory</source>
+<target>directório</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Qualquer número de ficheiros de configuração .ffs_gui e/ou .ffs_batch do FreeFileSync.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Qualquer número de directórios alternativos para apenas um ficheiro de configuração.</target>
+
+<source>Command line</source>
+<target>Linha de comandos</target>
+
 <source>A folder input field is empty.</source>
 <target>Um dos campos de directório para comparar está vazio.</target>
 
@@ -218,12 +251,12 @@
 <target>Tempo total:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -245,12 +278,12 @@
 <target>A pesquisar:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -259,6 +292,9 @@
 <source>/sec</source>
 <target>/seg</target>
 
+<source>%x items</source>
+<target>%x itens</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Ficheiro de configuração %x carregado parcialmente.</target>
 
@@ -271,7 +307,7 @@
 <source>Browse directory</source>
 <target>Procurar directório</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
+<source>Cannot access the Volume Shadow Copy Service.</source>
 <target>Não é possível aceder ao serviço Volume Shadow Copy.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
@@ -283,8 +319,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Não é possível determinar o nome do volume para %x.</target>
 
-<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>Volume name %x is not part of file path %y.</source>
+<target>Nome de volume %x não faz parte do caminho do ficheiro %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Abortar pedido: À espera do fim da operação atual...</target>
@@ -352,9 +388,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Tempo de espera entre a última alteração detetada e a execução do comando</target>
 
-<source>Command line</source>
-<target>Linha de comandos</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -378,9 +411,6 @@ O comando é executado se:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronização Automatizada</target>
 
-<source>Warning</source>
-<target>Atenção</target>
-
 <source>Build: %x</source>
 <target>Build: %x</target>
 
@@ -390,15 +420,21 @@ O comando é executado se:
 <source>All files</source>
 <target>Todos os ficheiros</target>
 
+<source>Directory monitoring active</source>
+<target>Monitorização de directório activa</target>
+
+<source>Waiting until all directories are available...</source>
+<target>A aguardar que todos os directórios fiquem disponíveis...</target>
+
 <source>&Restore</source>
 <target>&Restaurar</target>
 
+<source>&Show error</source>
+<target>Mostrar &erro</target>
+
 <source>&Exit</source>
 <target>&Sair</target>
 
-<source>Waiting for missing directories...</source>
-<target>A aguardar pelos directórios em falta...</target>
-
 <source>Invalid command line:</source>
 <target>Linha de comando inválida:</target>
 
@@ -408,14 +444,14 @@ O comando é executado se:
 <source>File time and size</source>
 <target>Data e tamanho do ficheiro</target>
 
-<source> Two way </source>
-<target> Duas vias </target>
+<source>Two way</source>
+<target>Duas vias</target>
 
 <source>Mirror</source>
-<target>Espelhar </target>
+<target>Espelhar</target>
 
 <source>Update</source>
-<target>Actualizar </target>
+<target>Actualizar</target>
 
 <source>Custom</source>
 <target>Personalizado</target>
@@ -471,11 +507,8 @@ O comando é executado se:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Os seguintes itens têm conflitos não resolvidos, e não serão sincronizados:</target>
 
-<source>Significant difference detected:</source>
-<target>Diferença significativa detectada:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Mais de 50% dos ficheiros vai ser copiado ou apagado.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>As seguintes pastas são significativamente diferentes. Verifique se está a usar as pastas correctas na sincronização.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Não há espaço livre suficiente em:</target>
@@ -495,12 +528,15 @@ O comando é executado se:
 <source>Generating database...</source>
 <target>A gerar base de dados...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
+<source>Creating a Volume Shadow Copy for %x...</source>
 <target>A criar Volume Shadow Copy para %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Erro de verificação de dados: %x e %y têm conteúdo diferente.</target>
 
+<source>job name</source>
+<target>nome da tarefa</target>
+
 <source>Synchronization aborted</source>
 <target>Sincronização abortada</target>
 
@@ -525,6 +561,9 @@ O comando é executado se:
 <source>Switching to FreeFileSync main dialog</source>
 <target>A mudar para o diálogo principal do FreeFileSync</target>
 
+<source>Retrying operation after error:</source>
+<target>A tentar novamente a operação após erro:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Uma nova versão do FreeFileSync está disponível:</target>
 
@@ -648,8 +687,8 @@ O comando é executado se:
 <source>&Export file list...</source>
 <target>&Exportar lista de ficheiros...</target>
 
-<source>&Global settings...</source>
-<target>&Opções...</target>
+<source>&Global settings</source>
+<target>&Opções</target>
 
 <source>&Tools</source>
 <target>&Ferramentas</target>
@@ -720,6 +759,9 @@ O comando é executado se:
 <source>Synchronizing...</source>
 <target>A sincronizar...</target>
 
+<source>Minimize to notification area</source>
+<target>Minimizar para a área de notificação</target>
+
 <source>On completion</source>
 <target>Ao terminar</target>
 
@@ -729,6 +771,15 @@ O comando é executado se:
 <source>&Pause</source>
 <target>&Pausa</target>
 
+<source>Variant</source>
+<target>Variável</target>
+
+<source>Statistics</source>
+<target>Estatísticas</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Não mostrar este diálogo novamente</target>
+
 <source>Select a variant</source>
 <target>Seleccione uma variante</target>
 
@@ -776,6 +827,12 @@ Os ficheiros são considerados iguais se
 <source>Configure your own synchronization rules.</source>
 <target>Configure as suas regras de sincronização.</target>
 
+<source>Detect moved files</source>
+<target>Detectar ficheiros movidos</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Requer base de dados. Não é suportado por todos os sistemas de ficheiros.</target>
+
 <source>Error handling</source>
 <target>Controlador de erros</target>
 
@@ -800,17 +857,17 @@ Os ficheiros são considerados iguais se
 <source>Delete or overwrite files permanently</source>
 <target>Apagar ou substituir ficheiros permanentemente</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Reciclagem</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Usar Reciclagem para ficheiros eliminados ou substituidos</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Fazer backup dos ficheiros apagados e substituidos na reciclagem</target>
 
 <source>Versioning</source>
 <target>Manter versões anteriores</target>
 
-<source>Move files to user-defined folder</source>
-<target>Mover ficheiros para directório definido pelo utilizador</target>
+<source>Move files to a user-defined folder</source>
+<target>Mover ficheiros para uma pasta definida pelo utilizador</target>
 
 <source>Naming convention:</source>
 <target>Convenção de nomes:</target>
@@ -818,8 +875,8 @@ Os ficheiros são considerados iguais se
 <source>Batch job</source>
 <target>Ficheiro 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>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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Criar ficheiro batch para sincronização automática. Para iniciar, fazer duplo clique no ficheiro ou acrescentar ao planeador de tarefas: %x</target>
 
 <source>Exit</source>
 <target>Sair</target>
@@ -873,12 +930,12 @@ Os ficheiros são considerados iguais se
 <target>Eliminar em ambos os lados mesmo se o ficheiro só está seleccionado num lado</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Apenas ficheiros que condigam com todos os filtros serão sincronizados.
-Nota: Nome dos ficheiros tem que ser relativo aos diretórios base.
+Os ficheiros só serão sincronizados se passarem todos os filtros.
+Nota: O caminho dos ficheiros deve ser relativo ao directório raiz.
 </target>
 
 <source>Include</source>
@@ -908,20 +965,20 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Copiar para um ficheiro temporário (*.ffs_tmp) e depois renomear. Isto garante consistência mesmo em caso de erro fatal.</target>
 
 <source>Copy locked files</source>
 <target>Copiar ficheiros bloqueados</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Copiar ficheiros partilhados ou bloqueados usando o serviço Volume Shadow Copy (Requer direitos de administrador)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Copiar ficheiros partilhados ou bloqueados usando o serviço Volume Shadow Copy(necessita direitos de administrador)</target>
 
 <source>Copy file access permissions</source>
 <target>Copiar permissões de acesso do ficheiro</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Transferir ficheiro e permissões (precisa de direitos de Administrador)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Transferir permissões de ficheiros e pastas (necessita direitos de administrador)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Restaurar diálogos escondidos</target>
@@ -935,15 +992,6 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base.
 <source>&Default</source>
 <target>&Config. Iniciais</target>
 
-<source>Variant</source>
-<target>Variável</target>
-
-<source>Statistics</source>
-<target>Estatísticas</target>
-
-<source>Don't show this dialog again</source>
-<target>Não mostrar este diálogo novamente</target>
-
 <source>Find what:</source>
 <target>Procurar:</target>
 
@@ -953,15 +1001,15 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base.
 <source>&Find next</source>
 <target>&Procurar seguinte</target>
 
+<source>Start synchronization</source>
+<target>Iniciar a sincronização</target>
+
 <source>Delete</source>
 <target>Eliminar</target>
 
 <source>Configure filter</source>
 <target>Configurar filtros</target>
 
-<source>Start synchronization</source>
-<target>Iniciar a sincronização</target>
-
 <source>Find</source>
 <target>Procurar</target>
 
@@ -996,6 +1044,21 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base.
 <target>Comparar listas</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Deseja mesmo executar o comando %y para 1 item?</pluralform>
+<pluralform>Deseja mesmo executar o comando %y para %x itens?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Confirmar</target>
+
+<source>&Execute</source>
+<target>&Executar</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1031,12 +1094,15 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base.
 <source>Include temporarily</source>
 <target>Incluir temporariamente</target>
 
-<source>Exclude via filter:</source>
-<target>Excluir por filtro:</target>
-
 <source>multiple selection</source>
 <target>seleção múltipla</target>
 
+<source>Include via filter:</source>
+<target>Incluir via filtro:</target>
+
+<source>Exclude via filter:</source>
+<target>Excluir por filtro:</target>
+
 <source>Include all</source>
 <target>Incluir tudo</target>
 
@@ -1082,8 +1148,8 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base.
 <source>Do&n't save</source>
 <target>Não g&uardar</target>
 
-<source>Never save changes</source>
-<target>Nunca guardar alterações</target>
+<source>Never save &changes</source>
+<target>Nunca guardar &alterações</target>
 
 <source>Show files that exist on left side only</source>
 <target>Mostrar ficheiros existentes somente à esquerda</target>
@@ -1136,8 +1202,8 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base.
 <source>All folders are in sync</source>
 <target>Todas as pastas estão sincronizadas</target>
 
-<source>Comma separated list</source>
-<target>Lista de itens separados por vírgulas</target>
+<source>Comma-separated values</source>
+<target>Valores separados por virgula</target>
 
 <source>File list exported</source>
 <target>Lista dos ficheiros exportada</target>
@@ -1145,8 +1211,8 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base.
 <source>Searching for program updates...</source>
 <target>A procurar actualizações do programa...</target>
 
-<source>Ignore further errors</source>
-<target>Ignorar próximos erros</target>
+<source>&Ignore subsequent errors</source>
+<target>&Ignorar erros subsequentes</target>
 
 <source>&Ignore</source>
 <target>&Ignorar</target>
@@ -1154,8 +1220,8 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base.
 <source>Fatal Error</source>
 <target>Erro crítico</target>
 
-<source>Don't show this warning again</source>
-<target>Não mostrar este aviso novamente</target>
+<source>&Don't show this warning again</source>
+<target>&Não mostrar este aviso novamente</target>
 
 <source>&Switch</source>
 <target>&Trocar</target>
@@ -1190,14 +1256,11 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base.
 <source>Completed</source>
 <target>Terminado</target>
 
-<source>Continue</source>
-<target>Continuar</target>
+<source>&Continue</source>
+<target>&Continuar</target>
 
-<source>Pause</source>
-<target>Pausa</target>
-
-<source>Logging</source>
-<target>A escrever em log</target>
+<source>Log</source>
+<target>Registo</target>
 
 <source>Cannot find %x</source>
 <target>Não é possível descobrir %x</target>
@@ -1233,12 +1296,12 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base.
 <target>Filtro</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>Deseja mesmo mover o seguinte item para a Reciclagem?</pluralform>
-<pluralform>Deseja mesmo mover os seguintes %x itens para a Reciclagem?</pluralform>
+<pluralform>Deseja mesmo mover o seguinte item para a reciclagem?</pluralform>
+<pluralform>Deseja mesmo mover os seguintes %x itens para a reciclagem?</pluralform>
 </target>
 
 <source>
@@ -1292,9 +1355,6 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base.
 <source>Append a timestamp to each file name</source>
 <target>Juntar selo temporal a cada nome de ficheiro</target>
 
-<source>Folder</source>
-<target>Pasta</target>
-
 <source>File</source>
 <target>Ficheiro</target>
 
@@ -1415,8 +1475,8 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base.
 <source>Cannot change process I/O priorities.</source>
 <target>Não é possível alterar as prioridades de E / S do processo.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Não é possível mover %x para a Reciclagem.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>Não é possível mover %x para a reciclagem.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>Não é possível determinar o caminho final de %x.</target>
diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng
index a4d44140..1c503315 100644
--- a/BUILD/Languages/portuguese_br.lng
+++ b/BUILD/Languages/portuguese_br.lng
@@ -25,14 +25,14 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Verificando a disponibilidade da lixeira para a pasta %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>Movendo arquivo %x para a lixeira</target>
+<source>Moving file %x to the recycle bin</source>
+<target>Movendo arquivo %x para a Lixeira</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>Movendo pasta %x para a lixeira</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>Movendo pasta %x para a Lixeira</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Movendo link simbólico %x para a lixeira</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>Movendo link simbólico %x para a Lixeira</target>
 
 <source>Deleting file %x</source>
 <target>Apagando arquivo %x</target>
@@ -43,14 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>Apagando link simbólico %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
 <target>A Lixeira não está disponível para as seguintes pastas. Os arquivos serão apagados permanentemente:</target>
 
 <source>An exception occurred</source>
 <target>Ocorreu uma exceção</target>
 
-<source>Cannot find file %x.</source>
-<target>Não foi possível localizar o aquivo %x.</target>
+<source>A directory path is expected after %x.</source>
+<target>Um caminho de diretório é esperado após %x.</target>
+
+<source>Syntax error</source>
+<target>Erro de sintaxe</target>
+
+<source>Cannot open file %x.</source>
+<target>Não foi possível abrir o arquivo %x.</target>
 
 <source>Error</source>
 <target>Erro</target>
@@ -58,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>O arquivo %x não contém uma configuração válida.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Número de diretórios especificados na esquerda e na direita são diferentes.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>O arquivo de configuração não deve conter configurações de diretórios quando os diretórios são definidos via linha de comando.</target>
+
+<source>Warning</source>
+<target>Avisos</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Os diretórios não podem ser definidos para mais de um arquivo de configuração.</target>
+
+<source>Syntax:</source>
+<target>Sintaxe:</target>
+
+<source>config files</source>
+<target>arquivos de configuração</target>
+
+<source>directory</source>
+<target>diretório</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Qualquer número de arquivos FreeFileSync .ffs e/ou de tarefa em lote .ffs_batch.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Qualquer número de alternativas de diretórios para pelo menos um arquivo de configuração.</target>
+
+<source>Command line</source>
+<target>Linha de comando</target>
+
 <source>A folder input field is empty.</source>
 <target>Um campo de entrada de pasta está vazio.</target>
 
@@ -215,12 +251,12 @@
 <target>Tempo total:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -242,12 +278,12 @@
 <target>Pesquisando:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -256,6 +292,9 @@
 <source>/sec</source>
 <target>/seg</target>
 
+<source>%x items</source>
+<target>%x itens</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>O arquivo de configuração %x foi carregado parcialmente.</target>
 
@@ -268,8 +307,8 @@
 <source>Browse directory</source>
 <target>Procurar diretório</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>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Não foi possível acessar o Serviço de Cópia de Sombra de Volume.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Por favor, utilize a versão 64 bits do FreeFileSync para criar cópias de sombra neste sistema.</target>
@@ -280,8 +319,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Não foi possível determinar o nome do volume para %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Nome do volume %x não é parte do arquivo %y.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>O nome do volume %x não faz parte do caminho do arquivo %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Cancelar solicitado: Esperando fim da operação...</target>
@@ -349,9 +388,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Tempo de espera entre última mudança detectada e execução do comando</target>
 
-<source>Command line</source>
-<target>Linha de comando</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -375,9 +411,6 @@ O comando é disparado se:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronização Automatizada</target>
 
-<source>Warning</source>
-<target>Avisos</target>
-
 <source>Build: %x</source>
 <target>Versão: %x</target>
 
@@ -387,15 +420,21 @@ O comando é disparado se:
 <source>All files</source>
 <target>Todos os arquivos</target>
 
+<source>Directory monitoring active</source>
+<target>Monitoramento de diretórios ativado</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Aguardando até todos os diretórios estarem disponíveis...</target>
+
 <source>&Restore</source>
 <target>&Restaurar</target>
 
+<source>&Show error</source>
+<target>&Mostrar erro</target>
+
 <source>&Exit</source>
 <target>&Sair</target>
 
-<source>Waiting for missing directories...</source>
-<target>Esperando por diretórios faltantes...</target>
-
 <source>Invalid command line:</source>
 <target>Linha de comando inválida:</target>
 
@@ -405,14 +444,14 @@ O comando é disparado se:
 <source>File time and size</source>
 <target>Data e tamanho do arquivo</target>
 
-<source> Two way </source>
-<target> Dois sentidos </target>
+<source>Two way</source>
+<target>Dois sentidos</target>
 
 <source>Mirror</source>
-<target>Espelhar </target>
+<target>Espelhar</target>
 
 <source>Update</source>
-<target>Atualizar </target>
+<target>Atualizar</target>
 
 <source>Custom</source>
 <target>Personalizado</target>
@@ -468,11 +507,8 @@ O comando é disparado se:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Os seguintes itens possuem conflitos não resolvidos e não serão sincronizados:</target>
 
-<source>Significant difference detected:</source>
-<target>Diferença significativa detectada:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Mais de 50% do número total de arquivos será copiado ou apagado.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>As seguintes pastas são significativamente diferentes. Tenha certeza que está comparando as pastas corretas para sincronização.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Espaço em disco insuficiente em:</target>
@@ -492,12 +528,15 @@ O comando é disparado se:
 <source>Generating database...</source>
 <target>Gerando banco de dados...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Criando Cópia de Sombra de Volume para %x...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Criando uma Cópia de Sombra de Volume para %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Erro na verificação dos dados: %x e %y têm conteúdo diferente.</target>
 
+<source>job name</source>
+<target>nome da tarefa</target>
+
 <source>Synchronization aborted</source>
 <target>Sincronização cancelada</target>
 
@@ -522,6 +561,9 @@ O comando é disparado se:
 <source>Switching to FreeFileSync main dialog</source>
 <target>Mudando para a caixa de diálogo principal do FreeFileSync</target>
 
+<source>Retrying operation after error:</source>
+<target>Tentando operação novamente após erro:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Uma nova versão do FreeFileSync está disponível:</target>
 
@@ -645,8 +687,8 @@ O comando é disparado se:
 <source>&Export file list...</source>
 <target>&Exportar lista de arquivos...</target>
 
-<source>&Global settings...</source>
-<target>&Configurações...</target>
+<source>&Global settings</source>
+<target>&Configurações</target>
 
 <source>&Tools</source>
 <target>&Ferramentas</target>
@@ -663,12 +705,6 @@ O comando é disparado se:
 <source>Compare</source>
 <target>Comparar</target>
 
-<source>Comparison settings</source>
-<target>Parâmetros de comparação</target>
-
-<source>Synchronization settings</source>
-<target>Parâmetros de sincronização</target>
-
 <source>Synchronize</source>
 <target>Sincronizar</target>
 
@@ -717,6 +753,9 @@ O comando é disparado se:
 <source>Synchronizing...</source>
 <target>Sincronizando...</target>
 
+<source>Minimize to notification area</source>
+<target>Minimizar para a área de notificação</target>
+
 <source>On completion</source>
 <target>Ao finalizar</target>
 
@@ -726,6 +765,15 @@ O comando é disparado se:
 <source>&Pause</source>
 <target>&Pausar</target>
 
+<source>Variant</source>
+<target>Modo</target>
+
+<source>Statistics</source>
+<target>Estatísticas</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Não mostrar este diálogo novamente</target>
+
 <source>Select a variant</source>
 <target>Selecione uma variante</target>
 
@@ -769,11 +817,17 @@ Os arquivos são considerados iguais se
 <target>Cópia espelho da pasta da esquerda. A pasta da direita será modificada para ficar exatamente igual à pasta da esquerda após a sincronização.</target>
 
 <source>Copy new or updated files to right folder.</source>
-<target>Copia arquivos novos ou atualizados para a pasta da direita</target>
+<target>Copia arquivos novos ou atualizados para a pasta da direita.</target>
 
 <source>Configure your own synchronization rules.</source>
 <target>Configure as suas próprias regras de sincronização.</target>
 
+<source>Detect moved files</source>
+<target>Detectar arquivos movidos</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Requer um arquivo de banco de dados. Não é suportado por todos os sistemas de arquivos.</target>
+
 <source>Error handling</source>
 <target>Tratamento de erros</target>
 
@@ -793,21 +847,21 @@ Os arquivos são considerados iguais se
 <target>Tratamento da exclusão</target>
 
 <source>Permanent</source>
-<target>Permante</target>
+<target>Permanente</target>
 
 <source>Delete or overwrite files permanently</source>
-<target>Apaga ou substitui arquivos permanentemente</target>
+<target>Apaga ou substitui os arquivos permanentemente</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Lixeira</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Utiliza a Lixeira para arquivos apagados ou sobrescritos</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Faz uma cópia dos arquivos apagados ou substituídos na Lixeira</target>
 
 <source>Versioning</source>
 <target>Controle de versões</target>
 
-<source>Move files to user-defined folder</source>
+<source>Move files to a user-defined folder</source>
 <target>Move os arquivos para uma pasta definida pelo usuário</target>
 
 <source>Naming convention:</source>
@@ -816,8 +870,8 @@ Os arquivos são considerados iguais se
 <source>Batch job</source>
 <target>Tarefa em lote</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Cria um arquivo de tarefa em lote para sincronização desatendida. Para iniciar, dê um clique duplo neste arquivo ou agende no agendador de tarefas: %x</target>
 
 <source>Exit</source>
 <target>Sair</target>
@@ -840,30 +894,6 @@ Os arquivos são considerados iguais se
 <source>Limit maximum number of log files</source>
 <target>Limita número máximo de arquivos de log</target>
 
-<source>Source code written in C++ using:</source>
-<target>Código-fonte escrito em C++ utilizando:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Se você gosta do FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Doar usando PayPal</target>
-
-<source>Many thanks for localization:</source>
-<target>Pela tradução, um agradecimento a:</target>
-
-<source>Feedback and suggestions are welcome</source>
-<target>Críticas e sugestões são bem-vindas</target>
-
-<source>Homepage</source>
-<target>Homepage</target>
-
-<source>Email</source>
-<target>E-mail</target>
-
-<source>Published under the GNU General Public License</source>
-<target>Publicado sobre a GNU General Public License</target>
-
 <source>Delete on both sides</source>
 <target>Apagar em ambos os lados</target>
 
@@ -871,12 +901,12 @@ Os arquivos são considerados iguais se
 <target>Apaga em ambos os lados mesmo se o arquivo está selecionado só em um lado</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Apenas arquivos que correspondem a todas as configurações do filtro serão sincronizados.
-Nota: Os nomes dos arquivos devem ser relativos aos diretórios base.
+Os arquivos só serão sincronizados se passarem por todas as regras do filtro.
+Nota: os caminhos dos arquivos devem ser relativos aos diretórios base.
 </target>
 
 <source>Include</source>
@@ -906,20 +936,20 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base.
 <source>Fail-safe file copy</source>
 <target>Cópia de arquivos a 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>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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Copia primeiro para um arquivo temporário (*.ffs_tmp) e depois o renomeia. Isto garante um estado consistente mesmo em caso de erro fatal.</target>
 
 <source>Copy locked files</source>
 <target>Copiar arquivos bloqueados (em uso)</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Copia os arquivos compartilhados ou bloqueados (em uso) usando o Serviço de Cópia de Sombra de Volume (Requer direitos de Administrador)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Copia arquivos compartilhados ou bloqueados usando o Serviço de Cópia de Sombra de Volume (requer direitos de administrador.</target>
 
 <source>Copy file access permissions</source>
 <target>Copiar permissões de acesso aos arquivos</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>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Transfere permissões de arquivos e pastas (requer direitos de administrador).</target>
 
 <source>Restore hidden dialogs</source>
 <target>Restaurar diálogos ocultados</target>
@@ -933,15 +963,6 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base.
 <source>&Default</source>
 <target>&Config. Padrão</target>
 
-<source>Variant</source>
-<target>Modo</target>
-
-<source>Statistics</source>
-<target>Estatísticas</target>
-
-<source>Don't show this dialog again</source>
-<target>Não mostrar esta caixa de diálogo novamente</target>
-
 <source>Find what:</source>
 <target>Localizar o que:</target>
 
@@ -951,15 +972,45 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base.
 <source>&Find next</source>
 <target>&Localizar próxima</target>
 
+<source>Source code written in C++ using:</source>
+<target>Código-fonte escrito em C++ utilizando:</target>
+
+<source>If you like FreeFileSync</source>
+<target>Se você gosta do FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>Doar usando PayPal</target>
+
+<source>Feedback and suggestions are welcome</source>
+<target>Críticas e sugestões são bem-vindas</target>
+
+<source>Homepage</source>
+<target>Homepage</target>
+
+<source>Email</source>
+<target>E-mail</target>
+
+<source>Published under the GNU General Public License</source>
+<target>Publicado sobre a GNU General Public License</target>
+
+<source>Many thanks for localization:</source>
+<target>Pela tradução, um agradecimento a:</target>
+
+<source>Start synchronization</source>
+<target>Iniciar a sincronização</target>
+
+<source>Comparison settings</source>
+<target>Parâmetros de comparação</target>
+
+<source>Synchronization settings</source>
+<target>Parâmetros de sincronização</target>
+
 <source>Delete</source>
 <target>Apagar</target>
 
 <source>Configure filter</source>
 <target>Configurar filtros</target>
 
-<source>Start synchronization</source>
-<target>Iniciar a sincronização</target>
-
 <source>Find</source>
 <target>Localizar</target>
 
@@ -994,6 +1045,21 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base.
 <target>Comparar os dois lados</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Você realmente deseja executar o comando %y para 1 item?</pluralform>
+<pluralform>Você realmente deseja executar o comando %y para %x itens?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Confirmar</target>
+
+<source>&Execute</source>
+<target>&Executar</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1029,12 +1095,15 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base.
 <source>Include temporarily</source>
 <target>Incluir temporariamente</target>
 
-<source>Exclude via filter:</source>
-<target>Excluir via filtro:</target>
-
 <source>multiple selection</source>
 <target>seleção múltipla</target>
 
+<source>Include via filter:</source>
+<target>Incluir via filtro:</target>
+
+<source>Exclude via filter:</source>
+<target>Excluir via filtro:</target>
+
 <source>Include all</source>
 <target>Incluir todos</target>
 
@@ -1080,8 +1149,8 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base.
 <source>Do&n't save</source>
 <target>&Não salvar</target>
 
-<source>Never save changes</source>
-<target>Nunca salvar alterações</target>
+<source>Never save &changes</source>
+<target>Nunca salvar as &modificações</target>
 
 <source>Show files that exist on left side only</source>
 <target>Mostrar arquivos que existem somente à esquerda</target>
@@ -1134,8 +1203,8 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base.
 <source>All folders are in sync</source>
 <target>Todas as pastas estão sincronizadas</target>
 
-<source>Comma separated list</source>
-<target>Lista de itens separados por vírgulas</target>
+<source>Comma-separated values</source>
+<target>Valores separados por vírgula</target>
 
 <source>File list exported</source>
 <target>Lista de arquivos exportada</target>
@@ -1143,8 +1212,8 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base.
 <source>Searching for program updates...</source>
 <target>Procurando atualizações do programa...</target>
 
-<source>Ignore further errors</source>
-<target>Ignorar erros subsequentes</target>
+<source>&Ignore subsequent errors</source>
+<target>&Ignorar erros subsequentes</target>
 
 <source>&Ignore</source>
 <target>&Ignorar</target>
@@ -1152,8 +1221,8 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base.
 <source>Fatal Error</source>
 <target>Erro fatal</target>
 
-<source>Don't show this warning again</source>
-<target>Não mostrar este aviso novamente</target>
+<source>&Don't show this warning again</source>
+<target>&Não mostrar este aviso novamente</target>
 
 <source>&Switch</source>
 <target>&Alterar</target>
@@ -1188,14 +1257,11 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base.
 <source>Completed</source>
 <target>Finalizado</target>
 
-<source>Continue</source>
-<target>Continuar</target>
+<source>&Continue</source>
+<target>&Continuar</target>
 
-<source>Pause</source>
-<target>Pausar</target>
-
-<source>Logging</source>
-<target>Ver Log</target>
+<source>Log</source>
+<target>Log</target>
 
 <source>Cannot find %x</source>
 <target>Não foi possível localizar %x</target>
@@ -1231,8 +1297,8 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base.
 <target>Filtro</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
 <pluralform>Você realmente deseja mover o seguinte item para a Lixeira?</pluralform>
@@ -1290,9 +1356,6 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base.
 <source>Append a timestamp to each file name</source>
 <target>Atribuir uma estampa de tempo para cada nome de arquivo</target>
 
-<source>Folder</source>
-<target>Pasta</target>
-
 <source>File</source>
 <target>Arquivo</target>
 
@@ -1413,7 +1476,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base.
 <source>Cannot change process I/O priorities.</source>
 <target>Não foi possível mudar a prioridade de E/S do processo.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
+<source>Unable to move %x to the recycle bin.</source>
 <target>Não foi possível mover %x para a Lixeira.</target>
 
 <source>Cannot determine final path for %x.</source>
diff --git a/BUILD/Languages/romanian.lng b/BUILD/Languages/romanian.lng
index 1e4efa96..dd30e917 100644
--- a/BUILD/Languages/romanian.lng
+++ b/BUILD/Languages/romanian.lng
@@ -25,13 +25,13 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Verific dacă Reciclatorul e disponibil pentru dosarul %x...</target>
 
-<source>Moving file %x to recycle bin</source>
+<source>Moving file %x to the recycle bin</source>
 <target>Mut fila %x în Reciclator</target>
 
-<source>Moving folder %x to recycle bin</source>
+<source>Moving folder %x to the recycle bin</source>
 <target>Mut dosarul %x în Reciclator</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
+<source>Moving symbolic link %x to the recycle bin</source>
 <target>Mut legătura simbolică %x în Reciclator</target>
 
 <source>Deleting file %x</source>
@@ -43,14 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>Șterg legătura simbolică %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>Reciclatorul nu este disponibil pentru dosarele următoare. Filele șterse de acolo vor fi șterse în mod definitiv:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Reciclatorul nu este disponibil pentru dosarele următoare. Filele șterse de acolo vor dispărea în mod definitiv:</target>
 
 <source>An exception occurred</source>
 <target>A apărut o excepție</target>
 
-<source>Cannot find file %x.</source>
-<target>Nu pot găsi fila %x.</target>
+<source>A directory path is expected after %x.</source>
+<target>Este așteptată o cale de dosar după %x.</target>
+
+<source>Syntax error</source>
+<target>Eroare de sintaxă</target>
+
+<source>Cannot open file %x.</source>
+<target>Nu pot deschide fila %x.</target>
 
 <source>Error</source>
 <target>Eroare</target>
@@ -58,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>Fila %x nu conține o configurație validă.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Numărul de dosare specificat pentru părțile stîngă și dreaptă este inegal.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Fila de configurare nu trebuie să conțină setări la nivelul perechii de dosare, cînd dosarele sînt setate prin linia de comandă.</target>
+
+<source>Warning</source>
+<target>Atenție</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Dosarele nu pot fi setate pentru mai mult de o singură filă de configurare.</target>
+
+<source>Syntax:</source>
+<target>Sintaxă:</target>
+
+<source>config files</source>
+<target>file de configurare</target>
+
+<source>directory</source>
+<target>dosar</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Orice număr de file de configurare pentru FreeFileSync, de tipul .ffs_gui sau/și .ffs_batch.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Orice număr de dosare alternative pentru cel mult o filă de configurare.</target>
+
+<source>Command line</source>
+<target>Linie de comandă</target>
+
 <source>A folder input field is empty.</source>
 <target>Un cîmp de introducere a dosarului este gol.</target>
 
@@ -152,7 +188,7 @@
 <target>Suprascrie elementul drept cu cel stîng</target>
 
 <source>Do nothing</source>
-<target>Nici o Acțiune</target>
+<target>Nici o acțiune</target>
 
 <source>Update attributes on left</source>
 <target>Actualizează atributele în partea stîngă</target>
@@ -216,13 +252,13 @@
 <target>Timp Total:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>1 Bait</pluralform>
-<pluralform>%x Baiți</pluralform>
-<pluralform>%x de Baiți</pluralform>
+<pluralform>1 bait</pluralform>
+<pluralform>%x baiți</pluralform>
+<pluralform>%x de baiți</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -244,13 +280,13 @@
 <target>Scanez:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 Fir]</pluralform>
-<pluralform>[%x Fire]</pluralform>
-<pluralform>[%x de Fire]</pluralform>
+<pluralform>1 fir</pluralform>
+<pluralform>%x fire</pluralform>
+<pluralform>%x de fire</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -259,6 +295,9 @@
 <source>/sec</source>
 <target>/sec</target>
 
+<source>%x items</source>
+<target>%x itemuri</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Fila de configurație %x a fost deschisă doar parțial.</target>
 
@@ -271,7 +310,7 @@
 <source>Browse directory</source>
 <target>Explorează Dosarul</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
+<source>Cannot access the Volume Shadow Copy Service.</source>
 <target>Nu pot accesa Serviciul de Conservare a Volumelor [Volume Shadow Copy].</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
@@ -283,8 +322,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Nu pot determina numele volumului pentru %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Numele volumului %x nu face parte din numele filei %y.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>Numele volumului %x nu face parte din calea filei %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Abandonare solicitată: Se așteaptă terminarea operației în curs...</target>
@@ -352,9 +391,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Timpul de inactivitate între ultima schimbare detectată și executarea comenzii</target>
 
-<source>Command line</source>
-<target>Linie de comandă</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -378,9 +414,6 @@ Comanda este declanșată dacă:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronizare Inteligentă</target>
 
-<source>Warning</source>
-<target>Atenție</target>
-
 <source>Build: %x</source>
 <target>Compilația: %x</target>
 
@@ -390,15 +423,21 @@ Comanda este declanșată dacă:
 <source>All files</source>
 <target>Toate Filele</target>
 
+<source>Directory monitoring active</source>
+<target>Monitorizarea dosarelor este activă</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Aștept pînă cînd toate dosarele vor fi disponibile...</target>
+
 <source>&Restore</source>
 <target>&Restaurează</target>
 
+<source>&Show error</source>
+<target>A&rată eroarea</target>
+
 <source>&Exit</source>
 <target>&Ieși</target>
 
-<source>Waiting for missing directories...</source>
-<target>Aștept ca dosarele lipsă să devină disponibile...</target>
-
 <source>Invalid command line:</source>
 <target>Linie de comandă nevalidă:</target>
 
@@ -408,14 +447,14 @@ Comanda este declanșată dacă:
 <source>File time and size</source>
 <target>Timpul și Mărimea Filelor</target>
 
-<source> Two way </source>
-<target> Bidirecțională </target>
+<source>Two way</source>
+<target>Bidirecțională</target>
 
 <source>Mirror</source>
-<target>Clonare </target>
+<target>Clonare</target>
 
 <source>Update</source>
-<target>Actualizare </target>
+<target>Actualizare</target>
 
 <source>Custom</source>
 <target>Sincronizare Personalizată</target>
@@ -471,11 +510,8 @@ Comanda este declanșată dacă:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Există conflicte nerezolvate la elementele listate mai jos, deci ele nu vor fi sincronizate:</target>
 
-<source>Significant difference detected:</source>
-<target>Diferență semnificativă detectată:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Peste 50% din numărul total de file vor fi copiate sau distruse.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Dosarele următoare diferă foarte mult. Asigură-te că ai potrivit pentru sincronizare dosarele corecte.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Spațiu de stocare insuficient pe:</target>
@@ -495,12 +531,15 @@ Comanda este declanșată dacă:
 <source>Generating database...</source>
 <target>Generez baza de date...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Creez Conservare a Volumului [Volume Shadow Copy] pentru %x...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Creez o Conservare a Volumului [Volume Shadow Copy] pentru %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Eroare la verificarea datelor: %x și %y au conținut diferit.</target>
 
+<source>job name</source>
+<target>numele sarcinii</target>
+
 <source>Synchronization aborted</source>
 <target>Sincronizare abandonată</target>
 
@@ -525,6 +564,9 @@ Comanda este declanșată dacă:
 <source>Switching to FreeFileSync main dialog</source>
 <target>Comut la dialogul principal FreeFileSync</target>
 
+<source>Retrying operation after error:</source>
+<target>Reîncerc operația după eroare:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Este disponibilă o versiune nouă a softului:</target>
 
@@ -648,8 +690,8 @@ Comanda este declanșată dacă:
 <source>&Export file list...</source>
 <target>&Exportă Lista de File...</target>
 
-<source>&Global settings...</source>
-<target>&Setări Globale...</target>
+<source>&Global settings</source>
+<target>&Setări Globale</target>
 
 <source>&Tools</source>
 <target>&Unelte</target>
@@ -666,12 +708,6 @@ Comanda este declanșată dacă:
 <source>Compare</source>
 <target>Compară</target>
 
-<source>Comparison settings</source>
-<target>Setările Comparării</target>
-
-<source>Synchronization settings</source>
-<target>Setările Sincronizării</target>
-
 <source>Synchronize</source>
 <target>Sincronizează</target>
 
@@ -720,6 +756,9 @@ Comanda este declanșată dacă:
 <source>Synchronizing...</source>
 <target>Sincronizare Aflată în Curs...</target>
 
+<source>Minimize to notification area</source>
+<target>Minimizează în aria de notificare (sertar)</target>
+
 <source>On completion</source>
 <target>La Terminare</target>
 
@@ -729,6 +768,15 @@ Comanda este declanșată dacă:
 <source>&Pause</source>
 <target>&Pauzează</target>
 
+<source>Variant</source>
+<target>Varianta Sincronizării</target>
+
+<source>Statistics</source>
+<target>Statistici</target>
+
+<source>&Don't show this dialog again</source>
+<target>Nu arăta acest &dialog din nou</target>
+
 <source>Select a variant</source>
 <target>Selectează o variantă</target>
 
@@ -777,6 +825,12 @@ este același
 <source>Configure your own synchronization rules.</source>
 <target>Reguli de sincronizare definite de utilizator pentru fiecare situație.</target>
 
+<source>Detect moved files</source>
+<target>Detectează filele mutate</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Necesită file cu baze de date. Nu e suportat de toate sistemele de file.</target>
+
 <source>Error handling</source>
 <target>Gestionarea Erorilor</target>
 
@@ -801,17 +855,17 @@ este același
 <source>Delete or overwrite files permanently</source>
 <target>Filele sînt șterse sau suprascrise în mod definitiv, fără a mai putea fi recuperate</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Reciclator</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Filele șterse sau suprascrise sînt puse în Reciclator [Recycle Bin], de unde pot fi recuperate la nevoie</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Conservă [back up] în Reciclator filele șterse sau suprascrise</target>
 
 <source>Versioning</source>
 <target>Versionare</target>
 
-<source>Move files to user-defined folder</source>
-<target>Mută filele în dosarul stabilit de utilizator</target>
+<source>Move files to a user-defined folder</source>
+<target>Mută filele într-un dosar stabilit de utilizator</target>
 
 <source>Naming convention:</source>
 <target>Convenție de numire:</target>
@@ -819,8 +873,8 @@ este același
 <source>Batch job</source>
 <target>Sarcină Set</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Creează o filă set [batch file] pentru sincronizarea neasistată. Pentru efectuarea sincronizării, dublu-clichează această filă sau programează rularea ei folosind un Planificator de Sarcini [Task Scheduler]: %x</target>
 
 <source>Exit</source>
 <target>Ieșire</target>
@@ -852,9 +906,6 @@ este același
 <source>Donate with PayPal</source>
 <target>Donează prin PayPal</target>
 
-<source>Many thanks for localization:</source>
-<target>Multe mulțumiri pentru localizare:</target>
-
 <source>Feedback and suggestions are welcome</source>
 <target>Opiniile și sugestiile despre program sînt binevenite.</target>
 
@@ -867,6 +918,9 @@ este același
 <source>Published under the GNU General Public License</source>
 <target>Publicat sub licența GNU GPL</target>
 
+<source>Many thanks for localization:</source>
+<target>Multe mulțumiri pentru localizare:</target>
+
 <source>Delete on both sides</source>
 <target>Șterge din ambele părți</target>
 
@@ -874,12 +928,12 @@ este același
 <target>Șterge din ambele părți, chiar dacă fila e selecționată într-o singură parte</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-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ă).
+Filele vor fi sincronizate doar dacă îndeplinesc toate regulile filtrului.
+Notă: Căile filelor trebuie să fie relative la dosarele bază (rădăcină).
 </target>
 
 <source>Include</source>
@@ -909,19 +963,19 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină).
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Copierea se face mai întîi într-o filă temporară (*.ffs_tmp), care e apoi renumită. Se garantează astfel consecvența stării filelor chiar și în cazul apariției de erori fatale.</target>
 
 <source>Copy locked files</source>
 <target>Copiază filele partajate [shared] sau zăvorîte [locked]</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
 <target>Filele partajate sau zăvorîte sînt copiate folosind Serviciul de Conservare a Volumelor din Windows [Volume Shadow Copy] (necesită drepturi de Administrator)</target>
 
 <source>Copy file access permissions</source>
 <target>Copiază permisiunile de acces ale filelor</target>
 
-<source>Transfer file and folder 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>
@@ -936,15 +990,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină).
 <source>&Default</source>
 <target>Coloanele &Implicite</target>
 
-<source>Variant</source>
-<target>Varianta Sincronizării</target>
-
-<source>Statistics</source>
-<target>Statistici</target>
-
-<source>Don't show this dialog again</source>
-<target>Nu arăta fereastra asta din nou</target>
-
 <source>Find what:</source>
 <target>Găsește Asta:</target>
 
@@ -954,15 +999,21 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină).
 <source>&Find next</source>
 <target>&Găsește Următorul</target>
 
+<source>Start synchronization</source>
+<target>Pornește Sincronizarea</target>
+
+<source>Comparison settings</source>
+<target>Setările Comparării</target>
+
+<source>Synchronization settings</source>
+<target>Setările Sincronizării</target>
+
 <source>Delete</source>
 <target>Șterge</target>
 
 <source>Configure filter</source>
 <target>Configurează Filtrul</target>
 
-<source>Start synchronization</source>
-<target>Pornește Sincronizarea</target>
-
 <source>Find</source>
 <target>Găsește</target>
 
@@ -997,6 +1048,22 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină).
 <target>Compară Părțile Stîngă și Dreaptă</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Sigur vrei să execuți comanda %y pentru 1 element?</pluralform>
+<pluralform>Sigur vrei să execuți comanda %y pentru %x elemente?</pluralform>
+<pluralform>Sigur vrei să execuți comanda %y pentru %x de elemente?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Confirmă</target>
+
+<source>&Execute</source>
+<target>&Execută</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1035,12 +1102,15 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină).
 <source>Include temporarily</source>
 <target>Include Temporar</target>
 
-<source>Exclude via filter:</source>
-<target>Exclude prin Filtru:</target>
-
 <source>multiple selection</source>
 <target>selectare multiplă</target>
 
+<source>Include via filter:</source>
+<target>Include prin Filtrul:</target>
+
+<source>Exclude via filter:</source>
+<target>Exclude prin Filtrul:</target>
+
 <source>Include all</source>
 <target>Include Tot</target>
 
@@ -1086,8 +1156,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină).
 <source>Do&n't save</source>
 <target>&Nu salva</target>
 
-<source>Never save changes</source>
-<target>Nu salva niciodată modificările</target>
+<source>Never save &changes</source>
+<target>Nu salva ni&ciodată modificările</target>
 
 <source>Show files that exist on left side only</source>
 <target>Arată filele care există doar în stînga</target>
@@ -1140,8 +1210,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină).
 <source>All folders are in sync</source>
 <target>Toate dosarele sînt sincronizate</target>
 
-<source>Comma separated list</source>
-<target>Listă de elemente separate prin virgulă</target>
+<source>Comma-separated values</source>
+<target>Valori separate prin virgulă</target>
 
 <source>File list exported</source>
 <target>Lista de file a fost exportată</target>
@@ -1149,8 +1219,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină).
 <source>Searching for program updates...</source>
 <target>Caut actualizări ale programului...</target>
 
-<source>Ignore further errors</source>
-<target>Ignoră erorile ulterioare</target>
+<source>&Ignore subsequent errors</source>
+<target>&Ignoră erorile ulterioare</target>
 
 <source>&Ignore</source>
 <target>&OK</target>
@@ -1158,8 +1228,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină).
 <source>Fatal Error</source>
 <target>Eroare Fatală</target>
 
-<source>Don't show this warning again</source>
-<target>Nu arăta această atenționare din nou</target>
+<source>&Don't show this warning again</source>
+<target>&Nu arăta din nou această atenționare</target>
 
 <source>&Switch</source>
 <target>&Comută</target>
@@ -1194,13 +1264,10 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină).
 <source>Completed</source>
 <target>Sincronizare Terminată</target>
 
-<source>Continue</source>
-<target>Continuă</target>
-
-<source>Pause</source>
-<target>Pauzează</target>
+<source>&Continue</source>
+<target>&Continuă</target>
 
-<source>Logging</source>
+<source>Log</source>
 <target>Jurnal</target>
 
 <source>Cannot find %x</source>
@@ -1237,8 +1304,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină).
 <target>Filtru</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
 <pluralform>Sigur vrei să muți în Reciclator elementul următor?</pluralform>
@@ -1284,7 +1351,7 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină).
 <target>Vrei ca dialogurile ascunse și mesajele de avertizare să fie vizibile din nou?</target>
 
 <source>Leave as unresolved conflict</source>
-<target>Lasă ca Conflict Nerezolvat</target>
+<target>Lasă ca conflict nerezolvat</target>
 
 <source>Replace</source>
 <target>Înlocuiește</target>
@@ -1298,9 +1365,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină).
 <source>Append a timestamp to each file name</source>
 <target>Adaugă un marcaj temporal la numele fiecărei file</target>
 
-<source>Folder</source>
-<target>Dosar</target>
-
 <source>File</source>
 <target>Filă</target>
 
@@ -1424,7 +1488,7 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină).
 <source>Cannot change process I/O priorities.</source>
 <target>Nu pot schimba prioritățile I/O ale procesului.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
+<source>Unable to move %x to the recycle bin.</source>
 <target>Nu pot muta %x în Reciclator.</target>
 
 <source>Cannot determine final path for %x.</source>
diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng
index 4d7b5f09..8ef22f8c 100644
--- a/BUILD/Languages/russian.lng
+++ b/BUILD/Languages/russian.lng
@@ -7,6 +7,178 @@
 	<plural_definition>n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<11 || n%100>14) ? 1 : 2</plural_definition>
 </header>
 
+<source>Unable to move %x to the recycle bin.</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Log</source>
+<target></target>
+
+<source>&Continue</source>
+<target></target>
+
+<source>&Don't show this warning again</source>
+<target></target>
+
+<source>&Ignore subsequent errors</source>
+<target></target>
+
+<source>Comma-separated values</source>
+<target></target>
+
+<source>Never save &changes</source>
+<target></target>
+
+<source>Include via filter:</source>
+<target></target>
+
+<source>&Execute</source>
+<target></target>
+
+<source>Confirm</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target></target>
+
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target></target>
+
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target></target>
+
+<source>
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
+</source>
+<target></target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target></target>
+
+<source>Move files to a user-defined folder</source>
+<target></target>
+
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target></target>
+
+<source>Recycle bin</source>
+<target></target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target></target>
+
+<source>Detect moved files</source>
+<target></target>
+
+<source>&Don't show this dialog again</source>
+<target></target>
+
+<source>Minimize to notification area</source>
+<target></target>
+
+<source>Retrying operation after error:</source>
+<target></target>
+
+<source>job name</source>
+<target></target>
+
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target></target>
+
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target></target>
+
+<source>&Show error</source>
+<target></target>
+
+<source>Waiting until all directories are available...</source>
+<target></target>
+
+<source>Directory monitoring active</source>
+<target></target>
+
+<source>Volume name %x is not part of file path %y.</source>
+<target></target>
+
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target></target>
+
+<source>%x items</source>
+<target></target>
+
+<source>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
+</source>
+<target>
+</target>
+
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
+<target>
+</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target></target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target></target>
+
+<source>directory</source>
+<target></target>
+
+<source>config files</source>
+<target></target>
+
+<source>Syntax:</source>
+<target></target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target></target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target></target>
+
+<source>Unequal number of left and right directories specified.</source>
+<target></target>
+
+<source>Cannot open file %x.</source>
+<target></target>
+
+<source>Syntax error</source>
+<target></target>
+
+<source>A directory path is expected after %x.</source>
+<target></target>
+
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target></target>
+
+<source>Moving symbolic link %x to the recycle bin</source>
+<target></target>
+
+<source>Moving folder %x to the recycle bin</source>
+<target></target>
+
+<source>Moving file %x to the recycle bin</source>
+<target></target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Со времени последней синхронизации с обеих сторон произошли изменения.</target>
 
@@ -28,15 +200,6 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Проверка доступности "Корзины" для папки %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>Перемещение файла %x в "Корзину"</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Перемещение папки %x в "Корзину"</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Перемещение символьной ссылки %x в "Корзину"</target>
-
 <source>Deleting file %x</source>
 <target>Удаление файла %x</target>
 
@@ -46,21 +209,21 @@
 <source>Deleting symbolic link %x</source>
 <target>Удаление символьной ссылки %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>Для этого пути "Корзина" недоступна! Файлы будут удалены безвозвратно:</target>
-
 <source>An exception occurred</source>
 <target>Исключение произошло</target>
 
-<source>Cannot find file %x.</source>
-<target>Невозможно найти файл %x.</target>
-
 <source>Error</source>
 <target>Ошибка</target>
 
 <source>File %x does not contain a valid configuration.</source>
 <target>Файл %x не содержит действительной конфигурации.</target>
 
+<source>Warning</source>
+<target>Внимание</target>
+
+<source>Command line</source>
+<target>Командная строка</target>
+
 <source>A folder input field is empty.</source>
 <target>Поле ввода папки пустое.</target>
 
@@ -218,16 +381,6 @@
 <source>Total time:</source>
 <target>Общее время:</target>
 
-<source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</source>
-<target>
-<pluralform>%x Байт</pluralform>
-<pluralform>%x Байта</pluralform>
-<pluralform>%x Байт</pluralform>
-</target>
-
 <source>%x MB</source>
 <target>%x МБ</target>
 
@@ -246,16 +399,6 @@
 <source>Scanning:</source>
 <target>Сканирую:</target>
 
-<source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
-</source>
-<target>
-<pluralform>[%x поток]</pluralform>
-<pluralform>[%x потока]</pluralform>
-<pluralform>[%x потоков]</pluralform>
-</target>
-
 <source>Encoding extended time information: %x</source>
 <target>Кодирование расширенной информации о времени: %x</target>
 
@@ -274,9 +417,6 @@
 <source>Browse directory</source>
 <target>Обзор папок</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Невозможно получить доступ к службе Теневого Копирования Тома.</target>
-
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Пожалуйста, используйте 64-разрядную версию FreeFileSync для создания теневых копий на этой системе.</target>
 
@@ -286,9 +426,6 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Невозможно определить имя тома для %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Имя тома %x не является частью имени файла %y.</target>
-
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Запрос отмены: Ожидайте, пока текущая операция завершится...</target>
 
@@ -355,9 +492,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Время задержки между последним обнаруженным изменением и выполнением командной строки в секундах</target>
 
-<source>Command line</source>
-<target>Командная строка</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -381,9 +515,6 @@ The command is triggered if:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Автоматическая синхронизация</target>
 
-<source>Warning</source>
-<target>Внимание</target>
-
 <source>Build: %x</source>
 <target>сборка %x</target>
 
@@ -399,9 +530,6 @@ The command is triggered if:
 <source>&Exit</source>
 <target>&Выход</target>
 
-<source>Waiting for missing directories...</source>
-<target>Ожидание пропущенных папок...</target>
-
 <source>Invalid command line:</source>
 <target>Неверная командная строка:</target>
 
@@ -411,14 +539,14 @@ The command is triggered if:
 <source>File time and size</source>
 <target>Дата и размер файла</target>
 
-<source> Two way </source>
-<target> В обе стороны </target>
+<source>Two way</source>
+<target>В обе стороны</target>
 
 <source>Mirror</source>
-<target>Зеркало </target>
+<target>Зеркало</target>
 
 <source>Update</source>
-<target>Обновить </target>
+<target>Обновить</target>
 
 <source>Custom</source>
 <target>Выборочно</target>
@@ -474,12 +602,6 @@ The command is triggered if:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Следующие элементы имеют неурегулированные конфликты и не будут синхронизированы:</target>
 
-<source>Significant difference detected:</source>
-<target>Обнаружено существенное различие:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Более 50% общего количества файлов будет скопировано или удалено.</target>
-
 <source>Not enough free disk space available in:</source>
 <target>Не достаточно свободного места в:</target>
 
@@ -498,9 +620,6 @@ The command is triggered if:
 <source>Generating database...</source>
 <target>Создание базы данных...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Создание Тома Теневого Копирования для %x...</target>
-
 <source>Data verification error: %x and %y have different content.</source>
 <target>Ошибка проверки данных: %x и %y имеют разное содержание!</target>
 
@@ -651,8 +770,8 @@ The command is triggered if:
 <source>&Export file list...</source>
 <target>&Экспортировать список файлов...</target>
 
-<source>&Global settings...</source>
-<target>&Глобальные настройки...</target>
+<source>&Global settings</source>
+<target>&Глобальные настройки</target>
 
 <source>&Tools</source>
 <target>&Опции</target>
@@ -732,6 +851,12 @@ The command is triggered if:
 <source>&Pause</source>
 <target>&Пауза</target>
 
+<source>Variant</source>
+<target>Вариант</target>
+
+<source>Statistics</source>
+<target>Статистика</target>
+
 <source>Select a variant</source>
 <target>Выберите вариант</target>
 
@@ -799,27 +924,15 @@ is the same
 <source>Delete or overwrite files permanently</source>
 <target>Удалить или перезаписать файлы, не помещая в "Корзину"</target>
 
-<source>Recycle Bin</source>
-<target>Переместить в "Корзину"</target>
-
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Использовать "Корзину" для удаленных и перезаписанных файлов</target>
-
 <source>Versioning</source>
 <target>Архивировать</target>
 
-<source>Move files to user-defined folder</source>
-<target>Переместить файлы в пользовательскую папку</target>
-
 <source>Naming convention:</source>
 <target>Условие переименования:</target>
 
 <source>Batch job</source>
 <target>Пакетное задание</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>Exit</source>
 <target>Выход</target>
 
@@ -871,15 +984,6 @@ is the same
 <source>Delete on both sides even if the file is selected on one side only</source>
 <target>Удалить с обеих сторон, даже если файл выделен только на одной стороне</target>
 
-<source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
-</source>
-<target>
-Только файлы, соответствующие всем настройкам фильтра, будут синхронизированы.
-Примечание: Файлы должны относиться к синхронизируемым папкам.
-</target>
-
 <source>Include</source>
 <target>Включить</target>
 
@@ -907,21 +1011,12 @@ Note: File names must be relative to base directories.
 <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>
-
 <source>Copy locked files</source>
 <target>Копирование заблокированных файлов</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Копирование общих или заблокированных файлов с использованием службы Теневого Копирования Тома (требуются права Администратора)</target>
-
 <source>Copy file access permissions</source>
 <target>Копирование прав доступа к файлам</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Передача прав доступа к файлам/папкам (требуются права Администратора)</target>
-
 <source>Restore hidden dialogs</source>
 <target>Восстановить скрытые диалоговые окна?</target>
 
@@ -934,15 +1029,6 @@ Note: File names must be relative to base directories.
 <source>&Default</source>
 <target>&По умолчанию</target>
 
-<source>Variant</source>
-<target>Вариант</target>
-
-<source>Statistics</source>
-<target>Статистика</target>
-
-<source>Don't show this dialog again</source>
-<target>Больше не показывать это окно</target>
-
 <source>Find what:</source>
 <target>Найти:</target>
 
@@ -952,15 +1038,15 @@ Note: File names must be relative to base directories.
 <source>&Find next</source>
 <target>&Найти далее</target>
 
+<source>Start synchronization</source>
+<target>Начать синхронизацию</target>
+
 <source>Delete</source>
 <target>Удалить</target>
 
 <source>Configure filter</source>
 <target>Настройки фильтра</target>
 
-<source>Start synchronization</source>
-<target>Начать синхронизацию</target>
-
 <source>Find</source>
 <target>Найти</target>
 
@@ -1033,12 +1119,12 @@ Note: File names must be relative to base directories.
 <source>Include temporarily</source>
 <target>Временно включить</target>
 
-<source>Exclude via filter:</source>
-<target>Исключить через фильтр:</target>
-
 <source>multiple selection</source>
 <target>групповое выделение</target>
 
+<source>Exclude via filter:</source>
+<target>Исключить через фильтр:</target>
+
 <source>Include all</source>
 <target>Включить все</target>
 
@@ -1084,9 +1170,6 @@ Note: File names must be relative to base directories.
 <source>Do&n't save</source>
 <target>&Не сохранять</target>
 
-<source>Never save changes</source>
-<target>Никогда не сохранять изменения</target>
-
 <source>Show files that exist on left side only</source>
 <target>Показать файлы, существующие только слева</target>
 
@@ -1138,27 +1221,18 @@ Note: File names must be relative to base directories.
 <source>All folders are in sync</source>
 <target>Все папки синхронизированы</target>
 
-<source>Comma separated list</source>
-<target>Список, разделяемый запятыми</target>
-
 <source>File list exported</source>
 <target>Список файлов экспортирован</target>
 
 <source>Searching for program updates...</source>
 <target>Проверка обновлений программы...</target>
 
-<source>Ignore further errors</source>
-<target>Игнорировать последующие ошибки</target>
-
 <source>&Ignore</source>
 <target>&Игнорировать</target>
 
 <source>Fatal Error</source>
 <target>Критическая ошибка</target>
 
-<source>Don't show this warning again</source>
-<target>Больше не показывать это предупреждение</target>
-
 <source>&Switch</source>
 <target>&Переключить</target>
 
@@ -1192,15 +1266,6 @@ Note: File names must be relative to base directories.
 <source>Completed</source>
 <target>Завершено</target>
 
-<source>Continue</source>
-<target>Продолжить</target>
-
-<source>Pause</source>
-<target>Пауза</target>
-
-<source>Logging</source>
-<target>Лог-файлы</target>
-
 <source>Cannot find %x</source>
 <target>Невозможно найти %x</target>
 
@@ -1235,16 +1300,6 @@ Note: File names must be relative to base directories.
 <target>Фильтр</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>Вы точно хотите переместить следующий %x элемент в "Корзину"?</pluralform>
-<pluralform>Вы точно хотите переместить следующие %x элемента в "Корзину"?</pluralform>
-<pluralform>Вы точно хотите переместить следующие %x элементов в "Корзину"?</pluralform>
-</target>
-
-<source>
 <pluralform>Do you really want to delete the following item?</pluralform>
 <pluralform>Do you really want to delete the following %x items?</pluralform>
 </source>
@@ -1299,9 +1354,6 @@ Note: File names must be relative to base directories.
 <source>Append a timestamp to each file name</source>
 <target>Добавить отметку времени для каждого имени файла</target>
 
-<source>Folder</source>
-<target>Папка</target>
-
 <source>File</source>
 <target>Файл</target>
 
@@ -1425,9 +1477,6 @@ Note: File names must be relative to base directories.
 <source>Cannot change process I/O priorities.</source>
 <target>Невозможно изменить приоритет процесса.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Невозможно переместить %x в "Корзину".</target>
-
 <source>Cannot determine final path for %x.</source>
 <target>Невозможно определить конечный путь для %x.</target>
 
diff --git a/BUILD/Languages/scottish_gaelic.lng b/BUILD/Languages/scottish_gaelic.lng
index 80d0a971..a68e9d6a 100644
--- a/BUILD/Languages/scottish_gaelic.lng
+++ b/BUILD/Languages/scottish_gaelic.lng
@@ -25,14 +25,14 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>A' toirt sùil a bheil am biona ri fhaighin airson a' phasgain %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>A' gluasad an fhaidhle %x dhan bhiona ath-chuairteachaidh</target>
+<source>Moving file %x to the recycle bin</source>
+<target>A' gluasad an fhaidhle %x dhan bhiona</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>A' gluasad a' phasgain %x dhan bhiona ath-chuairteachaidh</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>A' gluasad a' phasgain %x dhan bhiona</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>A' gluasad an symbolic link %x dhan bhiona ath-chuairteachaidh</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>A' gluasad an symbolic link %x dhan bhiona</target>
 
 <source>Deleting file %x</source>
 <target>A' sguabadh às an fhaidhle %x</target>
@@ -43,14 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>A' sguabadh às an symbolic link %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>Chan eil am biona ri làimh nam pasganan a leanas. Thèid na faidhlichean a sguabadh às gu buan an àite sin:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Chan eil am biona ri làimh airson nam pasganan a leanas. Thèid an sguabadh às gu buan an àite sin:</target>
 
 <source>An exception occurred</source>
 <target>Thachair eisgeachd</target>
 
-<source>Cannot find file %x.</source>
-<target>Cha deach am faidhle %x a lorg.</target>
+<source>A directory path is expected after %x.</source>
+<target>Tha dùil ri slighe pasgain an dèidh %x</target>
+
+<source>Syntax error</source>
+<target>Mearachd co-chàraidh</target>
+
+<source>Cannot open file %x.</source>
+<target>Cha ghabh am faidhle %x fhosgladh.</target>
 
 <source>Error</source>
 <target>Mearachd</target>
@@ -58,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>Chan eil rèiteachadh dligheach san fhaidhle %x.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Chan eil àireamh nam pasganan air an taobh chlì 's an taobh deas co-ionnann</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Chan fhaod roghainnean aig ìre paidhrichean nam pasganan a bhith san fhaidhle rèiteachaidh nuair a thathar a' cur pasganan slighe na loidhne-àithne.</target>
+
+<source>Warning</source>
+<target>Rabhadh</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Cha ghabh pasganan a shuidheachadh airson barrachd air aon fhaidhle rèiteachaidh.</target>
+
+<source>Syntax:</source>
+<target>Co-chàradh:</target>
+
+<source>config files</source>
+<target>faidhlichean rèiteachaidh</target>
+
+<source>directory</source>
+<target>pasgan</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Àireamh sam bith de dh'fhaidhlichean rèiteachaidh FreeFileSync .ffs_gui agus/no .ffs_batch</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Àireamh sam bith de phasganan eile airson aon fhaidhle rèiteachaidh air a' char as fhaide.</target>
+
+<source>Command line</source>
+<target>Loidhne-àithne</target>
+
 <source>A folder input field is empty.</source>
 <target>Tha co-dhiù aon raon pasgain ann a tha falamh.</target>
 
@@ -217,14 +253,14 @@
 <target>An ùine gu lèir:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>%x bhaidht</pluralform>
-<pluralform>%x bhaidht</pluralform>
-<pluralform>%x baidht</pluralform>
-<pluralform>%x baidht</pluralform>
+<pluralform>%x byte</pluralform>
+<pluralform>%x bytes</pluralform>
+<pluralform>%x bytes</pluralform>
+<pluralform>%x bytes</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -246,14 +282,14 @@
 <target>'Ga sganadh:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[%x snàithlean]</pluralform>
-<pluralform>[%x shnàithlean]</pluralform>
-<pluralform>[%x snàithleanan]</pluralform>
-<pluralform>[%x snàithlean]</pluralform>
+<pluralform>%x shnàithlean</pluralform>
+<pluralform>%x shnàithlean</pluralform>
+<pluralform>%x snàithleanan</pluralform>
+<pluralform>%x snàithlean</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -262,6 +298,9 @@
 <source>/sec</source>
 <target>/diog</target>
 
+<source>%x items</source>
+<target>%x nithean</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Cha deach faidhle an rèiteachaidh %x a luchdadh gu tur.</target>
 
@@ -274,8 +313,8 @@
 <source>Browse directory</source>
 <target>Rùraich am pasgan</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Chan fhaigh sinn cothrom air seirbheis lethbhreacan-sgàile nan clàr.</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Chan fhaigh sinn cothrom air seirbheise lethbhreacan sgàil an draibh.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Nach cleachd sibh an tionndadh 64 biot de FreeFileSync gus lethbhreacan-sgàile a chruthachadh air an t-siostam seo?</target>
@@ -286,8 +325,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Chan urrainn dhuinn ainm an draibh airson %x a dhearbhadh.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Chan eil an t-ainm clàir %x 'na phàirt dhen ainm fhaidhle %y.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>Chan eil ainm an draibh %x 'na phàirt de shlighe an fhaodhle %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Tha thu airson sgur dheth: A' feitheamh gus an crìochnaich an gnìomh làithreach...</target>
@@ -355,9 +394,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>An tàmh eadar an t-atharrachadh mu dheireadh agus gnìomhachadh na h-àithne</target>
 
-<source>Command line</source>
-<target>Loidhne-àithne</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -381,9 +417,6 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sioncronachadh fèin-obrachail</target>
 
-<source>Warning</source>
-<target>Rabhadh</target>
-
 <source>Build: %x</source>
 <target>Build: %x</target>
 
@@ -393,15 +426,21 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>All files</source>
 <target>Gach faidhle</target>
 
+<source>Directory monitoring active</source>
+<target>Tha na pasganan 'gam marasgladh</target>
+
+<source>Waiting until all directories are available...</source>
+<target>A' feitheamh gus am bi gach pasgan ri làimh...</target>
+
 <source>&Restore</source>
 <target>&Aisig</target>
 
+<source>&Show error</source>
+<target>&Seall a' mhearachd</target>
+
 <source>&Exit</source>
 <target>&Fàg an-seo</target>
 
-<source>Waiting for missing directories...</source>
-<target>A' feitheamh ris na pasgain a tha a dhìth...</target>
-
 <source>Invalid command line:</source>
 <target>Loidhne-àithne mhì-dhligheach:</target>
 
@@ -411,14 +450,14 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>File time and size</source>
 <target>Ceann-là is meud</target>
 
-<source> Two way </source>
-<target> An dà chomhair </target>
+<source>Two way</source>
+<target>An dà chomhair</target>
 
 <source>Mirror</source>
-<target>Sgàthanaich </target>
+<target>Sgàthanaich</target>
 
 <source>Update</source>
-<target>Ùraich </target>
+<target>Ùraich</target>
 
 <source>Custom</source>
 <target>Gnàthaichte</target>
@@ -474,11 +513,8 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Tha còmstrithean aig na nithean a leanas fhathast is cha dèid an sioncronachadh:</target>
 
-<source>Significant difference detected:</source>
-<target>Chaidh diofar mòr a lorg:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Tha thu an impis barrachd air an dàrna leth dhe na faidhlichean uile sguabadh às no lethbhreac a dhèanamh dhiubh.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Tha diofar mòr eadar na pasganan a leanas. Dèan cinnteach gu bheil thu a' maidseadh nam pasganan ceart airson sioncronachadh.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Chan eil rùm saor gu leòr air an diosga:</target>
@@ -498,12 +534,15 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Generating database...</source>
 <target>A' gintinn an stòir-dhàta...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>A' cruthachadh Volume Shadow Copy de %x...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>A' cruthachadh lethbhreac sgàil draibh airson %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Mearachd le dearbhadh an dàta: tha susbaint eadar-dhealaichte ann an %x agus %y.</target>
 
+<source>job name</source>
+<target>ainm na h-obrach</target>
+
 <source>Synchronization aborted</source>
 <target>Sguireadh dhen t-sioncronachadh</target>
 
@@ -528,6 +567,9 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Switching to FreeFileSync main dialog</source>
 <target>A' gearradh leum gu FreeFileSync sa phrìomh-chòmhradh</target>
 
+<source>Retrying operation after error:</source>
+<target>A' feuchainn ris an dèidh na mearachd:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Tha tionndadh ùr de FreeFileSync ann:</target>
 
@@ -651,8 +693,8 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>&Export file list...</source>
 <target>Às-p&hortaich liosta nam faidhle...</target>
 
-<source>&Global settings...</source>
-<target>&Na roghainnean uile-choitcheann...</target>
+<source>&Global settings</source>
+<target>&Na roghainnean uile-choitcheann</target>
 
 <source>&Tools</source>
 <target>&Innealan</target>
@@ -669,12 +711,6 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Compare</source>
 <target>Dèan coimeas</target>
 
-<source>Comparison settings</source>
-<target>Roghainnean a' choimeasaidh</target>
-
-<source>Synchronization settings</source>
-<target>Roghainnean an t-sioncronachaidh</target>
-
 <source>Synchronize</source>
 <target>Dèan sioncronachadh</target>
 
@@ -723,6 +759,9 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Synchronizing...</source>
 <target>A' sioncronachadh...</target>
 
+<source>Minimize to notification area</source>
+<target>Lùghdach 's gluais gu raon nam brathan</target>
+
 <source>On completion</source>
 <target>Nuair a bhios e deiseil</target>
 
@@ -732,6 +771,15 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>&Pause</source>
 <target>&Cuir 'na stad</target>
 
+<source>Variant</source>
+<target>Eugsamhail</target>
+
+<source>Statistics</source>
+<target>Stats</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Na seall an còmhradh seo a-rithist</target>
+
 <source>Select a variant</source>
 <target>Tagh eug-samhail</target>
 
@@ -779,6 +827,12 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 <source>Configure your own synchronization rules.</source>
 <target>Sònraich riaghailtean sioncronachaidh thu fhèin.</target>
 
+<source>Detect moved files</source>
+<target>Mothaich do dh'fhaidhlichean a chaidh a ghluasad</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Feumaidh seo faidhlichean stòir-dhàta. Chan eil gach siostam fhaidhlichean a' cur taic ri seo.</target>
+
 <source>Error handling</source>
 <target>Làimhseachadh mhearachdan</target>
 
@@ -803,17 +857,17 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 <source>Delete or overwrite files permanently</source>
 <target>Sguab às no sgrìobh thairis air faidhlichean gu buan</target>
 
-<source>Recycle Bin</source>
-<target>Am biona ath-chuairteachaidh</target>
+<source>Recycle bin</source>
+<target>Am biona</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Cuir na chaidh a sguabadh as no sgrìobhadh thairis air sa bhiona ath-chuairteachaidh</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Dèan lethbhreac-glèidhidh de dh'fhaidhlichean sa bhiona a chaidh a sguabadh às no a chaidh sgrìobhadh thairis orra</target>
 
 <source>Versioning</source>
 <target>Versioning</target>
 
-<source>Move files to user-defined folder</source>
-<target>Gluais na faidhlichean dhan phasgan a shònraich an cleachdaiche</target>
+<source>Move files to a user-defined folder</source>
+<target>Gluais na faidhlichean gu àite a shònraich an cleachdaiche</target>
 
 <source>Naming convention:</source>
 <target>Gnàthas nan ainmean:</target>
@@ -821,8 +875,8 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 <source>Batch job</source>
 <target>Obair baidse</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>Cruthaich faidhle batch airson sioncronachadh fèin-obrachail. Dèan briogadh dùbailte air an fhaidhle seo no cuir e air sgeideal an t-siostaim agad: FreeFileSync.exe <Jobname>.ffs_batch.</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Cruthaich faidhle batch airson sioncronachadh a dh'obraicheas gun thusa a bhith an làthair. Gus a thòiseachadh, dèan briogadh dùbailte air an fhaidhle seo ann am planadair shaothraichean: %x</target>
 
 <source>Exit</source>
 <target>Fàg an-seo</target>
@@ -845,30 +899,6 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 <source>Limit maximum number of log files</source>
 <target>Cuingich an àireamh as motha de dh'fhaidhlichean an loga</target>
 
-<source>Source code written in C++ using:</source>
-<target>Chaidh an còd tùsail a sgrìobhadh ann an C++ le taic:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Ma tha FreeFileSync a' còrdadh riut</target>
-
-<source>Donate with PayPal</source>
-<target>Nach doir sibh tabhartas le PayPal?</target>
-
-<source>Many thanks for localization:</source>
-<target>Tha sinn fada an comain nan daoine a leanas airson eadar-theangachadh:</target>
-
-<source>Feedback and suggestions are welcome</source>
-<target>Tha sinn a' cur fàilte mhòr air beachd is moladh sam bith</target>
-
-<source>Homepage</source>
-<target>An duilleag-dhachaigh</target>
-
-<source>Email</source>
-<target>Post-d</target>
-
-<source>Published under the GNU General Public License</source>
-<target>Air fhoillseachadh fo GNU General Public License</target>
-
 <source>Delete on both sides</source>
 <target>Sguab às air an dà thaobh</target>
 
@@ -876,12 +906,12 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 <target>Sguab às air an dà thaobh fiù mur an deach am faidhle a thaghadh ach air aon taobh</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Cha dèid ach na faidhlichean a fhreagras ri gach roghainn na criathraige a shioncronachadh.
-An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain aca.
+Cha dèidh faidhlichean a shioncronachadh ach ma choileanas iad gach riaghailte na criathraige.
+An aire: Feumaidh slighean nam faidhlichean a bhith dàimheach ris na bun-phasganan.
 </target>
 
 <source>Include</source>
@@ -911,20 +941,20 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Fail-safe file copy</source>
 <target>Dèan lethbhreac nach gabh fàilligeadh</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>Sgrìobh faidhle sealach (*.ffs_tmp) an toiseach agus cuir ainm eile air an uairsin. Bidh seo mar bharantas air staid sheasmhach, fiù ma thachras mearachd mharbhtach.</target>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Cuir lethbhreac dheth ann am faidhle sealach (*.ffs_tmp) an toiseach is thoir ainm ùr air an uairsin. Leis a seo, bidh staid sheasmhach agad fiù ma thachras mearachd mharbhtach.</target>
 
 <source>Copy locked files</source>
 <target>Dèan lethbhreac de dh'fhaidhlichean glaiste</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Dèan lethbhreac de dh'fhaidhlichean glaiste no co-roinnte le seirbheis lethbhreacan-sgàile nan clàr (feumaidh seo còraichean rianaire)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Dèan lethbhreac de dh'fhaidhlichean co-roinnte no glaiste le seirbheis lethbhreacan sgàil an draibh (feumaidh seo còraichean rianaire)</target>
 
 <source>Copy file access permissions</source>
 <target>Dèan lethbhreac de cheadan-inntrigidh nam faidhle</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Tar-chuir ceadan nam faidhle 's nam pasgan (feumaidh seo còraichean rianaire)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Tar-chuir ceadan nam faidhlichean 's nam pasganan (feumaidh seo còraichean rianaire)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Aisig na còmhraidhean falaichte</target>
@@ -938,15 +968,6 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>&Default</source>
 <target>&Bun-roghainn</target>
 
-<source>Variant</source>
-<target>Eugsamhail</target>
-
-<source>Statistics</source>
-<target>Stats</target>
-
-<source>Don't show this dialog again</source>
-<target>Na seall an còmhradh seo a-rithist</target>
-
 <source>Find what:</source>
 <target>Lorg na leanas:</target>
 
@@ -956,15 +977,45 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>&Find next</source>
 <target>&Lorg an ath-fhear</target>
 
+<source>Source code written in C++ using:</source>
+<target>Chaidh an còd tùsail a sgrìobhadh ann an C++ le taic:</target>
+
+<source>If you like FreeFileSync</source>
+<target>Ma tha FreeFileSync a' còrdadh riut</target>
+
+<source>Donate with PayPal</source>
+<target>Nach doir sibh tabhartas le PayPal?</target>
+
+<source>Feedback and suggestions are welcome</source>
+<target>Tha sinn a' cur fàilte mhòr air beachd is moladh sam bith</target>
+
+<source>Homepage</source>
+<target>An duilleag-dhachaigh</target>
+
+<source>Email</source>
+<target>Post-d</target>
+
+<source>Published under the GNU General Public License</source>
+<target>Air fhoillseachadh fo GNU General Public License</target>
+
+<source>Many thanks for localization:</source>
+<target>Tha sinn fada an comain nan daoine a leanas airson eadar-theangachadh:</target>
+
+<source>Start synchronization</source>
+<target>Tòisich air an t-sioncronachadh</target>
+
+<source>Comparison settings</source>
+<target>Roghainnean a' choimeasaidh</target>
+
+<source>Synchronization settings</source>
+<target>Roghainnean an t-sioncronachaidh</target>
+
 <source>Delete</source>
 <target>Sguab às</target>
 
 <source>Configure filter</source>
 <target>Rèitich a' chriathrag</target>
 
-<source>Start synchronization</source>
-<target>Tòisich air an t-sioncronachadh</target>
-
 <source>Find</source>
 <target>Lorg</target>
 
@@ -999,6 +1050,23 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <target>Dèan coimeas air an dà thaobh</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an àithne %y a ruith air %x nì?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an àithne %y a ruith air %x nì?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an àithne %y a ruith air %x nithean?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an àithne %y a ruith air %x nì?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Dearbh</target>
+
+<source>&Execute</source>
+<target>&Cuir an gnìomh</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1040,12 +1108,15 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Include temporarily</source>
 <target>Gabh a-steach gu sealach</target>
 
-<source>Exclude via filter:</source>
-<target>Dùin a-mach le criathrag:</target>
-
 <source>multiple selection</source>
 <target>Ioma-thaghadh</target>
 
+<source>Include via filter:</source>
+<target>Gach a-steach slighe na criathraige:</target>
+
+<source>Exclude via filter:</source>
+<target>Dùin a-mach le criathrag:</target>
+
 <source>Include all</source>
 <target>Gabh a-steach na h-uile</target>
 
@@ -1091,8 +1162,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Do&n't save</source>
 <target>&Na sàbhail</target>
 
-<source>Never save changes</source>
-<target>Na sàbhail atharraichean idir</target>
+<source>Never save &changes</source>
+<target>Na sàbhail atharrai&chean idir</target>
 
 <source>Show files that exist on left side only</source>
 <target>Na seall ach faidhlichean a tha air an taobh chlì a-mhàin</target>
@@ -1145,8 +1216,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>All folders are in sync</source>
 <target>Tha gach pasgan air a shioncronachadh</target>
 
-<source>Comma separated list</source>
-<target>Liosta air a sgaradh le cromagan</target>
+<source>Comma-separated values</source>
+<target>Luachan le cromagan eatarra</target>
 
 <source>File list exported</source>
 <target>Chaidh liosta nam faidhle às-phortadh</target>
@@ -1154,8 +1225,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Searching for program updates...</source>
 <target>A' lorg ùrachaidhean a' phrògraim...</target>
 
-<source>Ignore further errors</source>
-<target>Leig seachad mearachd sam bith eile</target>
+<source>&Ignore subsequent errors</source>
+<target>Le&ig seachad mearachdan às a dhèidh seo</target>
 
 <source>&Ignore</source>
 <target>&Leig seachad</target>
@@ -1163,8 +1234,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Fatal Error</source>
 <target>Mearachd mharbhtach</target>
 
-<source>Don't show this warning again</source>
-<target>Na seall an rabhadh seo a-rithist</target>
+<source>&Don't show this warning again</source>
+<target>Na seall an rabha&dh seo a-rithist</target>
 
 <source>&Switch</source>
 <target>&Dèan suids</target>
@@ -1199,14 +1270,11 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Completed</source>
 <target>Deiseil</target>
 
-<source>Continue</source>
-<target>Lean air</target>
+<source>&Continue</source>
+<target>Lean air adhar&t</target>
 
-<source>Pause</source>
-<target>Cuir 'na stad</target>
-
-<source>Logging</source>
-<target>Logadh</target>
+<source>Log</source>
+<target>Logaich</target>
 
 <source>Cannot find %x</source>
 <target>Chan urrainn dhuinn %x a lorg.</target>
@@ -1242,14 +1310,14 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <target>Criathrag</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>A bheil thu cinnteach gu bheil thu airson an %x nì seo a ghluasad dhan bhiona?</pluralform>
-<pluralform>A bheil thu cinnteach gu bheil thu airson na %x nì seo a ghluasad dhan bhiona?</pluralform>
-<pluralform>A bheil thu cinnteach gu bheil thu airson na %x nithean seo a ghluasad dhan bhiona?</pluralform>
-<pluralform>A bheil thu cinnteach gu bheil thu airson na %x nì seo a ghluasad dhan bhiona?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an %x nì seo a chur dhan bhiona?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an %x nì seo a chur dhan bhiona?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson na %x nithean seo a chur dhan bhiona?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an %x nì seo a chur dhan bhiona?</pluralform>
 </target>
 
 <source>
@@ -1305,9 +1373,6 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Append a timestamp to each file name</source>
 <target>Cuir stampa-ama ris ainm gach faidhle</target>
 
-<source>Folder</source>
-<target>Pasgan</target>
-
 <source>File</source>
 <target>Faidhle</target>
 
@@ -1434,8 +1499,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Cannot change process I/O priorities.</source>
 <target>Chan urrainn dhuinn na prìomhachasan I/O atharrachadh.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Chan urrainn dhuinn %x a ghluasad dhan bhiona ath-chuairteachaidh.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>Cha ghabh %x a ghluasad dhan bhiona.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>Chan urrainn dhuinn an t-slighe dheireannach airson %x a dhearbhadh.</target>
diff --git a/BUILD/Languages/serbian.lng b/BUILD/Languages/serbian.lng
index f0a26e49..9af8b193 100644
--- a/BUILD/Languages/serbian.lng
+++ b/BUILD/Languages/serbian.lng
@@ -7,6 +7,178 @@
 	<plural_definition>n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2</plural_definition>
 </header>
 
+<source>Unable to move %x to the recycle bin.</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Log</source>
+<target></target>
+
+<source>&Continue</source>
+<target></target>
+
+<source>&Don't show this warning again</source>
+<target></target>
+
+<source>&Ignore subsequent errors</source>
+<target></target>
+
+<source>Comma-separated values</source>
+<target></target>
+
+<source>Never save &changes</source>
+<target></target>
+
+<source>Include via filter:</source>
+<target></target>
+
+<source>&Execute</source>
+<target></target>
+
+<source>Confirm</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+</target>
+
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target></target>
+
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target></target>
+
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target></target>
+
+<source>
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
+</source>
+<target></target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target></target>
+
+<source>Move files to a user-defined folder</source>
+<target></target>
+
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target></target>
+
+<source>Recycle bin</source>
+<target></target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target></target>
+
+<source>Detect moved files</source>
+<target></target>
+
+<source>&Don't show this dialog again</source>
+<target></target>
+
+<source>Minimize to notification area</source>
+<target></target>
+
+<source>Retrying operation after error:</source>
+<target></target>
+
+<source>job name</source>
+<target></target>
+
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target></target>
+
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target></target>
+
+<source>&Show error</source>
+<target></target>
+
+<source>Waiting until all directories are available...</source>
+<target></target>
+
+<source>Directory monitoring active</source>
+<target></target>
+
+<source>Volume name %x is not part of file path %y.</source>
+<target></target>
+
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target></target>
+
+<source>%x items</source>
+<target></target>
+
+<source>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
+</source>
+<target>
+</target>
+
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
+<target>
+</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target></target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target></target>
+
+<source>directory</source>
+<target></target>
+
+<source>config files</source>
+<target></target>
+
+<source>Syntax:</source>
+<target></target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target></target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target></target>
+
+<source>Unequal number of left and right directories specified.</source>
+<target></target>
+
+<source>Cannot open file %x.</source>
+<target></target>
+
+<source>Syntax error</source>
+<target></target>
+
+<source>A directory path is expected after %x.</source>
+<target></target>
+
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target></target>
+
+<source>Moving symbolic link %x to the recycle bin</source>
+<target></target>
+
+<source>Moving folder %x to the recycle bin</source>
+<target></target>
+
+<source>Moving file %x to the recycle bin</source>
+<target></target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Обе су стране промењене од последње синхронизације.</target>
 
@@ -25,15 +197,6 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Проверавам доступност Корпе за смеће за фолдер %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>Премештам датотеку %x у Корпи за смеће</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Премештам фолдер %x у Корпи за смеће</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Премештам симболичну везу %x у Корпи за смеће</target>
-
 <source>Deleting file %x</source>
 <target>Брисање датотеке %x</target>
 
@@ -43,21 +206,21 @@
 <source>Deleting symbolic link %x</source>
 <target>Брисање симболичне везе %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>Корпа за смеће није доступна за следеће фолдере. Уместо тога датотеке биће обрисане трајно:</target>
-
 <source>An exception occurred</source>
 <target>Догодило се изузеће</target>
 
-<source>Cannot find file %x.</source>
-<target>Не могу пронаћи датотеку %x.</target>
-
 <source>Error</source>
 <target>Грешка</target>
 
 <source>File %x does not contain a valid configuration.</source>
 <target>Датотека %x не садржи валидну конфигурацију.</target>
 
+<source>Warning</source>
+<target>Упозорење</target>
+
+<source>Command line</source>
+<target>Командна линија</target>
+
 <source>A folder input field is empty.</source>
 <target>Поље за одабир фолдера је празно.</target>
 
@@ -215,16 +378,6 @@
 <source>Total time:</source>
 <target>Укупно време:</target>
 
-<source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</source>
-<target>
-<pluralform>%x Бајт</pluralform>
-<pluralform>%x Бајта</pluralform>
-<pluralform>%x Бајтова</pluralform>
-</target>
-
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -243,16 +396,6 @@
 <source>Scanning:</source>
 <target>Претражујем:</target>
 
-<source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
-</source>
-<target>
-<pluralform>[%x Нит]</pluralform>
-<pluralform>[%x Нити]</pluralform>
-<pluralform>[%x Нити]</pluralform>
-</target>
-
 <source>Encoding extended time information: %x</source>
 <target>Кодирам проширене информације о времену: %x</target>
 
@@ -271,9 +414,6 @@
 <source>Browse directory</source>
 <target>Одабери фолдер</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Не могу приступити Volume Shadow Copy Сервису.</target>
-
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Молимо користите FreeFileSync 64-битну верзију за израду shadow копија на овом систему.</target>
 
@@ -283,9 +423,6 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Не могу утврдити назив партиције за %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Назив партиције %x није део имена датотеке %y.</target>
-
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Прекид захтеван: Чека се да се тренутна акција заврши...</target>
 
@@ -352,9 +489,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Време мировања између задње препознате промене и извршења наредбе</target>
 
-<source>Command line</source>
-<target>Командна линија</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -378,9 +512,6 @@ The command is triggered if:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Аутоматска Синхронизација</target>
 
-<source>Warning</source>
-<target>Упозорење</target>
-
 <source>Build: %x</source>
 <target>Подверзија: %x</target>
 
@@ -396,9 +527,6 @@ The command is triggered if:
 <source>&Exit</source>
 <target>&Излаз</target>
 
-<source>Waiting for missing directories...</source>
-<target>Чека се недостајући фолдери...</target>
-
 <source>Invalid command line:</source>
 <target>Нетачна командна линија:</target>
 
@@ -408,14 +536,14 @@ The command is triggered if:
 <source>File time and size</source>
 <target>Време и величина датотеке</target>
 
-<source> Two way </source>
-<target> Двосмерно </target>
+<source>Two way</source>
+<target>Двосмерно</target>
 
 <source>Mirror</source>
-<target>Огледално </target>
+<target>Огледално</target>
 
 <source>Update</source>
-<target>Ажурирарно </target>
+<target>Ажурирарно</target>
 
 <source>Custom</source>
 <target>Специфично</target>
@@ -471,12 +599,6 @@ The command is triggered if:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Следеће ставке имају неразрешених конфликата и неће бити синхронизоване:</target>
 
-<source>Significant difference detected:</source>
-<target>Значајна разлика опажена:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Више од 50% од укупног броја датотека ће бити копирано или избрисано.</target>
-
 <source>Not enough free disk space available in:</source>
 <target>Недовољно простора на диску у:</target>
 
@@ -495,9 +617,6 @@ The command is triggered if:
 <source>Generating database...</source>
 <target>Генерисање базе података...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Креирање Volume Shadow Copy за %x...</target>
-
 <source>Data verification error: %x and %y have different content.</source>
 <target>Грешка при провери података: %x и %y имају различит садржај.</target>
 
@@ -648,8 +767,8 @@ The command is triggered if:
 <source>&Export file list...</source>
 <target>&Извоз листе датотека...</target>
 
-<source>&Global settings...</source>
-<target>&Глобална подешавања...</target>
+<source>&Global settings</source>
+<target>&Глобална подешавања</target>
 
 <source>&Tools</source>
 <target>&Алати</target>
@@ -729,6 +848,12 @@ The command is triggered if:
 <source>&Pause</source>
 <target>&Пауза</target>
 
+<source>Variant</source>
+<target>Варијанта</target>
+
+<source>Statistics</source>
+<target>Статистика</target>
+
 <source>Select a variant</source>
 <target>Одаберите варијанту</target>
 
@@ -801,27 +926,15 @@ is the same
 <source>Delete or overwrite files permanently</source>
 <target>Трајно избриши или замени датотеке</target>
 
-<source>Recycle Bin</source>
-<target>Корпа за смеће</target>
-
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Користи Корпу за смеће за избрисане и замењене датотеке</target>
-
 <source>Versioning</source>
 <target>Верзионирање</target>
 
-<source>Move files to user-defined folder</source>
-<target>Премести датотеке у кориснички одабран фолдер</target>
-
 <source>Naming convention:</source>
 <target>Правило именовања:</target>
 
 <source>Batch job</source>
 <target>Беч задатак</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>Exit</source>
 <target>Изађи</target>
 
@@ -873,15 +986,6 @@ is the same
 <source>Delete on both sides even if the file is selected on one side only</source>
 <target>Избриши на обе стране чак иако је датотека селектована само на једној страни</target>
 
-<source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
-</source>
-<target>
-Само датотеке које одговарају свим филтерским подешавањима биће синхронизоване.
-Напомена: Имена датотека морају бити релативна према основним фолдерима.
-</target>
-
 <source>Include</source>
 <target>Укључи</target>
 
@@ -909,21 +1013,12 @@ Note: File names must be relative to base directories.
 <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>
-
 <source>Copy locked files</source>
 <target>Копирај закључане датотеке</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Копирај дељене или закључане датотеке користећи Volume Shadow Copy Сервис (Потребна администраторска права)</target>
-
 <source>Copy file access permissions</source>
 <target>Копирај овлашћења приступа датотекама</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Премести овлашћења приступа датотека (Потребна администраторска права)</target>
-
 <source>Restore hidden dialogs</source>
 <target>Прикажи скривене диалоге</target>
 
@@ -936,15 +1031,6 @@ Note: File names must be relative to base directories.
 <source>&Default</source>
 <target>&Подразумевано</target>
 
-<source>Variant</source>
-<target>Варијанта</target>
-
-<source>Statistics</source>
-<target>Статистика</target>
-
-<source>Don't show this dialog again</source>
-<target>Не приказуј овај диалог поновно</target>
-
 <source>Find what:</source>
 <target>Нађи шта:</target>
 
@@ -954,15 +1040,15 @@ Note: File names must be relative to base directories.
 <source>&Find next</source>
 <target>&Нађи следеће</target>
 
+<source>Start synchronization</source>
+<target>Почни синхронизацију</target>
+
 <source>Delete</source>
 <target>Избриши</target>
 
 <source>Configure filter</source>
 <target>Конфигуриши филтер</target>
 
-<source>Start synchronization</source>
-<target>Почни синхронизацију</target>
-
 <source>Find</source>
 <target>Пронађи</target>
 
@@ -1035,12 +1121,12 @@ Note: File names must be relative to base directories.
 <source>Include temporarily</source>
 <target>Тренутно укључи</target>
 
-<source>Exclude via filter:</source>
-<target>Искључи преко филтера:</target>
-
 <source>multiple selection</source>
 <target>вишеструки одабир</target>
 
+<source>Exclude via filter:</source>
+<target>Искључи преко филтера:</target>
+
 <source>Include all</source>
 <target>Укључи све</target>
 
@@ -1086,9 +1172,6 @@ Note: File names must be relative to base directories.
 <source>Do&n't save</source>
 <target>Не&мој сачувати</target>
 
-<source>Never save changes</source>
-<target>Немој никад сачувати промене</target>
-
 <source>Show files that exist on left side only</source>
 <target>Прикажи датотеке које постоје само на левој страни</target>
 
@@ -1140,27 +1223,18 @@ Note: File names must be relative to base directories.
 <source>All folders are in sync</source>
 <target>Сви фолдери су синхронизовани</target>
 
-<source>Comma separated list</source>
-<target>Зарезом одвојене листе</target>
-
 <source>File list exported</source>
 <target>Листа датотека експортована</target>
 
 <source>Searching for program updates...</source>
 <target>Претражујем ажурирање за програм...</target>
 
-<source>Ignore further errors</source>
-<target>Занемари даље грешке</target>
-
 <source>&Ignore</source>
 <target>&Игнориши</target>
 
 <source>Fatal Error</source>
 <target>Критична грешка</target>
 
-<source>Don't show this warning again</source>
-<target>Не приказуј ово упозорење поновно</target>
-
 <source>&Switch</source>
 <target>&Замени</target>
 
@@ -1194,15 +1268,6 @@ Note: File names must be relative to base directories.
 <source>Completed</source>
 <target>Завршено</target>
 
-<source>Continue</source>
-<target>Настави</target>
-
-<source>Pause</source>
-<target>Пауза</target>
-
-<source>Logging</source>
-<target>Лог записивање</target>
-
 <source>Cannot find %x</source>
 <target>Немогу пронаћи %x</target>
 
@@ -1237,16 +1302,6 @@ Note: File names must be relative to base directories.
 <target>Филтрирање</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>Да ли стварно желите да преместите следећу %x ставку у Корпи за смеће?</pluralform>
-<pluralform>Да ли стварно желите да преместите следеће %x ставке у Корпи за смеће?</pluralform>
-<pluralform>Да ли стварно желите да преместите следећих %x ставки у Корпи за смеће?</pluralform>
-</target>
-
-<source>
 <pluralform>Do you really want to delete the following item?</pluralform>
 <pluralform>Do you really want to delete the following %x items?</pluralform>
 </source>
@@ -1298,9 +1353,6 @@ Note: File names must be relative to base directories.
 <source>Append a timestamp to each file name</source>
 <target>Додај временску ознаку сваком имену датотеке</target>
 
-<source>Folder</source>
-<target>Фолдер</target>
-
 <source>File</source>
 <target>Датотека</target>
 
@@ -1424,9 +1476,6 @@ Note: File names must be relative to base directories.
 <source>Cannot change process I/O priorities.</source>
 <target>Не може се променити процес I/O приоритета</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Није могуће пребацити %x у Корпи за смеће.</target>
-
 <source>Cannot determine final path for %x.</source>
 <target>Не могу утврдити коначну путању за %x.</target>
 
diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index a5bed20e..0f83331f 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -7,99 +7,6 @@
 	<plural_definition>n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3</plural_definition>
 </header>
 
-<source>Log</source>
-<target></target>
-
-<source>&Continue</source>
-<target></target>
-
-<source>Comma-separated values</source>
-<target></target>
-
-<source>&Don't show this dialog again</source>
-<target></target>
-
-<source>&Execute</source>
-<target></target>
-
-<source>Confirm</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target></target>
-
-<source>Minimize to notification area</source>
-<target></target>
-
-<source>Retrying operation after error:</source>
-<target></target>
-
-<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
-<target></target>
-
-<source>&Show error</source>
-<target></target>
-
-<source>Waiting until all directories are available...</source>
-<target></target>
-
-<source>Directory monitoring active</source>
-<target></target>
-
-<source>Volume name %x is not part of file path %y.</source>
-<target></target>
-
-<source>%x items</source>
-<target></target>
-
-<source>
-<pluralform>1 thread</pluralform>
-<pluralform>%x threads</pluralform>
-</source>
-<target></target>
-
-<source>
-<pluralform>1 byte</pluralform>
-<pluralform>%x bytes</pluralform>
-</source>
-<target></target>
-
-<source>Any number of alternative directories for at most one config file.</source>
-<target></target>
-
-<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
-<target></target>
-
-<source>directory</source>
-<target></target>
-
-<source>config files</source>
-<target></target>
-
-<source>Syntax:</source>
-<target></target>
-
-<source>Directories cannot be set for more than one configuration file.</source>
-<target></target>
-
-<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
-<target></target>
-
-<source>Unequal number of left and right directories specified.</source>
-<target></target>
-
-<source>Cannot open file %x.</source>
-<target></target>
-
-<source>Syntax error</source>
-<target></target>
-
-<source>A directory path is expected after %x.</source>
-<target></target>
-
 <source>Both sides have changed since last synchronization.</source>
 <target>Obe strani sta se spremenili od zadnje sinhronizacije.</target>
 
@@ -118,13 +25,13 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Preverjam razpoložljivost koša za mapo %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>Premikam datoteko %x v koš</target>
+<source>Moving file %x to the recycle bin</source>
+<target>Premikam datoteko %x koš</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>Premikam mapo %x v koš</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>Premikam imenik %x v koš</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
+<source>Moving symbolic link %x to the recycle bin</source>
 <target>Premikam simbolično povezavo %x v koš</target>
 
 <source>Deleting file %x</source>
@@ -136,21 +43,54 @@
 <source>Deleting symbolic link %x</source>
 <target>Brisanje simboličnih povezav %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>Za naslednje mape Koš ni na voljo. Datoteke bodo zato dokončno izbrisane:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Za sledeče imenike koš ni na voljo. Datoteke bodo namesto tega dokončno izbrisane:</target>
 
 <source>An exception occurred</source>
 <target>Zgodila se je napaka</target>
 
+<source>A directory path is expected after %x.</source>
+<target>Za %x se pričakuje pot do imenika.</target>
+
+<source>Syntax error</source>
+<target>Sintaktična napaka</target>
+
+<source>Cannot open file %x.</source>
+<target>Ne morem odpreti datoteke %x.</target>
+
 <source>Error</source>
 <target>Napaka</target>
 
 <source>File %x does not contain a valid configuration.</source>
 <target>Datoteka %x ne vsebuje veljavnih nastavitev</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Vnešeno je neenako število levih in desnih imenikov.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Konfiguracijska datoteka ne sme vsebovati nastavitev na ravni imeniških parov, če so imeniki nastavljeni prek ukazne vrstice.</target>
+
 <source>Warning</source>
 <target>Pozor</target>
 
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Imeniki ne morejo biti nastavljeni za eč kot eno konfiguracijsko datoteko.</target>
+
+<source>Syntax:</source>
+<target>Sintaksa:</target>
+
+<source>config files</source>
+<target>konfiguracijske datoteke</target>
+
+<source>directory</source>
+<target>imenik</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Poljubno število FreeFileSync .ffs_gui in/ali .ffs_batch konfigracijskih datotek.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Poljubno število alternatvnih imenikov za največ eno konfiguracijsko datoteko.</target>
+
 <source>Command line</source>
 <target>Ukazna vrstica</target>
 
@@ -312,6 +252,17 @@
 <source>Total time:</source>
 <target>Celoten čas:</target>
 
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
+<target>
+<pluralform>%x bajt</pluralform>
+<pluralform>%x bajta</pluralform>
+<pluralform>%x bajti</pluralform>
+<pluralform>%x bajtov</pluralform>
+</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -330,12 +281,26 @@
 <source>Scanning:</source>
 <target>Pregledujem:</target>
 
+<source>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
+</source>
+<target>
+<pluralform>%x nit</pluralform>
+<pluralform>%x niti</pluralform>
+<pluralform>%x niti</pluralform>
+<pluralform>%x niti</pluralform>
+</target>
+
 <source>Encoding extended time information: %x</source>
 <target>Podrobne informacije o času enkodiranja: %x</target>
 
 <source>/sec</source>
 <target>/sek</target>
 
+<source>%x items</source>
+<target>%x elementov</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Nastavitvena datoteka %x naložena samo delno.</target>
 
@@ -348,8 +313,8 @@
 <source>Browse directory</source>
 <target>Brskaj po imeniku</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Ne morem dostopati do servisa Volume Shadow Copy</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Ne morem dostopati do Volume Shadov Copy servisa.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Prosimo uporabite 64-bitno različico FreeFileSync za ustvarjanje senčnih kopij na tem sistemu.</target>
@@ -360,6 +325,9 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Ne morem določiti ime nosilca za %x.</target>
 
+<source>Volume name %x is not part of file path %y.</source>
+<target>Ime nosilca %x ni del poti datoteke %y.</target>
+
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Zahtevana je bila prekinitev: čakam, da se zaključi trenutna operacija...</target>
 
@@ -458,9 +426,18 @@ Ukaz se sproži če:
 <source>All files</source>
 <target>Vse datoteke</target>
 
+<source>Directory monitoring active</source>
+<target>Nadzor imenikov je aktven</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Čakam da so vsi imeniki dostopni...</target>
+
 <source>&Restore</source>
 <target>&Obnovi</target>
 
+<source>&Show error</source>
+<target>&Pokaži napako</target>
+
 <source>&Exit</source>
 <target>&Izhod</target>
 
@@ -536,6 +513,9 @@ Ukaz se sproži če:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Naslednji elementi imajo nerešene konflikte in ne bodo sinhronizirani:</target>
 
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Naslednji imeniki so občutno različni. Preverite, če primerjate pravilne imenike za sinhnorizacijo.</target>
+
 <source>Not enough free disk space available in:</source>
 <target>Na voljo ni dovolj prostega prostora na disku v:</target>
 
@@ -554,12 +534,15 @@ Ukaz se sproži če:
 <source>Generating database...</source>
 <target>Ustvarjam podatkovno bazo...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Ustvarjam Senčno kopijo nosilca za %x...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Ustvarjam Volume Shadow Copy za %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Napaka pri preverjanju podatkov: %x in %y imata drugačno vsebino.</target>
 
+<source>job name</source>
+<target>naziv opravila</target>
+
 <source>Synchronization aborted</source>
 <target>Sinhronizacija prekinjena</target>
 
@@ -584,6 +567,9 @@ Ukaz se sproži če:
 <source>Switching to FreeFileSync main dialog</source>
 <target>Preklapljam na FreeFileSync osrednje pogovorno okno</target>
 
+<source>Retrying operation after error:</source>
+<target>Operacija za ponoven poiskus po napaki:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Nova različica FreeFileSync je na voljo:</target>
 
@@ -707,8 +693,8 @@ Ukaz se sproži če:
 <source>&Export file list...</source>
 <target>&Izvozi seznam datotek...</target>
 
-<source>&Global settings...</source>
-<target>&Globalne nastavitve...</target>
+<source>&Global settings</source>
+<target>&Globalne nastavitve</target>
 
 <source>&Tools</source>
 <target>&Orodja</target>
@@ -725,12 +711,6 @@ Ukaz se sproži če:
 <source>Compare</source>
 <target>Primerjaj</target>
 
-<source>Comparison settings</source>
-<target>Nastavitve primerjanja</target>
-
-<source>Synchronization settings</source>
-<target>Nastavitve sinhronizacije</target>
-
 <source>Synchronize</source>
 <target>Sinhroniziraj</target>
 
@@ -779,6 +759,9 @@ Ukaz se sproži če:
 <source>Synchronizing...</source>
 <target>Sinhroniziram...</target>
 
+<source>Minimize to notification area</source>
+<target>Pomanjšaj v območje obvestil</target>
+
 <source>On completion</source>
 <target>Ob zaključku</target>
 
@@ -794,8 +777,8 @@ Ukaz se sproži če:
 <source>Statistics</source>
 <target>Statistika</target>
 
-<source>Don't show this dialog again</source>
-<target>Ne prikazuj več tega pogovora</target>
+<source>&Don't show this dialog again</source>
+<target>&Ne pokaži več tega sporočila</target>
 
 <source>Select a variant</source>
 <target>Izberite spremenljivko</target>
@@ -845,6 +828,12 @@ enaka
 <source>Configure your own synchronization rules.</source>
 <target>Konfigurirajte vaša lastna sinhronizacijska pravila.</target>
 
+<source>Detect moved files</source>
+<target>Zaznaj premaknjene datoteke</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Zahteva podatkovno bazo. Ni podprt s strani vseh datotečnih sistemov.</target>
+
 <source>Error handling</source>
 <target>Napaka pri obravnavanju</target>
 
@@ -869,17 +858,17 @@ enaka
 <source>Delete or overwrite files permanently</source>
 <target>Trajno izbriši ali prepiši datoteke</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Koš</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Uporabi Koš za izbrisane in prepisane datoteke</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Naredi varnostno kopijo izbrisanih in prepisanih datotek v koš</target>
 
 <source>Versioning</source>
 <target>Ustvarjanje različič</target>
 
-<source>Move files to user-defined folder</source>
-<target>Premakni datoteke v uporabniško-definirano mapo</target>
+<source>Move files to a user-defined folder</source>
+<target>Premakni datoteke v izbran imenik</target>
 
 <source>Naming convention:</source>
 <target>Konvencija poimenovanja:</target>
@@ -887,8 +876,8 @@ enaka
 <source>Batch job</source>
 <target>Paketno opravilo</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Ustvari skriptno datoteko za samodejno sinhnorizacijo. Za zagon dvojno kliknite to datoteko ali pa jo umestite v razporejevalnik opravil: %x</target>
 
 <source>Exit</source>
 <target>Izhod</target>
@@ -911,30 +900,6 @@ enaka
 <source>Limit maximum number of log files</source>
 <target>Omeji maksimalno število datotek beleženja</target>
 
-<source>Source code written in C++ using:</source>
-<target>Izvorna koda napisana v C++ z uporabo:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Če vam je FreeFileSync všeč</target>
-
-<source>Donate with PayPal</source>
-<target>Doniraj s PayPal</target>
-
-<source>Many thanks for localization:</source>
-<target>Zahvale za lokalizacijo:</target>
-
-<source>Feedback and suggestions are welcome</source>
-<target>Povratne informacije in predlogi so dobrodošli</target>
-
-<source>Homepage</source>
-<target>Domača stran</target>
-
-<source>Email</source>
-<target>Email</target>
-
-<source>Published under the GNU General Public License</source>
-<target>Objavljeno pod licenco GNU General Public</target>
-
 <source>Delete on both sides</source>
 <target>Izbriši na obeh straneh</target>
 
@@ -942,12 +907,12 @@ enaka
 <target>Izbriši na obeh straneh, četudi je datoteka izbrana na samo eni strani</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Samo datoteke, ki ustrezajo vsem nastavitvam filtra bodo sinhronizirane.
-Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
+Datoteke bodo sinhnorizirane samo, če bodo zadoščale vsem filtrirnim pravilom.
+Opomba: Poti datotek morajo biti relativne na osnovne imenike.
 </target>
 
 <source>Include</source>
@@ -977,20 +942,20 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Najprej kopiraj v začasno datoteko (*.ffs_tmp) nato pa jo preimenuj. To zagotavlja konsistenco podatkov v primeru kritične napake.</target>
 
 <source>Copy locked files</source>
 <target>Kopiraj zaklenjene datoteke</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Kopiraj deljene ali zaklenjene datoteke z uporabo servisa Shadow Copy (Zahteva pravice skrbnika)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Kopiraj zaklenjene ali imenike v souporabi s pomočjo Volume Shadow Copy servisa (zahteva pravice administratorja)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopiraj dovoljenja dostopov datoteke</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Prenesi dovoljenja datotek in map (Zahteva pravice Skrbnika)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Prenesi pravice datotek in imenikov (zahteva pravice administratorja)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Obnovi skrite pogovore</target>
@@ -1013,9 +978,39 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <source>&Find next</source>
 <target>&Najdi naslednje</target>
 
+<source>Source code written in C++ using:</source>
+<target>Izvorna koda napisana v C++ z uporabo:</target>
+
+<source>If you like FreeFileSync</source>
+<target>Če vam je FreeFileSync všeč</target>
+
+<source>Donate with PayPal</source>
+<target>Doniraj s PayPal</target>
+
+<source>Feedback and suggestions are welcome</source>
+<target>Povratne informacije in predlogi so dobrodošli</target>
+
+<source>Homepage</source>
+<target>Domača stran</target>
+
+<source>Email</source>
+<target>Email</target>
+
+<source>Published under the GNU General Public License</source>
+<target>Objavljeno pod licenco GNU General Public</target>
+
+<source>Many thanks for localization:</source>
+<target>Zahvale za lokalizacijo:</target>
+
 <source>Start synchronization</source>
 <target>Začni sinhronizacijo</target>
 
+<source>Comparison settings</source>
+<target>Nastavitve primerjanja</target>
+
+<source>Synchronization settings</source>
+<target>Nastavitve sinhronizacije</target>
+
 <source>Delete</source>
 <target>Izbriši</target>
 
@@ -1056,6 +1051,23 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <target>Primerjaj obe strani</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Ali res želite izvesti ukaz %y za %x element?</pluralform>
+<pluralform>Ali res želite izvesti ukaz %y za %x elementa?</pluralform>
+<pluralform>Ali res želite izvesti ukaz %y za %x elemente?</pluralform>
+<pluralform>Ali res želite izvesti ukaz %y za %x elementov?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Potrdi</target>
+
+<source>&Execute</source>
+<target>&Izvedi</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1097,12 +1109,15 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <source>Include temporarily</source>
 <target>Trenutno vključi</target>
 
-<source>Exclude via filter:</source>
-<target>Izključi preko filtra:</target>
-
 <source>multiple selection</source>
 <target>mnogokratna izbira</target>
 
+<source>Include via filter:</source>
+<target>Vključi preko filtra:</target>
+
+<source>Exclude via filter:</source>
+<target>Izključi preko filtra:</target>
+
 <source>Include all</source>
 <target>Vključi vse</target>
 
@@ -1148,8 +1163,8 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <source>Do&n't save</source>
 <target>Ne shra&ni</target>
 
-<source>Never save changes</source>
-<target>Nikoli ne shrani sprememb</target>
+<source>Never save &changes</source>
+<target>Nikoli ne shrani &sprememb</target>
 
 <source>Show files that exist on left side only</source>
 <target>Prikaži datoteke, ki obstajajo samo na levi</target>
@@ -1202,14 +1217,17 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <source>All folders are in sync</source>
 <target>Vse mape so sinhronizirane</target>
 
+<source>Comma-separated values</source>
+<target>Vrednosti ločene z vejico</target>
+
 <source>File list exported</source>
 <target>Seznam datotek je bil izvožen</target>
 
 <source>Searching for program updates...</source>
 <target>Iščem posodobitve programa...</target>
 
-<source>Ignore further errors</source>
-<target>Ignoriraj nadaljnje napake</target>
+<source>&Ignore subsequent errors</source>
+<target>&Ignoriraj nadaljnje napake</target>
 
 <source>&Ignore</source>
 <target>&Ignoriraj</target>
@@ -1217,8 +1235,8 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <source>Fatal Error</source>
 <target>Usodna napaka</target>
 
-<source>Don't show this warning again</source>
-<target>Ne prikaži več tega opozorila</target>
+<source>&Don't show this warning again</source>
+<target>&Ne pokaži več tega opozorila</target>
 
 <source>&Switch</source>
 <target>&Preklopi</target>
@@ -1253,6 +1271,12 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <source>Completed</source>
 <target>Zaključeno</target>
 
+<source>&Continue</source>
+<target>&Nadaljuj</target>
+
+<source>Log</source>
+<target>Dnevnik</target>
+
 <source>Cannot find %x</source>
 <target>Ne najdem %x</target>
 
@@ -1287,14 +1311,14 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <target>Filter</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>Ali resnično želite premakniti sledeči %xelement v Koš?</pluralform>
-<pluralform>Ali resnično želite premakniti naslednja %x elementa v Koš?</pluralform>
-<pluralform>Ali resnično želite premakniti naslednje %x elemente v Koš?</pluralform>
-<pluralform>Ali resnično želite premakniti naslednjih %x elementov v Koš?</pluralform>
+<pluralform>Ali res želite premakniti sledeč %x element v koš?</pluralform>
+<pluralform>Ali res želite premakniti sledeča %x elementa v koš?</pluralform>
+<pluralform>Ali res želite premakniti sledeče %x elemente v koš?</pluralform>
+<pluralform>Ali res želite premakniti sledečih %x elementov v koš?</pluralform>
 </target>
 
 <source>
@@ -1476,8 +1500,8 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <source>Cannot change process I/O priorities.</source>
 <target>Ne morem spremeniti V/I prioritet procesa.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Ne morem premakniti %x v Koš.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>Ne morem premakniti %x v koš-</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>Ne morem določiti končne poti za %x.</target>
diff --git a/BUILD/Languages/spanish.lng b/BUILD/Languages/spanish.lng
index e1726b2b..507b977a 100644
--- a/BUILD/Languages/spanish.lng
+++ b/BUILD/Languages/spanish.lng
@@ -7,104 +7,11 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
-<source>Log</source>
-<target></target>
-
-<source>&Continue</source>
-<target></target>
-
-<source>Comma-separated values</source>
-<target></target>
-
-<source>&Don't show this dialog again</source>
-<target></target>
-
-<source>&Execute</source>
-<target></target>
-
-<source>Confirm</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
-<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
-</source>
-<target></target>
-
-<source>Minimize to notification area</source>
-<target></target>
-
-<source>Retrying operation after error:</source>
-<target></target>
-
-<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
-<target></target>
-
-<source>&Show error</source>
-<target></target>
-
-<source>Waiting until all directories are available...</source>
-<target></target>
-
-<source>Directory monitoring active</source>
-<target></target>
-
-<source>Volume name %x is not part of file path %y.</source>
-<target></target>
-
-<source>%x items</source>
-<target></target>
-
-<source>
-<pluralform>1 thread</pluralform>
-<pluralform>%x threads</pluralform>
-</source>
-<target></target>
-
-<source>
-<pluralform>1 byte</pluralform>
-<pluralform>%x bytes</pluralform>
-</source>
-<target></target>
-
-<source>Any number of alternative directories for at most one config file.</source>
-<target></target>
-
-<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
-<target></target>
-
-<source>directory</source>
-<target></target>
-
-<source>config files</source>
-<target></target>
-
-<source>Syntax:</source>
-<target></target>
-
-<source>Directories cannot be set for more than one configuration file.</source>
-<target></target>
-
-<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
-<target></target>
-
-<source>Unequal number of left and right directories specified.</source>
-<target></target>
-
-<source>Cannot open file %x.</source>
-<target></target>
-
-<source>Syntax error</source>
-<target></target>
-
-<source>A directory path is expected after %x.</source>
-<target></target>
-
 <source>Both sides have changed since last synchronization.</source>
 <target>Ambos lados han cambiado desde la última sincronización.</target>
 
 <source>Cannot determine sync-direction:</source>
-<target>No se puede determinar la dirección de la sincronización:</target>
+<target>No se puede determinar la dirección de sincronización:</target>
 
 <source>No change since last synchronization.</source>
 <target>Ningún cambio desde la última sincronización.</target>
@@ -118,13 +25,13 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Comprobando disponibilidad de la papelera de reciclaje para la carpeta %x…</target>
 
-<source>Moving file %x to recycle bin</source>
+<source>Moving file %x to the recycle bin</source>
 <target>Mover archivo %x a la papelera de reciclaje</target>
 
-<source>Moving folder %x to recycle bin</source>
+<source>Moving folder %x to the recycle bin</source>
 <target>Mover carpeta %x a la papelera de reciclaje</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
+<source>Moving symbolic link %x to the recycle bin</source>
 <target>Mover vínculo simbólico %x a la papelera de reciclaje</target>
 
 <source>Deleting file %x</source>
@@ -136,21 +43,54 @@
 <source>Deleting symbolic link %x</source>
 <target>Borrar vínculo simbólico %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>La Papelera de reciclaje no está disponible para las carpetas siguientes. Los archivos se borrarán de forma permanente:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>La papelera de reciclaje no está disponible para las carpetas siguientes. Los archivos se borrarán de forma permanente:</target>
 
 <source>An exception occurred</source>
 <target>Ha ocurrido una excepción</target>
 
+<source>A directory path is expected after %x.</source>
+<target>Se esperaba una ruta de directorio después de %x.</target>
+
+<source>Syntax error</source>
+<target>Error de sintaxis</target>
+
+<source>Cannot open file %x.</source>
+<target>No se puede abrir el archivo %x.</target>
+
 <source>Error</source>
 <target>Error</target>
 
 <source>File %x does not contain a valid configuration.</source>
 <target>El archivo %x no contiene una configuración válida.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Desigualdad en el número de directorios especificados a izquierda y derecha.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>El archivo de configuración no debe incluir parámetros al nivel de un par de directorios cuando éstos se especifican desde la línea de comandos.</target>
+
 <source>Warning</source>
 <target>Atención</target>
 
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>No se pueden definir directorios para más de un archivo de configuración.</target>
+
+<source>Syntax:</source>
+<target>Sintaxis:</target>
+
+<source>config files</source>
+<target>archivos de configuración</target>
+
+<source>directory</source>
+<target>directorio</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Cualquier número de archivos de configuración de FreeFileSync (.ffs_gui ó .ffs_batch).</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Cualquier número de directorios alternativos para un archivo de configuración como máximo.</target>
+
 <source>Command line</source>
 <target>Línea de comandos</target>
 
@@ -209,10 +149,10 @@
 <target>El elemento existe sólo en el lado derecho</target>
 
 <source>Left side is newer</source>
-<target>El lado izquierdo es más nuevo</target>
+<target>El lado izquierdo es más reciente</target>
 
 <source>Right side is newer</source>
-<target>El lado derecho es más nuevo</target>
+<target>El lado derecho es más reciente</target>
 
 <source>Items have different content</source>
 <target>Los elementos tienen contenido distinto</target>
@@ -221,7 +161,7 @@
 <target>Ambos lados son iguales</target>
 
 <source>Conflict/item cannot be categorized</source>
-<target>Conflicto</target>
+<target>No se puede categorizar el conflicto o elemento</target>
 
 <source>Copy new item to left</source>
 <target>Copiar nuevo elemento a la izquierda</target>
@@ -257,31 +197,31 @@
 <target>Actualizar atributos en la derecha</target>
 
 <source>Database file %x is incompatible.</source>
-<target>El archivo de base de datos %x es incompatible</target>
+<target>El archivo de base de datos %x es incompatible.</target>
 
 <source>Initial synchronization:</source>
 <target>Sincronización inicial:</target>
 
 <source>Database file %x does not yet exist.</source>
-<target>El archivo de base de datos %x aún no existe</target>
+<target>El archivo de base de datos %x aún no existe.</target>
 
 <source>Database file is corrupt:</source>
 <target>El archivo de base de datos está dañado:</target>
 
 <source>Cannot write file %x.</source>
-<target>No se puede escribir el archivo %x</target>
+<target>No se puede escribir el archivo %x.</target>
 
 <source>Cannot read file %x.</source>
-<target>No se puede leer el archivo %x</target>
+<target>No se puede leer el archivo %x.</target>
 
 <source>Database files do not share a common session.</source>
-<target>Los archivos de base de datos no comparten una sesión común</target>
+<target>Los archivos de base de datos no comparten una sesión común.</target>
 
 <source>Searching for folder %x...</source>
 <target>Buscando carpeta %x…</target>
 
 <source>Cannot read file attributes of %x.</source>
-<target>No se puede leer archivo de atributos de %x</target>
+<target>No se puede leer archivo de atributos de %x.</target>
 
 <source>Cannot get process information.</source>
 <target>No se puede obtener información del proceso.</target>
@@ -310,6 +250,15 @@
 <source>Total time:</source>
 <target>Tiempo total:</target>
 
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
+<target>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -328,12 +277,24 @@
 <source>Scanning:</source>
 <target>Escanear:</target>
 
+<source>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
+</source>
+<target>
+<pluralform>1 hilo</pluralform>
+<pluralform>%x hilos</pluralform>
+</target>
+
 <source>Encoding extended time information: %x</source>
-<target>Condificando información de hora extendida: %x</target>
+<target>Codificando información de hora extendida: %x</target>
 
 <source>/sec</source>
 <target>/seg</target>
 
+<source>%x items</source>
+<target>%x elementos</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Archivo de configuración %x cargado sólo parcialmente.</target>
 
@@ -346,7 +307,7 @@
 <source>Browse directory</source>
 <target>Examinar directorio</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
+<source>Cannot access the Volume Shadow Copy Service.</source>
 <target>No se puede acceder al servicio de Instantánea de volumen.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
@@ -358,6 +319,9 @@
 <source>Cannot determine volume name for %x.</source>
 <target>No se puede determinar nombre del volumen de %x.</target>
 
+<source>Volume name %x is not part of file path %y.</source>
+<target>El nombre de volumen %x no es parte de la ruta de archivo %y.</target>
+
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Anulación solicitada: esperando a que la operación actual finalice…</target>
 
@@ -401,7 +365,7 @@
 <target>3. Presione ’Inicio’.</target>
 
 <source>To get started just import a .ffs_batch file.</source>
-<target>Para comenzar, importe un archivo .ffs_batch</target>
+<target>Para comenzar, importe un archivo .ffs_batch.</target>
 
 <source>Folders to watch</source>
 <target>Carpetas para ver</target>
@@ -430,9 +394,9 @@ The command is triggered if:
 - new folders arrive (e.g. USB stick insert)
 </source>
 <target>
-El comando es disparado si::
+El comando es disparado si:
 - hay cambios en los archivos o subcarpetas
-- aparecen nuevas carpetas (Insertando una memoria USB, por ejemplo)
+- aparecen nuevas carpetas (en una memoria USB, por ejemplo)
 </target>
 
 <source>Start</source>
@@ -456,9 +420,18 @@ El comando es disparado si::
 <source>All files</source>
 <target>Todos los archivos</target>
 
+<source>Directory monitoring active</source>
+<target>Supervisión de directorios activada</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Esperando que todos los directorios estén disponibles…</target>
+
 <source>&Restore</source>
 <target>&Restaurar</target>
 
+<source>&Show error</source>
+<target>Mo&strar error</target>
+
 <source>&Exit</source>
 <target>&Salir</target>
 
@@ -472,7 +445,7 @@ El comando es disparado si::
 <target>Fecha y tamaño del archivo</target>
 
 <source>Two way</source>
-<target>Dos formas</target>
+<target>Bidireccional</target>
 
 <source>Mirror</source>
 <target>Espejo</target>
@@ -534,6 +507,9 @@ El comando es disparado si::
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Los siguientes elementos tienen conflictos sin resolver y no serán sincronizados:</target>
 
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Las carpetas siguientes muestran diferencias significativas. Compruebe que hace coincidir las carpetas correctas para su sincronización.</target>
+
 <source>Not enough free disk space available in:</source>
 <target>Espacio en disco insuficiente en:</target>
 
@@ -552,12 +528,15 @@ El comando es disparado si::
 <source>Generating database...</source>
 <target>Generando base de datos…</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Creando Instantánea de volumen para %x…</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Creando una Instantánea de volumen para %x…</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Error al comprobar los datos: %x y %y tienen contenidos diferentes.</target>
 
+<source>job name</source>
+<target>nombre de tarea</target>
+
 <source>Synchronization aborted</source>
 <target>Sincronización anulada</target>
 
@@ -582,6 +561,9 @@ El comando es disparado si::
 <source>Switching to FreeFileSync main dialog</source>
 <target>Cambiando a la ventana principal de FreeFileSync</target>
 
+<source>Retrying operation after error:</source>
+<target>Reintento de operación después de error:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Una nueva versión de FreeFileSync está disponible:</target>
 
@@ -691,7 +673,7 @@ El comando es disparado si::
 <target>&Guardar</target>
 
 <source>Save as &batch job...</source>
-<target>Guardar como trabajo &batch …</target>
+<target>Guardar como tarea &lote…</target>
 
 <source>1. &Compare</source>
 <target>1. &Comparar</target>
@@ -705,8 +687,8 @@ El comando es disparado si::
 <source>&Export file list...</source>
 <target>&Exportar lista de archivos…</target>
 
-<source>&Global settings...</source>
-<target>&Opciones globales…</target>
+<source>&Global settings</source>
+<target>&Opciones globales</target>
 
 <source>&Tools</source>
 <target>Herramien&tas</target>
@@ -742,7 +724,7 @@ El comando es disparado si::
 <target>Intercambiar lados</target>
 
 <source>Save as batch job</source>
-<target>Salvar como tarea batch</target>
+<target>Salvar como tarea lote</target>
 
 <source>Hide excluded items</source>
 <target>Ocultar elementos excluidos</target>
@@ -777,6 +759,9 @@ El comando es disparado si::
 <source>Synchronizing...</source>
 <target>Sincronizando…</target>
 
+<source>Minimize to notification area</source>
+<target>Minimizar en el área de notificación</target>
+
 <source>On completion</source>
 <target>Al completar</target>
 
@@ -792,8 +777,8 @@ El comando es disparado si::
 <source>Statistics</source>
 <target>Estadísticas</target>
 
-<source>Don't show this dialog again</source>
-<target>No volver a mostrar este diálogo</target>
+<source>&Don't show this dialog again</source>
+<target>&No volver a mostrar este diálogo</target>
 
 <source>Select a variant</source>
 <target>Seleccione una variante</target>
@@ -843,6 +828,12 @@ es el mismo
 <source>Configure your own synchronization rules.</source>
 <target>Configuración de sus propias reglas de sincronización.</target>
 
+<source>Detect moved files</source>
+<target>Detectar archivos movidos</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Archivos de base de datos requeridos. No son compatibles en todos los sistemas de archivos.</target>
+
 <source>Error handling</source>
 <target>Gestión de errores</target>
 
@@ -867,26 +858,26 @@ es el mismo
 <source>Delete or overwrite files permanently</source>
 <target>Borrar o Sobrescribir archivos permanentemente</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Papelera de reciclaje</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Utilizar la papelera de reciclaje para archivos eliminados y sobrescritos</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Se eliminó la copia de respaldo y se reemplazaron archivos en la papelera de reciclaje</target>
 
 <source>Versioning</source>
 <target>Control de versiones</target>
 
-<source>Move files to user-defined folder</source>
-<target>Mover archivos a una carpeta definida por el usuario</target>
+<source>Move files to a user-defined folder</source>
+<target>Mover archivos a una carpeta del usuario</target>
 
 <source>Naming convention:</source>
 <target>Convención de nomenclatura:</target>
 
 <source>Batch job</source>
-<target>Tarea por lotes</target>
+<target>Tarea lote</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Crear archivo por lotes para sincronización desatendida. Para iniciar, haga doble clic en este archivo o prográmelo en el planificador de tareas : %x</target>
 
 <source>Exit</source>
 <target>Salir</target>
@@ -910,19 +901,19 @@ es el mismo
 <target>Limitar el número máximo de archivos de registro</target>
 
 <source>Source code written in C++ using:</source>
-<target>Código fuente escrito en C++ utilizando:</target>
+<target>Código fuente original en C++ con apoyo de:</target>
 
 <source>If you like FreeFileSync</source>
-<target>Si te gusta FreeFileSync</target>
+<target>¿Te gusta FreeFileSync? :</target>
 
 <source>Donate with PayPal</source>
-<target>Donar a través de PayPal</target>
+<target>Haz una donación por PayPal</target>
 
 <source>Many thanks for localization:</source>
 <target>Agradecimientos por las traducciones a:</target>
 
 <source>Feedback and suggestions are welcome</source>
-<target>Feedback y sugerencias son bienvenidas</target>
+<target>Comentarios y sugerencias bienvenidos :</target>
 
 <source>Homepage</source>
 <target>Página de inicio</target>
@@ -931,7 +922,7 @@ es el mismo
 <target>Correo electrónico</target>
 
 <source>Published under the GNU General Public License</source>
-<target>Publicado bajo GNU General Public License</target>
+<target>Publicado con derechos GNU General Public License :</target>
 
 <source>Delete on both sides</source>
 <target>Borrar en ambos lados</target>
@@ -940,12 +931,12 @@ es el mismo
 <target>Borrar en ambos lados incluso si el archivo está seleccionado en un solo lado</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Sólo archivos en que coincidan todos los filtros serán sincronizados.
-Aviso: Los nombres de archivos deben ser relativos a los directorios base.
+Sólo se sincronizarán los archivos que cumplan todos los filtros.
+Nota: las rutas de archivo deben ser relativas a los directorios base.
 </target>
 
 <source>Include</source>
@@ -975,20 +966,20 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
 <target>Escribir en archivo temporal (*.ffs_tmp) primero y después renombrarlo. Esto garantiza un estado consistente incluso en caso de error fatal.</target>
 
 <source>Copy locked files</source>
 <target>Copiar archivos bloqueados</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Copiar archivos compartidos o bloqueados usando el servicio "Instantánea de volumen" (Requiere derechos de administrador)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Copiar archivos compartidos o bloqueados usando el servicio de Instantánea de volumen (requiere derechos de administrador)</target>
 
 <source>Copy file access permissions</source>
 <target>Copiar permisos de acceso al archivo</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Transferir permisos de archivo y carpeta (Requiere derechos de Administrador)</target>
+<source>Transfer file and folder permissions (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>
@@ -1054,6 +1045,21 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <target>Comparar ambos lados</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>¿Realmente desea ejecutar la orden %y para un elemento?</pluralform>
+<pluralform>¿Realmente desea ejecutar la orden %y para %x elementos?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Confirmar</target>
+
+<source>&Execute</source>
+<target>&Ejecutar</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1089,12 +1095,15 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <source>Include temporarily</source>
 <target>Incluir temporalmente</target>
 
-<source>Exclude via filter:</source>
-<target>Excluir a través del filtro:</target>
-
 <source>multiple selection</source>
 <target>selección múltiple</target>
 
+<source>Include via filter:</source>
+<target>Incluir a través del filtro:</target>
+
+<source>Exclude via filter:</source>
+<target>Excluir a través del filtro:</target>
+
 <source>Include all</source>
 <target>Incluir todo</target>
 
@@ -1132,7 +1141,7 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <target>Configuración guardada</target>
 
 <source>FreeFileSync batch</source>
-<target>Batch de FreeFileSync</target>
+<target>Lote de FreeFileSync</target>
 
 <source>Do you want to save changes to %x?</source>
 <target>¿Quiere guardar los cambios de %x?</target>
@@ -1140,8 +1149,8 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <source>Do&n't save</source>
 <target>&No guardar</target>
 
-<source>Never save changes</source>
-<target>Nunca guardar cambios</target>
+<source>Never save &changes</source>
+<target>Nunca guardar &cambios</target>
 
 <source>Show files that exist on left side only</source>
 <target>Mostrar sólo archivos existentes en la izquierda</target>
@@ -1194,14 +1203,17 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <source>All folders are in sync</source>
 <target>Todas las carpetas están sincronizadas</target>
 
+<source>Comma-separated values</source>
+<target>Valores separados por comas</target>
+
 <source>File list exported</source>
 <target>Lista de archivos exportada</target>
 
 <source>Searching for program updates...</source>
 <target>Buscando actualizaciones del programa…</target>
 
-<source>Ignore further errors</source>
-<target>Ignorar más errores</target>
+<source>&Ignore subsequent errors</source>
+<target>&Ignorar errores posteriores</target>
 
 <source>&Ignore</source>
 <target>&Ignorar</target>
@@ -1209,8 +1221,8 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <source>Fatal Error</source>
 <target>Error fatal</target>
 
-<source>Don't show this warning again</source>
-<target>No volver a mostrar este aviso</target>
+<source>&Don't show this warning again</source>
+<target>&No volver a mostrar este aviso</target>
 
 <source>&Switch</source>
 <target>&Cambiar</target>
@@ -1245,6 +1257,12 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <source>Completed</source>
 <target>Terminado</target>
 
+<source>&Continue</source>
+<target>&Continuar</target>
+
+<source>Log</source>
+<target>Registro</target>
+
 <source>Cannot find %x</source>
 <target>No se puede encontrar %x</target>
 
@@ -1279,12 +1297,12 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <target>Filtro</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>¿Realmente desea mover este objeto a la papelera de reciclaje?</pluralform>
-<pluralform>¿Realmente desea mover estos %x objetos a la papelera de reciclaje?</pluralform>
+<pluralform>¿Realmente desea mover este elemento a la papelera de reciclaje?</pluralform>
+<pluralform>¿Realmente desea mover estos %x elementos a la papelera de reciclaje?</pluralform>
 </target>
 
 <source>
@@ -1456,10 +1474,10 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <target>Fallo al intentar suspender el sistema.</target>
 
 <source>Cannot change process I/O priorities.</source>
-<target>No se pudieron cambiar las priridades de E/S del proceso.</target>
+<target>No se pudieron cambiar las prioridades de E/S del proceso.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>No se puede mover %x a la Papelera de reciclaje.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>Incapaz de mover %x a la papelera de reciclaje.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>No se puede determinar la ruta final de %x.</target>
diff --git a/BUILD/Languages/swedish.lng b/BUILD/Languages/swedish.lng
index 8102e92b..f6e3f52b 100644
--- a/BUILD/Languages/swedish.lng
+++ b/BUILD/Languages/swedish.lng
@@ -25,13 +25,13 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Kontrollerar papperskorgens tillgänglighet för %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>Flyttar filen %x till papperskorgen</target>
+<source>Moving file %x to the recycle bin</source>
+<target>Flyttar %x till papperskorgen</target>
 
-<source>Moving folder %x to recycle bin</source>
+<source>Moving folder %x to the recycle bin</source>
 <target>Flyttar mappen %x till papperskorgen</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
+<source>Moving symbolic link %x to the recycle bin</source>
 <target>Flyttar den symboliska länken %x till papperskorgen</target>
 
 <source>Deleting file %x</source>
@@ -43,14 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>Tar bort den symboliska länken %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>Papperskorgen är inte tillgänglig för följande mappar. Filerna kommer att tas bort permanent istället:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Papperskorgen är inte tillgänglig för följande mappar. Filerna kommer istället att tas bort permanent:</target>
 
 <source>An exception occurred</source>
 <target>Ett undantag inträffade</target>
 
-<source>Cannot find file %x.</source>
-<target>Filen %x kan inte hittas</target>
+<source>A directory path is expected after %x.</source>
+<target>En sökväg förväntas efter %x.</target>
+
+<source>Syntax error</source>
+<target>Syntaxfel</target>
+
+<source>Cannot open file %x.</source>
+<target>Kan inte öppna %x</target>
 
 <source>Error</source>
 <target>Fel</target>
@@ -58,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>Filen %x innehåller ingen giltig konfiguration.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Ett ojämnt antal vänster- och högermappar har specificerats.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Konfigurationsfilen kan inte innehålla inställningar på katalogparnivå när mappar anges via kommandorad.</target>
+
+<source>Warning</source>
+<target>Varning</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Mappar kan inte anges för mer än en konfigurationsfil</target>
+
+<source>Syntax:</source>
+<target>Syntax:</target>
+
+<source>config files</source>
+<target>konfigurationsfiler</target>
+
+<source>directory</source>
+<target>mapp</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Valfritt antal FreeFileSync .ffs_gui och/eller .ffs_batch konfigurationsfiler.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Valfritt antal alternativa mappar för max en konfigurationsfil.</target>
+
+<source>Command line</source>
+<target>Kommandofält</target>
+
 <source>A folder input field is empty.</source>
 <target>Ett inmatningsfält är tomt</target>
 
@@ -215,12 +251,12 @@
 <target>Total tid:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Byte</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x byte</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -242,12 +278,12 @@
 <target>Skannar:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 tråd]</pluralform>
-<pluralform>[%x trådar]</pluralform>
+<pluralform>1 tråd</pluralform>
+<pluralform>%x trådar</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -256,6 +292,9 @@
 <source>/sec</source>
 <target>/s</target>
 
+<source>%x items</source>
+<target>%x objekt</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Konfigurationsfilen %x lästes bara delvis in.</target>
 
@@ -268,8 +307,8 @@
 <source>Browse directory</source>
 <target>Sök upp mapp</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Kan inte komma åt tjänsten Volume Shadow Copy.</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Kan inte komma åt tjänsten 'Volume Shadow Copy'</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Använd FreeFileSync 64-bitarsversion för att skapa skuggkopior på detta system.</target>
@@ -280,8 +319,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Kan inte utläsa volymnamn för %x</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Volymnamn %x saknas i filnamn %y.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>Volymnamnet %x är inte en del av sökvägen %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Avbryter: Väntar på att aktuell process skall slutföras...</target>
@@ -349,9 +388,6 @@
 <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>
 The command is triggered if:
 - files or subfolders change
@@ -375,9 +411,6 @@ Kommandot triggas om:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatiserad synkronisering</target>
 
-<source>Warning</source>
-<target>Varning</target>
-
 <source>Build: %x</source>
 <target>Bygge: %x</target>
 
@@ -387,15 +420,21 @@ Kommandot triggas om:
 <source>All files</source>
 <target>Alla filer</target>
 
+<source>Directory monitoring active</source>
+<target>Mappövervakning aktiv</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Väntar på att samtliga mappar skall bli tillgängliga...</target>
+
 <source>&Restore</source>
 <target>&Återställ</target>
 
+<source>&Show error</source>
+<target>&Visa fel</target>
+
 <source>&Exit</source>
 <target>&Avsluta</target>
 
-<source>Waiting for missing directories...</source>
-<target>Väntar på saknade mappsökvägar...</target>
-
 <source>Invalid command line:</source>
 <target>Ogiltig kommandorad:</target>
 
@@ -405,14 +444,14 @@ Kommandot triggas om:
 <source>File time and size</source>
 <target>Tidsstämpling och storlek</target>
 
-<source> Two way </source>
-<target> Tvåvägs </target>
+<source>Two way</source>
+<target>Tvåvägs</target>
 
 <source>Mirror</source>
-<target>Spegla </target>
+<target>Spegla</target>
 
 <source>Update</source>
-<target>Uppdatera </target>
+<target>Uppdatera</target>
 
 <source>Custom</source>
 <target>Anpassat</target>
@@ -468,11 +507,8 @@ Kommandot triggas om:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Följande objekt har olösta konflikter, och kommer inte att synkroniseras:</target>
 
-<source>Significant difference detected:</source>
-<target>Betydande skillnad upptäckt:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>mer än 50% av totalt filantal kommer att kopieras eller tas bort.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Följande mappar är signifikant olika. Kontrollera att du jämför rätt mappar för synkronisering.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Ej tillräckligt ledigt diskutrymme på:</target>
@@ -492,12 +528,15 @@ Kommandot triggas om:
 <source>Generating database...</source>
 <target>Skapar databas...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Skapar Volume Shadow Copy för %x...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Skapar en 'Volume Shadow Copy' för %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Dataverifieringsfel: %x och %y har olika innehåll.</target>
 
+<source>job name</source>
+<target>åtgärdsnamn</target>
+
 <source>Synchronization aborted</source>
 <target>Synkronisering avbruten</target>
 
@@ -522,6 +561,9 @@ Kommandot triggas om:
 <source>Switching to FreeFileSync main dialog</source>
 <target>Växlar till FreeFileSyncs huvuddialog</target>
 
+<source>Retrying operation after error:</source>
+<target>Försöker utföra åtgärden igen, efter fel:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Det finns en ny version av FreeFileSync</target>
 
@@ -645,8 +687,8 @@ Kommandot triggas om:
 <source>&Export file list...</source>
 <target>&Exportera fillista...</target>
 
-<source>&Global settings...</source>
-<target>&Allmäna inställningar...</target>
+<source>&Global settings</source>
+<target>&Allmäna inställningar</target>
 
 <source>&Tools</source>
 <target>&Verktyg</target>
@@ -717,6 +759,9 @@ Kommandot triggas om:
 <source>Synchronizing...</source>
 <target>Synkroniserar...</target>
 
+<source>Minimize to notification area</source>
+<target>Minimera till meddelandefältet</target>
+
 <source>On completion</source>
 <target>Vid slutfört</target>
 
@@ -726,6 +771,15 @@ Kommandot triggas om:
 <source>&Pause</source>
 <target>&Paus</target>
 
+<source>Variant</source>
+<target>Variant</target>
+
+<source>Statistics</source>
+<target>Statistik</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Visa inte den här dialogen igen</target>
+
 <source>Select a variant</source>
 <target>Välj en variant</target>
 
@@ -774,6 +828,12 @@ Filerna betecknas som lika om,
 <source>Configure your own synchronization rules.</source>
 <target>Konfigurera dina egna synkroniseringsregler.</target>
 
+<source>Detect moved files</source>
+<target>Hitta flyttade filer</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Kräver databasfiler som inte stöds av alla filsystem</target>
+
 <source>Error handling</source>
 <target>Felhantering</target>
 
@@ -798,17 +858,17 @@ Filerna betecknas som lika om,
 <source>Delete or overwrite files permanently</source>
 <target>Ta bort eller skriv över permanent</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Papperskorgen</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Använd papperskorgen för borttagna och överskrivna filer</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Kopiera borttagna och överskrivna filer till papperskorgen</target>
 
 <source>Versioning</source>
 <target>Versionshantering</target>
 
-<source>Move files to user-defined folder</source>
-<target>Flytta filer till användardefinierad mapp</target>
+<source>Move files to a user-defined folder</source>
+<target>Flytta filer till en fördefinierad mapp</target>
 
 <source>Naming convention:</source>
 <target>Regler för namngivning</target>
@@ -816,8 +876,8 @@ Filerna betecknas som lika om,
 <source>Batch job</source>
 <target>Batch-jobb</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Skapa en batch-fil för obevakad synkronisering. Dubbelklicka på filen för att starta den, eller schemalägg i en åtgärdshanterare: %x</target>
 
 <source>Exit</source>
 <target>Avsluta</target>
@@ -871,12 +931,12 @@ Filerna betecknas som lika om,
 <target>Ta bort på båda sidor, även om filen är markerad på endast en sida</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Endast filer som matchar alla inställningar, kommer att synkroniseras.
-Notera att filnamn måste stå i förhållande till basmappar
+Filer synkroniseras endast om de klarar alla filterregler.
+OBS! Sökvägar måste vara relaterade till ursprungsmappar.
 </target>
 
 <source>Include</source>
@@ -906,20 +966,20 @@ Notera att filnamn måste stå i förhållande till basmappar
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Kopiera till en temporär fil först (*.ffs_tmp), och byt sedan namn på den. Detta garanterar ett konsekvent tillstånd även vid allvarliga fel.</target>
 
 <source>Copy locked files</source>
 <target>Kopiera låsta filer</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Kopiera delade eller låsta filer med hjälp av Volume Shadow Copy Service (Kräver administratörsrättighet)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Kopiera delade eller låsta filer med tjänsten 'Volume Shadow Copy' (kräver administratörsbehörighet)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopiera filåtkomstbehörigheter</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>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Överför fil- och mappbehörigheter (kräver administratörsbehörighet)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Återställ dolda dialoger</target>
@@ -933,15 +993,6 @@ Notera att filnamn måste stå i förhållande till basmappar
 <source>&Default</source>
 <target>&Standard</target>
 
-<source>Variant</source>
-<target>Variant</target>
-
-<source>Statistics</source>
-<target>Statistik</target>
-
-<source>Don't show this dialog again</source>
-<target>Visa inte det här igen</target>
-
 <source>Find what:</source>
 <target>Sök efter:</target>
 
@@ -951,15 +1002,15 @@ Notera att filnamn måste stå i förhållande till basmappar
 <source>&Find next</source>
 <target>&Sök nästa</target>
 
+<source>Start synchronization</source>
+<target>Starta synkronisering</target>
+
 <source>Delete</source>
 <target>Ta bort</target>
 
 <source>Configure filter</source>
 <target>Filterinställningar</target>
 
-<source>Start synchronization</source>
-<target>Starta synkronisering</target>
-
 <source>Find</source>
 <target>Sök</target>
 
@@ -994,6 +1045,21 @@ Notera att filnamn måste stå i förhållande till basmappar
 <target>Jämför båda sidor</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Vill du verkligen köra kommandot %y för 1 objekt?</pluralform>
+<pluralform>Vill du verkligen köra kommandot %y för %x objekt?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Bekräfta</target>
+
+<source>&Execute</source>
+<target>&Kör</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1029,12 +1095,15 @@ Notera att filnamn måste stå i förhållande till basmappar
 <source>Include temporarily</source>
 <target>Inkludera tillfälligt</target>
 
-<source>Exclude via filter:</source>
-<target>Lägg till i undantag:</target>
-
 <source>multiple selection</source>
 <target>flerval</target>
 
+<source>Include via filter:</source>
+<target>Inkludera via filter:</target>
+
+<source>Exclude via filter:</source>
+<target>Lägg till i undantag:</target>
+
 <source>Include all</source>
 <target>Inkludera alla</target>
 
@@ -1080,8 +1149,8 @@ Notera att filnamn måste stå i förhållande till basmappar
 <source>Do&n't save</source>
 <target>Spara &inte</target>
 
-<source>Never save changes</source>
-<target>Spara aldrig ändringar</target>
+<source>Never save &changes</source>
+<target>Spara aldrig &ändringar</target>
 
 <source>Show files that exist on left side only</source>
 <target>Visa filer som endast finns till vänster</target>
@@ -1134,8 +1203,8 @@ Notera att filnamn måste stå i förhållande till basmappar
 <source>All folders are in sync</source>
 <target>Alla mappar är synkroniserade</target>
 
-<source>Comma separated list</source>
-<target>Komma-separerad lista</target>
+<source>Comma-separated values</source>
+<target>Kommaseparerade värden</target>
 
 <source>File list exported</source>
 <target>Fillista exporterad</target>
@@ -1143,8 +1212,8 @@ Notera att filnamn måste stå i förhållande till basmappar
 <source>Searching for program updates...</source>
 <target>Söker efter programuppdateringar...</target>
 
-<source>Ignore further errors</source>
-<target>Ignorera ytterligare fel</target>
+<source>&Ignore subsequent errors</source>
+<target>&Ignorera efterföljande fel</target>
 
 <source>&Ignore</source>
 <target>&Ignorera</target>
@@ -1152,8 +1221,8 @@ Notera att filnamn måste stå i förhållande till basmappar
 <source>Fatal Error</source>
 <target>Allvarligt fel</target>
 
-<source>Don't show this warning again</source>
-<target>Visa inte denna varning igen.</target>
+<source>&Don't show this warning again</source>
+<target>&Visa inte den här varningen igen</target>
 
 <source>&Switch</source>
 <target>&Växla</target>
@@ -1188,14 +1257,11 @@ Notera att filnamn måste stå i förhållande till basmappar
 <source>Completed</source>
 <target>Slutförd</target>
 
-<source>Continue</source>
-<target>Fortsätt</target>
+<source>&Continue</source>
+<target>&Fortsätt</target>
 
-<source>Pause</source>
-<target>Paus</target>
-
-<source>Logging</source>
-<target>Loggar</target>
+<source>Log</source>
+<target>Logg</target>
 
 <source>Cannot find %x</source>
 <target>Kan inte hitta %x</target>
@@ -1231,8 +1297,8 @@ Notera att filnamn måste stå i förhållande till basmappar
 <target>Filter</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
 <pluralform>Vill du verkligen flytta följande objekt till papperskorgen?</pluralform>
@@ -1290,9 +1356,6 @@ Notera att filnamn måste stå i förhållande till basmappar
 <source>Append a timestamp to each file name</source>
 <target>Lägg till en tidsstämpel till varje filnamn</target>
 
-<source>Folder</source>
-<target>Mapp</target>
-
 <source>File</source>
 <target>Fil</target>
 
@@ -1413,8 +1476,8 @@ Notera att filnamn måste stå i förhållande till basmappar
 <source>Cannot change process I/O priorities.</source>
 <target>Kan inte ändra process I/O-prioritet</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Kan inte flytta %x till Papperskorgen.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>Kan inte att flytta %x till papperskorgen</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>Kan inte utläsa slutlig sökväg för %x.</target>
diff --git a/BUILD/Languages/turkish.lng b/BUILD/Languages/turkish.lng
index 6f0e74b4..870eb214 100644
--- a/BUILD/Languages/turkish.lng
+++ b/BUILD/Languages/turkish.lng
@@ -7,9 +7,6 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
-<source>Retrying operation after error:</source>
-<target></target>
-
 <source>Both sides have changed since last synchronization.</source>
 <target>Son eşleştirmeden bu yana iki tarafın da içeriği değişmiş.</target>
 
@@ -28,14 +25,14 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>%x klasörü için Geri Dönüşüm Kutusu kullanılabilir mi diye bakılıyor...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>%x dosyası geri dönüşüm kutusuna atılıyor</target>
+<source>Moving file %x to the recycle bin</source>
+<target>%x dosyası Geri Dönüşüm Kutusuna atılıyor</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>%x klasörü geri dönüşüm kutusuna atılıyor</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>%x klasörü Geri Dönüşüm Kutusuna atılıyor</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>%x sembolik bağlantısı geri dönüşüm kutusuna atılıyor</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>%x simgesel bağlantısı Geri Dönüşüm Kutusuna atılıyor</target>
 
 <source>Deleting file %x</source>
 <target>%x dosyası siliniyor</target>
@@ -46,14 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>%x sembolik bağlantısı siliniyor</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>Şu klasörler için Geri Dönüşüm Kutusu kullanılamaz. Dosyalar geri döndürülemeyecek şekilde silinir:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Şu klasörler için Geri Dönüşüm Kutusu kullanılamaz. Dosyalar kalıcı olarak silinecek:</target>
 
 <source>An exception occurred</source>
 <target>Olağan dışı bir durumla karşılaşıldı</target>
 
-<source>Cannot find file %x.</source>
-<target>%x dosyası bulunamadı.</target>
+<source>A directory path is expected after %x.</source>
+<target>%x ardından bir klasör yolu gelmelidir.</target>
+
+<source>Syntax error</source>
+<target>Yazım hatası</target>
+
+<source>Cannot open file %x.</source>
+<target>%x dosyası açılamıyor.</target>
 
 <source>Error</source>
 <target>Hata</target>
@@ -61,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>%x dosyası geçerli ayar bilgilerini içermiyor.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Sağdan ve soldan seçilen klasör sayısı aynı değil.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Klasörler komut satırından seçildiğinde, ayar dosyasında klasör çifti düzeyinde ayar bulunmamalıdır.</target>
+
+<source>Warning</source>
+<target>Uyarı</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Klasörler bir ayar dosyasından fazlasında kullanılamaz.</target>
+
+<source>Syntax:</source>
+<target>Yazım:</target>
+
+<source>config files</source>
+<target>ayar dosyaları</target>
+
+<source>directory</source>
+<target>klasör</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>FreeFileSync .ffs_gui ya da .ffs_batch ayar dosyalarının sayısı.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>En çok bir ayar dosyası için alternatif klasörlerin sayısı.</target>
+
+<source>Command line</source>
+<target>Komut satırı</target>
+
 <source>A folder input field is empty.</source>
 <target>Bir klasör giriş alanı boş.</target>
 
@@ -110,22 +143,22 @@
 <target>Bellek yetersiz.</target>
 
 <source>Item exists on left side only</source>
-<target>Sol taraftaki ögeler</target>
+<target>Yalnız solda bulunan ögeler</target>
 
 <source>Item exists on right side only</source>
-<target>Sağ taraftaki ögeler</target>
+<target>Yalnız sağda bulunan ögeler</target>
 
 <source>Left side is newer</source>
-<target>Sol taraftaki daha yeni ögeler</target>
+<target>Soldaki daha yeni ögeler</target>
 
 <source>Right side is newer</source>
-<target>Sağ taraftaki daha yeni ögeler</target>
+<target>Sağdaki daha yeni ögeler</target>
 
 <source>Items have different content</source>
 <target>İçeriği farklı ögeler</target>
 
 <source>Both sides are equal</source>
-<target>İki taraftada aynı</target>
+<target>Öge iki taraftada aynı</target>
 
 <source>Conflict/item cannot be categorized</source>
 <target>Uyuşmayan/sınıflanamayan ögeler</target>
@@ -218,12 +251,12 @@
 <target>Toplam süre:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>1 Bayt</pluralform>
-<pluralform>%x Bayt</pluralform>
+<pluralform>1 bayt</pluralform>
+<pluralform>%x bayt</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -245,12 +278,12 @@
 <target>Taranıyor:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 İş]</pluralform>
-<pluralform>[%x İş]</pluralform>
+<pluralform>1 iş parçacığı</pluralform>
+<pluralform>%x iş parçacığı</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -259,6 +292,9 @@
 <source>/sec</source>
 <target>/saniye</target>
 
+<source>%x items</source>
+<target>%x öge</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>%x ayarlar dosyası kısmen yüklendi.</target>
 
@@ -271,8 +307,8 @@
 <source>Browse directory</source>
 <target>Klasöre gözatın</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Birim Gölge Kopya hizmetine erişilemedi.</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Birim Gölge Hizmetine erişilemiyor.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Bu sistem üzerinde gölge kopyalar oluşturmak için FreeFileSync 64-bit sürümünü kullanın.</target>
@@ -283,8 +319,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>%x için birim adı belirlenemedi.</target>
 
-<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>Volume name %x is not part of file path %y.</source>
+<target>%x birim adı %y dosya yolunun bir parçası değil.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Vazgeçildi: Yürürlükteki işlemin bitmesi bekleniyor...</target>
@@ -352,9 +388,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Son algılanan değişiklik ile komutun yürütülmesi arasında beklenecek süre</target>
 
-<source>Command line</source>
-<target>Komut satırı</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -373,14 +406,11 @@ Komut şu durumlarda yürütülür:
 <target>&Yeniden deneyin</target>
 
 <source>Cancel</source>
-<target>İptal Edin</target>
+<target>İptal</target>
 
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Kendiliğinden Eşleştirme</target>
 
-<source>Warning</source>
-<target>Uyarı</target>
-
 <source>Build: %x</source>
 <target>Yapım: %x</target>
 
@@ -390,15 +420,21 @@ Komut şu durumlarda yürütülür:
 <source>All files</source>
 <target>Tüm dosyalar</target>
 
+<source>Directory monitoring active</source>
+<target>Klasör izleme kullanılıyor</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Tüm klasörlerin uygun olması bekleniyor...</target>
+
 <source>&Restore</source>
-<target>Ge&ri yükleyin</target>
+<target>Gö&rüntülensin</target>
+
+<source>&Show error</source>
+<target>Hataya &bakın</target>
 
 <source>&Exit</source>
 <target>Çı&kın</target>
 
-<source>Waiting for missing directories...</source>
-<target>Kayıp klasörler için bekleniyor...</target>
-
 <source>Invalid command line:</source>
 <target>Geçersiz komut satırı:</target>
 
@@ -471,11 +507,8 @@ Komut şu durumlarda yürütülür:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Uyuşmazlığı çözülmemiş şu ögeler eşleştirilmeyecek:</target>
 
-<source>Significant difference detected:</source>
-<target>Önemli fark saptandı:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Dosyaların yarıdan fazlası kopyalanacak ya da silinecek.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Şu klasörler arasında oldukça büyük farklar var. Eşleştirme için doğru klasörleri seçtiğinize emin olun.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Şurada yeterli disk alanı yok :</target>
@@ -495,12 +528,15 @@ Komut şu durumlarda yürütülür:
 <source>Generating database...</source>
 <target>Veri tabanı oluşturuluyor...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>%x için Birim Gölge Kopyası oluşturuluyor...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>%x için Birim Gölge Hizmeti oluşturuluyor...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Veri doğrulama hatası: %x ve %y farklı içeriklere sahip.</target>
 
+<source>job name</source>
+<target>iş adı</target>
+
 <source>Synchronization aborted</source>
 <target>Eşleştirme durduruldu</target>
 
@@ -525,6 +561,9 @@ Komut şu durumlarda yürütülür:
 <source>Switching to FreeFileSync main dialog</source>
 <target>FreeFileSync ana penceresine geçiliyor</target>
 
+<source>Retrying operation after error:</source>
+<target>Hatanın ardından işlem yeniden deneniyor:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Yeni bir FreeFileSync sürümü yayınlanmış:</target>
 
@@ -586,7 +625,7 @@ Komut şu durumlarda yürütülür:
 <target>Klasör ya da dosyaları sürükleyip buraya bırakabilirsiniz</target>
 
 <source>Close progress dialog</source>
-<target>İşlem penceresini kapatılsın</target>
+<target>İşlem penceresi kapatılsın</target>
 
 <source>Standby</source>
 <target>Uykuya dalınsın</target>
@@ -648,8 +687,8 @@ Komut şu durumlarda yürütülür:
 <source>&Export file list...</source>
 <target>Dosya list&esini verin...</target>
 
-<source>&Global settings...</source>
-<target>&Genel ayarlar...</target>
+<source>&Global settings</source>
+<target>&Genel ayarlar</target>
 
 <source>&Tools</source>
 <target>A&raçlar</target>
@@ -658,7 +697,7 @@ Komut şu durumlarda yürütülür:
 <target>&Sürümü Denetleyin</target>
 
 <source>Check &automatically once a week</source>
-<target>&Kendiliğinden haftada bir denetlensin</target>
+<target>&Haftada bir kendiliğinden denetlensin</target>
 
 <source>Check for new &version</source>
 <target>Yeni &sürümü denetleyin</target>
@@ -720,17 +759,29 @@ Komut şu durumlarda yürütülür:
 <source>Synchronizing...</source>
 <target>Eşleştiriliyor...</target>
 
+<source>Minimize to notification area</source>
+<target>Bildirim alanına küçültün</target>
+
 <source>On completion</source>
 <target>İşlem tamamlandığında:</target>
 
 <source>Close</source>
-<target>Kapatılsın</target>
+<target>Kapatın</target>
 
 <source>&Pause</source>
 <target>&Duraklatılsın</target>
 
+<source>Variant</source>
+<target>İşlem tipi</target>
+
+<source>Statistics</source>
+<target>İstatistikler</target>
+
+<source>&Don't show this dialog again</source>
+<target>Bu &pencere bir daha görüntülenmesin</target>
+
 <source>Select a variant</source>
-<target>Bir çeşit seçin</target>
+<target>İşlem tipini seçin</target>
 
 <source>
 Files are found equal if
@@ -757,7 +808,7 @@ aynı olmalıdır
 </target>
 
 <source>Symbolic Link handling</source>
-<target>Sembolik bağlantı işleme:</target>
+<target>Sembolik bağlantılar:</target>
 
 <source>Help</source>
 <target>Yardım</target>
@@ -777,6 +828,12 @@ aynı olmalıdır
 <source>Configure your own synchronization rules.</source>
 <target>Eşleştirme kurallarını istediğiniz şekilde ayarlayabilirsiniz.</target>
 
+<source>Detect moved files</source>
+<target>Taşınmış dosyalar algılansın</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Veritabanı dosyalarına gerek duyar. Tüm dosya sistemleri tarafından desteklenmez.</target>
+
 <source>Error handling</source>
 <target>Hata olursa:</target>
 
@@ -801,17 +858,17 @@ aynı olmalıdır
 <source>Delete or overwrite files permanently</source>
 <target>Dosyalar kalıcı olarak silinir ya da üzerine yazılır</target>
 
-<source>Recycle Bin</source>
-<target>Geri Dönüşüm Kutusuna gönderilsin</target>
+<source>Recycle bin</source>
+<target>Geri Dönüşüm Kutusuna atılsın</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Silinen ve üzerine yazılan dosyalar Geri Dönüşüm Kutusuna gönderilir</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Geri Dönüşüm Kutusundaki silinmiş ya da üzerine yazılmış dosyalar yedeklensin</target>
 
 <source>Versioning</source>
 <target>Eski sürüm olarak saklansın</target>
 
-<source>Move files to user-defined folder</source>
-<target>Dosyalar kullanıcı tarafından belirlenen bir klasöre taşınsın</target>
+<source>Move files to a user-defined folder</source>
+<target>Dosyalar kullanıcı tarafından belirtilen bir klasöre taşınsın</target>
 
 <source>Naming convention:</source>
 <target>Adlandırma kuralı:</target>
@@ -819,8 +876,8 @@ aynı olmalıdır
 <source>Batch job</source>
 <target>Toplu iş</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>Toplu iş dosyası ile otomatik eşleştirme yapılabilir. Dosyadaki işlemler, çift tıklanarak ya da sisteminizdeki görev zamanlayıcıya; FreeFileSync.exe <görev adı>.ffs_batch şeklinde eklenerek yürütülebilir.</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Katılımsız eşleştirme için bir toplu iş dosyası oluşturun. İşlemi başlatmak için bu dosyaya çift tıklayın ya da görev zamanlayıcı ile programlayın: %x</target>
 
 <source>Exit</source>
 <target>Çıkın</target>
@@ -874,19 +931,19 @@ aynı olmalıdır
 <target>Dosya yalnız bir tarafta seçili olsa bile her iki taraftaki de silinir</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Yalnız süzgeç ayarlarına tamamen uyan dosyalar eşleştirilir.
-Not: Dosya adları kök klasörlere göre bağıl olmalıdır.
+Yalnız tüm süzgeç kurallarına uyan dosyalar eşleştirilir.
+Not: Dosya yolları seçilmiş klasörlere göre yazılmalıdır.
 </target>
 
 <source>Include</source>
-<target>Katılsın:</target>
+<target>Katılacak ögeler:</target>
 
 <source>Exclude</source>
-<target>Katılmasın</target>
+<target>Katılmayacak ögeler</target>
 
 <source>Time span</source>
 <target>Zaman aralığı</target>
@@ -909,20 +966,20 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır.
 <source>Fail-safe file copy</source>
 <target>Dosyalar hatasız kopyalansın</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 çalışma ortamı sağlanır.</target>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Dosyalar önce geçici dosyaya kopyalanıp (*.ffs_tmp) sonra yeniden adlandırılır. Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı yapılmasını sağlar.</target>
 
 <source>Copy locked files</source>
 <target>Kilitli dosyalar da kopyalansın</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Paylaşılan ya da kilitli dosyalar, Gölge Kopya Hizmeti'ni kullanarak kopyalanır (yönetici izinleri gerekir).</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Paylaşılan ya da kilitlenmiş dosyalar Birim Gölge Hizmetini kullanılarak kopyalanır (yönetici hakları gereklidir)</target>
 
 <source>Copy file access permissions</source>
 <target>Dosya erişim izinleri de kopyalansın</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Dosya ve klasör izinleri de kopyalanır (yönetici izinleri gerekir).</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>Dosya ve klasör izinleri de aktarılır (yönetici hakları gereklidir)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Gizlenmiş iletiler yeniden görüntülensin</target>
@@ -936,15 +993,6 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır.
 <source>&Default</source>
 <target>&Varsayılan</target>
 
-<source>Variant</source>
-<target>İşlem tipi</target>
-
-<source>Statistics</source>
-<target>İstatistikler</target>
-
-<source>Don't show this dialog again</source>
-<target>Bu ileti artık görüntülenmesin</target>
-
 <source>Find what:</source>
 <target>Aranacak:</target>
 
@@ -954,15 +1002,15 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır.
 <source>&Find next</source>
 <target>&Sonrakini bulun</target>
 
+<source>Start synchronization</source>
+<target>Eşleştirmeyi başlatın</target>
+
 <source>Delete</source>
 <target>Silin</target>
 
 <source>Configure filter</source>
 <target>Süzgeci ayarlayın</target>
 
-<source>Start synchronization</source>
-<target>Eşleştirmeyi başlatın</target>
-
 <source>Find</source>
 <target>Arayın</target>
 
@@ -997,6 +1045,21 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır.
 <target>İki tarafı karşılaştırır</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>1 öge için %y komutunu çalıştırmak istediğinize emin misiniz?</pluralform>
+<pluralform>%x öge için %y komutunu çalıştırmak istediğinize emin misiniz?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Onaylayın</target>
+
+<source>&Execute</source>
+<target>Çalış&tırın</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1032,12 +1095,15 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır.
 <source>Include temporarily</source>
 <target>Geçici olarak katılsın</target>
 
-<source>Exclude via filter:</source>
-<target>Süzerek dışarda bırakılsın:</target>
-
 <source>multiple selection</source>
 <target>çoklu seçim</target>
 
+<source>Include via filter:</source>
+<target>Şu süzgeçle katılsın:</target>
+
+<source>Exclude via filter:</source>
+<target>Süzerek dışarda bırakılsın:</target>
+
 <source>Include all</source>
 <target>Tümü katılsın</target>
 
@@ -1083,29 +1149,29 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır.
 <source>Do&n't save</source>
 <target>Kaydedilmesi&n</target>
 
-<source>Never save changes</source>
-<target>Değişiklikler asla kaydedilmesin</target>
+<source>Never save &changes</source>
+<target>Değişiklikler asla &kaydedilmesin</target>
 
 <source>Show files that exist on left side only</source>
-<target>Yalnız sol tarafta bulunan dosyalar görüntülensin</target>
+<target>Yalnız sol tarafta bulunan dosyaları görüntüler ya da gizler</target>
 
 <source>Show files that exist on right side only</source>
-<target>Yalnız sağ tarafta bulunan dosyalar görüntülensin</target>
+<target>Yalnız sağ tarafta bulunan dosyaları görüntüler ya da gizler</target>
 
 <source>Show files that are newer on left</source>
-<target>Solda daha yeni olan dosyalar görüntülensin</target>
+<target>Solda daha yeni olan dosyaları görüntüler ya da gizler</target>
 
 <source>Show files that are newer on right</source>
-<target>Sağda daha yeni olan dosyalar görüntülensin</target>
+<target>Sağda daha yeni olan dosyaları görüntüler ya da gizler</target>
 
 <source>Show files that are equal</source>
-<target>Aynı olan dosyalar görüntülensin</target>
+<target>Aynı olan dosyaları görüntüler ya da gizler</target>
 
 <source>Show files that are different</source>
-<target>Farklı olan dosyalar görüntülensin</target>
+<target>Farklı olan dosyaları görüntüler ya da gizler</target>
 
 <source>Show conflicts</source>
-<target>Uyuşmazlıklar görüntülensin</target>
+<target>Uyuşmazlıkları görüntüler ya da gizler</target>
 
 <source>Show files that will be created on the left side</source>
 <target>Sol tarafa eklenecek dosyalar görüntülensin</target>
@@ -1137,8 +1203,8 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır.
 <source>All folders are in sync</source>
 <target>Tüm klasörler eşleştirildi</target>
 
-<source>Comma separated list</source>
-<target>Virgül ile ayrılmış liste</target>
+<source>Comma-separated values</source>
+<target>Virgül ile ayrılmış değerler</target>
 
 <source>File list exported</source>
 <target>Dosya listesi verildi</target>
@@ -1146,8 +1212,8 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır.
 <source>Searching for program updates...</source>
 <target>Yazılım güncellemesine bakılıyor...</target>
 
-<source>Ignore further errors</source>
-<target>Sonraki hatalar yoksayılsın</target>
+<source>&Ignore subsequent errors</source>
+<target>Sonraki &hatalar yoksayılsın</target>
 
 <source>&Ignore</source>
 <target>&Yoksayın</target>
@@ -1155,8 +1221,8 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır.
 <source>Fatal Error</source>
 <target>Ölümcül Hata</target>
 
-<source>Don't show this warning again</source>
-<target>Bu uyarı artık görüntülenmesin</target>
+<source>&Don't show this warning again</source>
+<target>Bu uyarı bir daha &görüntülenmesin</target>
 
 <source>&Switch</source>
 <target>&Değiştirin</target>
@@ -1191,20 +1257,17 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır.
 <source>Completed</source>
 <target>Tamamlandı</target>
 
-<source>Continue</source>
-<target>Devam edin</target>
-
-<source>Pause</source>
-<target>Duraklatın</target>
+<source>&Continue</source>
+<target>&Devam</target>
 
-<source>Logging</source>
-<target>Günlükleme</target>
+<source>Log</source>
+<target>Günlük</target>
 
 <source>Cannot find %x</source>
 <target>%x bulunamadı</target>
 
 <source>Inactive</source>
-<target>Devre dışı</target>
+<target>Kullanılmıyor</target>
 
 <source>Today</source>
 <target>Bugün</target>
@@ -1234,12 +1297,12 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır.
 <target>Süzgeç</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>Aşağıdaki 1 ögeyi Geri Dönüşüm Kutusuna göndermek istediğinize emin misiniz?</pluralform>
-<pluralform>Aşağıdaki %x ögeyi Geri Dönüşüm Kutusuna göndermek istediğinize emin misiniz?</pluralform>
+<pluralform>Aşağıdaki ögeyi Geri Dönüşüm Kutusuna atmak istediğinize emin misiniz?</pluralform>
+<pluralform>Aşağıdaki %x ögeyi Geri Dönüşüm Kutusuna atmak istediğinize emin misiniz?</pluralform>
 </target>
 
 <source>
@@ -1413,8 +1476,8 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır.
 <source>Cannot change process I/O priorities.</source>
 <target>Giriş/Çıkış işlemi öncelikleri değiştirilemedi</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>%x Geri Dönüşüm Kutusuna gönderilemedi.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>%x Geri Dönüşüm Kutusuna atılamıyor.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>Son %x yolu belirlenemedi.</target>
diff --git a/BUILD/Languages/ukrainian.lng b/BUILD/Languages/ukrainian.lng
index 68b045a1..0b5406b7 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>Retrying operation after error:</source>
+<source>Close search bar</source>
 <target></target>
 
 <source>Both sides have changed since last synchronization.</source>
@@ -31,14 +31,14 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Перевірка доступності Корзини для папки %x...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>Переміщення файлу %x у Корзину</target>
+<source>Moving file %x to the recycle bin</source>
+<target>Переміщення файлу %x до Корзини</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>Переміщення папки %x у Корзину</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>Переміщення папки %x до Корзини</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Переміщення символьного посилання %x у Корзину</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>Переміщення символічного посилання %x до Корзини</target>
 
 <source>Deleting file %x</source>
 <target>Вилучення файлу %x</target>
@@ -49,14 +49,20 @@
 <source>Deleting symbolic link %x</source>
 <target>Вилучення символьного посилання %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>Корзина для папок недоступна. Файли будуть вилучені назавжди:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Корзина не доступна для таких папок. Файли замість цього будуть видалені назавжди:</target>
 
 <source>An exception occurred</source>
 <target>Відбулось виключення</target>
 
-<source>Cannot find file %x.</source>
-<target>Не вдається знайти файлу %x.</target>
+<source>A directory path is expected after %x.</source>
+<target>Після %x очікується шлях до каталогу.</target>
+
+<source>Syntax error</source>
+<target>Синтаксична помилка</target>
+
+<source>Cannot open file %x.</source>
+<target>Не вдається фідкрити файл %x.</target>
 
 <source>Error</source>
 <target>Помилка</target>
@@ -64,6 +70,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>Файл %x не містить правильної конфігурації.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Вказано різну кількість лівих і правих каталогів</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Конфігураційний файл не повинен містити налаштувань на рівні пар каталогів, якщо каталоги задаються командним рядком.</target>
+
+<source>Warning</source>
+<target>Увага</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Каталоги не можуть бути призначені більш ніж одному файлу конфігурації.</target>
+
+<source>Syntax:</source>
+<target>Синтаксис:</target>
+
+<source>config files</source>
+<target>файли конфігурації</target>
+
+<source>directory</source>
+<target>каталог</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Будь-яка кількість FreeFileSync .ffs_gui та/або .ffs_batch файлів конфігурації.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Будь-яка кількість альтернативних каталогів для щонайбільше одного конфігураційного файлу.</target>
+
+<source>Command line</source>
+<target>Командний рядок</target>
+
 <source>A folder input field is empty.</source>
 <target>Порожнє поле папки.</target>
 
@@ -222,8 +258,8 @@
 <target>Загальний час:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
 <pluralform>%x байт</pluralform>
@@ -250,13 +286,13 @@
 <target>Сканую:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[%x Нить виконання]</pluralform>
-<pluralform>[%x Ниті виконання]</pluralform>
-<pluralform>[%x Нитей виконання]</pluralform>
+<pluralform>%x нить виконання</pluralform>
+<pluralform>%x ниті виконання</pluralform>
+<pluralform>%x нитей виконання</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -265,6 +301,9 @@
 <source>/sec</source>
 <target>/сек</target>
 
+<source>%x items</source>
+<target>%x елементів</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Файл конфігурації %x завантажено лише частково.</target>
 
@@ -277,8 +316,8 @@
 <source>Browse directory</source>
 <target>Переглянути каталог</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
-<target>Не вдається отримати доступ до послуги тіньового копіювання тому</target>
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Не вдається отримати доступ до послуги Тіньового Копіювання Тому.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Будь ласка, використовуйте 64-розрядну версію FreeFileSync для створення тіньових копій у цій системі.</target>
@@ -289,8 +328,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Не вдалося встановити ім'я тому для %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Ім’я тому %x не є частиною імені файлу %y.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>Ім'я тому %x не є частиною файловго шляху %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Запит переривання: В очікуванні завершення поточної операції...</target>
@@ -358,9 +397,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Час простою між виявленням останньої зміни та виконанням команди</target>
 
-<source>Command line</source>
-<target>Командний рядок</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -384,9 +420,6 @@ The command is triggered if:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Автоматична синхронізація</target>
 
-<source>Warning</source>
-<target>Увага</target>
-
 <source>Build: %x</source>
 <target>компіляція %x</target>
 
@@ -396,15 +429,21 @@ The command is triggered if:
 <source>All files</source>
 <target>Всі файли</target>
 
+<source>Directory monitoring active</source>
+<target>Моніторинг каталогів активний</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Очікування доступності всіх каталогів...</target>
+
 <source>&Restore</source>
 <target>&Відновити</target>
 
+<source>&Show error</source>
+<target>&Показати помилку</target>
+
 <source>&Exit</source>
 <target>&Вихід</target>
 
-<source>Waiting for missing directories...</source>
-<target>Очікування пропущених каталогів...</target>
-
 <source>Invalid command line:</source>
 <target>Неправильний командний рядок:</target>
 
@@ -414,14 +453,14 @@ The command is triggered if:
 <source>File time and size</source>
 <target>Дата та розмір файлу</target>
 
-<source> Two way </source>
-<target> Обидва напрямки </target>
+<source>Two way</source>
+<target>Обидва напрямки</target>
 
 <source>Mirror</source>
-<target>Дзеркало </target>
+<target>Дзеркало</target>
 
 <source>Update</source>
-<target>Оновити </target>
+<target>Оновити</target>
 
 <source>Custom</source>
 <target>Вибірково</target>
@@ -477,11 +516,8 @@ The command is triggered if:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Наступні елементи мають невирішені конфлікти і не будуть синхронізовані:</target>
 
-<source>Significant difference detected:</source>
-<target>Виявлена істотна різниця:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Понад 50% загальної кількості файлів буде зкопійовано чи вилучено.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Ці папки істотно відрізняються. Переконайтеся, що ви вказали відповідні папки для синхронізації.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Не достатньо вільного місця в:</target>
@@ -501,12 +537,15 @@ The command is triggered if:
 <source>Generating database...</source>
 <target>Створення бази даних...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Створення Тому тіньового копіювання для %x...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>Створення Тіньової Копії для %x...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>Помилка перевірки даних: %x та %y мають різний вміст.</target>
 
+<source>job name</source>
+<target>назва завдання</target>
+
 <source>Synchronization aborted</source>
 <target>Синхронізація припинена</target>
 
@@ -531,6 +570,9 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog</source>
 <target>Перехід до головного діалогу FreeFileSync</target>
 
+<source>Retrying operation after error:</source>
+<target>Відновлення операції після помилки:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Доступна нова версія FreeFileSync:</target>
 
@@ -654,8 +696,8 @@ The command is triggered if:
 <source>&Export file list...</source>
 <target>&Експортувати список файлів...</target>
 
-<source>&Global settings...</source>
-<target>&Глобальні налаштування...</target>
+<source>&Global settings</source>
+<target>&Глобальні налаштування</target>
 
 <source>&Tools</source>
 <target>&Інструменти</target>
@@ -672,12 +714,6 @@ The command is triggered if:
 <source>Compare</source>
 <target>Порівняти</target>
 
-<source>Comparison settings</source>
-<target>Налаштування порівнювання</target>
-
-<source>Synchronization settings</source>
-<target>Налаштування синхронізації</target>
-
 <source>Synchronize</source>
 <target>Синхронізувати</target>
 
@@ -690,6 +726,12 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>Поміняти місцями</target>
 
+<source>Find what:</source>
+<target>Знайти:</target>
+
+<source>Match case</source>
+<target>Враховувати регістр</target>
+
 <source>Save as batch job</source>
 <target>Зберегти як пакетне завдання</target>
 
@@ -726,6 +768,9 @@ The command is triggered if:
 <source>Synchronizing...</source>
 <target>Синхронізація...</target>
 
+<source>Minimize to notification area</source>
+<target>Згорнути в область повідомлень</target>
+
 <source>On completion</source>
 <target>Після завершення</target>
 
@@ -735,6 +780,15 @@ The command is triggered if:
 <source>&Pause</source>
 <target>&Пауза</target>
 
+<source>Variant</source>
+<target>Варіант</target>
+
+<source>Statistics</source>
+<target>Статистика</target>
+
+<source>&Don't show this dialog again</source>
+<target>Більше &не показувати цей діалог</target>
+
 <source>Select a variant</source>
 <target>Виберіть варіант</target>
 
@@ -779,6 +833,12 @@ is the same
 <source>Configure your own synchronization rules.</source>
 <target>Налаштувати власні правила синхронізації.</target>
 
+<source>Detect moved files</source>
+<target>Виявляти переміщені файли</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>Потрібні файли бази даних. Підтримується не всіма файловими системами.</target>
+
 <source>Error handling</source>
 <target>Обробка помилок</target>
 
@@ -803,16 +863,16 @@ is the same
 <source>Delete or overwrite files permanently</source>
 <target>Вилучати чи перезаписати файли назавжди</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>Корзина</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Використати Корзину для видалених і перезаписаних файлів</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>Резервно зберегти вилучені та перезаисані файли в Корзині</target>
 
 <source>Versioning</source>
 <target>Запис версій</target>
 
-<source>Move files to user-defined folder</source>
+<source>Move files to a user-defined folder</source>
 <target>Перемістити файли у визначену користувачем папку</target>
 
 <source>Naming convention:</source>
@@ -821,8 +881,8 @@ is the same
 <source>Batch job</source>
 <target>Пакетне завдання</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>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Створити пакетний файл для автоматичної синхронізації. Щоб розпочати двічі клацніть цей файл або заплануйте в планувальнику завдань: %x</target>
 
 <source>Exit</source>
 <target>Вихід</target>
@@ -845,30 +905,6 @@ is the same
 <source>Limit maximum number of log files</source>
 <target>Обмежити максимальну кількість файлів журналу</target>
 
-<source>Source code written in C++ using:</source>
-<target>Код програми написаний на C++ з використанням:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Якщо Вам сподобався FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Пожертвувати через PayPal</target>
-
-<source>Many thanks for localization:</source>
-<target>Подяка за локалізацію:</target>
-
-<source>Feedback and suggestions are welcome</source>
-<target>Відгуки та пропозиції вітаються</target>
-
-<source>Homepage</source>
-<target>Оф.сайт</target>
-
-<source>Email</source>
-<target>Почта</target>
-
-<source>Published under the GNU General Public License</source>
-<target>Видано за ліцензією GNU General Public License</target>
-
 <source>Delete on both sides</source>
 <target>Вилучити з обох сторін</target>
 
@@ -876,12 +912,12 @@ is the same
 <target>Вилучити з обох сторін, навіть якщо файл виділений тільки з однієї сторони</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-Тільки файли, які задовільняють всім налаштуванням фільтра будуть синхронізовані. 
-Увага: Назви файлів вказуються відносно базових каталогів.
+Файли будуть синхронізовані тільки якщо вони задовільняють усім правилам фільтрації.
+Примітка: Шляхи до файлів повинні бути відносними до базових каталогів.
 </target>
 
 <source>Include</source>
@@ -911,20 +947,20 @@ Note: File names must be relative to base directories.
 <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>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>Скопіюйте спочатку в тимчасовий файл (*.ffs_tmp), потім перейменуйте його. Це гарантує узгоджений стан навіть у разі виникнення фатальної помилки.</target>
 
 <source>Copy locked files</source>
 <target>Копіювати заблоковані файли</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Копіювати спільних чи заблокованих файлів з використанням послуги Тіньового Копіювання Тому (потрібні права Адміністратора)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>Копіювати спільні та заблоковані файли за допомогою сервісу Тіньового Копіювання Тому (потрібні права адміністратора)</target>
 
 <source>Copy file access permissions</source>
 <target>Копіювати права доступу до файлу</target>
 
-<source>Transfer file and folder 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>
@@ -938,35 +974,44 @@ Note: File names must be relative to base directories.
 <source>&Default</source>
 <target>&За замовчуванням</target>
 
-<source>Variant</source>
-<target>Варіант</target>
+<source>Source code written in C++ using:</source>
+<target>Код програми написаний на C++ з використанням:</target>
 
-<source>Statistics</source>
-<target>Статистика</target>
+<source>If you like FreeFileSync</source>
+<target>Якщо Вам сподобався FreeFileSync</target>
 
-<source>Don't show this dialog again</source>
-<target>Не показувати надалі цього діалогу</target>
+<source>Donate with PayPal</source>
+<target>Пожертвувати через PayPal</target>
 
-<source>Find what:</source>
-<target>Знайти:</target>
+<source>Feedback and suggestions are welcome</source>
+<target>Відгуки та пропозиції вітаються</target>
 
-<source>Match case</source>
-<target>Враховувати регістр</target>
+<source>Homepage</source>
+<target>Оф.сайт</target>
 
-<source>&Find next</source>
-<target>&Знайти наступний</target>
+<source>Email</source>
+<target>Почта</target>
 
-<source>Delete</source>
-<target>Видалити</target>
+<source>Published under the GNU General Public License</source>
+<target>Видано за ліцензією GNU General Public License</target>
 
-<source>Configure filter</source>
-<target>Налаштування фільтра</target>
+<source>Many thanks for localization:</source>
+<target>Подяка за локалізацію:</target>
 
 <source>Start synchronization</source>
 <target>Розпочати синхронізацію</target>
 
-<source>Find</source>
-<target>Знайти</target>
+<source>Comparison settings</source>
+<target>Налаштування порівнювання</target>
+
+<source>Synchronization settings</source>
+<target>Налаштування синхронізації</target>
+
+<source>Delete</source>
+<target>Видалити</target>
+
+<source>Configure filter</source>
+<target>Налаштування фільтра</target>
 
 <source>Select time span</source>
 <target>Виберіть часовий інтервал</target>
@@ -974,6 +1019,9 @@ Note: File names must be relative to base directories.
 <source>Folder pairs</source>
 <target>Пари папок</target>
 
+<source>Find</source>
+<target>Знайти</target>
+
 <source>Overview</source>
 <target>Головна</target>
 
@@ -999,6 +1047,22 @@ Note: File names must be relative to base directories.
 <target>Порівняти обидві сторони</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Ви дійсно хочете виконати команду %y для %x елемента?</pluralform>
+<pluralform>Ви дійсно хочете виконати команду %y для %x елементів?</pluralform>
+<pluralform>Ви дійсно хочете виконати команду %y для %x елементів?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Підтвердити</target>
+
+<source>&Execute</source>
+<target>&Виконати</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1031,17 +1095,20 @@ Note: File names must be relative to base directories.
 <source>Set direction:</source>
 <target>Виберіть напрям:</target>
 
-<source>Exclude temporarily</source>
-<target>Виключити тимчасово</target>
+<source>multiple selection</source>
+<target>груповий вибір</target>
 
-<source>Include temporarily</source>
-<target>Включити</target>
+<source>Include via filter:</source>
+<target>Включити згідно фільтру:</target>
 
 <source>Exclude via filter:</source>
 <target>Виключити через фільтр:</target>
 
-<source>multiple selection</source>
-<target>груповий вибір</target>
+<source>Exclude temporarily</source>
+<target>Виключити тимчасово</target>
+
+<source>Include temporarily</source>
+<target>Включити</target>
 
 <source>Include all</source>
 <target>Включити все</target>
@@ -1088,8 +1155,8 @@ Note: File names must be relative to base directories.
 <source>Do&n't save</source>
 <target>&Не зберігати</target>
 
-<source>Never save changes</source>
-<target>Ніколи не зберігати змін</target>
+<source>Never save &changes</source>
+<target>Ніколи не зберігати &зміни</target>
 
 <source>Show files that exist on left side only</source>
 <target>Показати файли, які є тільки ліворуч</target>
@@ -1142,8 +1209,11 @@ Note: File names must be relative to base directories.
 <source>All folders are in sync</source>
 <target>Всі папки синхронізовано</target>
 
-<source>Comma separated list</source>
-<target>Розділений комами список</target>
+<source>Cannot find %x</source>
+<target>Не можна знайти %x</target>
+
+<source>Comma-separated values</source>
+<target>Значення розділені комою</target>
 
 <source>File list exported</source>
 <target>Список файлів експортовано</target>
@@ -1151,8 +1221,8 @@ Note: File names must be relative to base directories.
 <source>Searching for program updates...</source>
 <target>Пошук оновлень програми ...</target>
 
-<source>Ignore further errors</source>
-<target>Ігнорувати майбутні помилки</target>
+<source>&Ignore subsequent errors</source>
+<target>&Ігнорувати наступні помилки</target>
 
 <source>&Ignore</source>
 <target>&Ігнорувати</target>
@@ -1160,8 +1230,8 @@ Note: File names must be relative to base directories.
 <source>Fatal Error</source>
 <target>Критична помилка</target>
 
-<source>Don't show this warning again</source>
-<target>Не показувати більше це попередження</target>
+<source>&Don't show this warning again</source>
+<target>&Надалі не показувати це попередження</target>
 
 <source>&Switch</source>
 <target>&Змінити</target>
@@ -1196,17 +1266,11 @@ Note: File names must be relative to base directories.
 <source>Completed</source>
 <target>Завершено</target>
 
-<source>Continue</source>
-<target>Далі</target>
-
-<source>Pause</source>
-<target>Пауза</target>
+<source>&Continue</source>
+<target>&Продовжити</target>
 
-<source>Logging</source>
-<target>Лог-файли</target>
-
-<source>Cannot find %x</source>
-<target>Не можна знайти %x</target>
+<source>Log</source>
+<target>Лог</target>
 
 <source>Inactive</source>
 <target>Неактивний</target>
@@ -1239,13 +1303,13 @@ Note: File names must be relative to base directories.
 <target>Фільтр</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>Ви дійсно хочете перемістити цей %x елемент до Корзини?</pluralform>
-<pluralform>Ви дійсно хочете перемістити ці %x елементи до Корзини?</pluralform>
-<pluralform>Ви дійсно хочете перемістити ці %x елементів до Корзини?</pluralform>
+<pluralform>Ви дійсно хочете перемістити цей %x елемент у Корзину?</pluralform>
+<pluralform>Ви дійсно хочете перемістити ці %x елементи у Корзину?</pluralform>
+<pluralform>Ви дійсно хочете перемістити ці %x елементів у Корзину?</pluralform>
 </target>
 
 <source>
@@ -1300,9 +1364,6 @@ Note: File names must be relative to base directories.
 <source>Append a timestamp to each file name</source>
 <target>Додати часову мітку до кожного імені файлу</target>
 
-<source>Folder</source>
-<target>Папка</target>
-
 <source>File</source>
 <target>Файл</target>
 
@@ -1426,8 +1487,8 @@ Note: File names must be relative to base directories.
 <source>Cannot change process I/O priorities.</source>
 <target>Не вдалося змінити пріоритетів Вх/Вих процесу.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>Не вдається перенести %x до Корзини.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>Не вдається перемістити %x до Корзини.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>Не вдається визначити кінцевого шляху для %x.</target>
diff --git a/BUILD/Resources.zip b/BUILD/Resources.zip
index 4b79261a..cf73407d 100644
--- a/BUILD/Resources.zip
+++ b/BUILD/Resources.zip
author	Daniel Wilhelm <daniel@wili.li>	2014-04-18 17:27:42 +0200
committer	Daniel Wilhelm <daniel@wili.li>	2014-04-18 17:27:42 +0200
commit	b916407a2a06f8452e82b74dc44c54acbcc572b0 (patch)
tree	46358e0bb035fca0f42edb4b5b8aa5f1613814af /BUILD
parent	5.20 (diff)
download	FreeFileSync-b916407a2a06f8452e82b74dc44c54acbcc572b0.tar.gz FreeFileSync-b916407a2a06f8452e82b74dc44c54acbcc572b0.tar.bz2 FreeFileSync-b916407a2a06f8452e82b74dc44c54acbcc572b0.zip