Merge branch '10.15' into 'master'10.15

add upstream 10.15 See merge request opensource-tracking/FreeFileSync!12
author: B Stack <bgstack15@gmail.com> 2019-09-03 20:50:36 +0000
committer: B Stack <bgstack15@gmail.com> 2019-09-03 20:50:36 +0000
commit: 89b5c8eb6012b7b4560958ad3c1aa5b187dafc94 (patch)
tree: afc54ec004ab863262f5621fbf282c42fdff29cc
parent: Merge branch '10.14' into 'master' (diff)
parent: add upstream 10.15 (diff)
download: FreeFileSync-10.15.tar.gz
FreeFileSync-10.15.tar.bz2
FreeFileSync-10.15.zip
120 files changed, 10379 insertions, 7457 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 31c831b9..74415e95 100755
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,18 @@
+FreeFileSync 10.15 [2019-08-15]
+-------------------------------
+Redesigned progress indicator stats
+Fixed crash when progress dialog is closed right before showing error
+Consider fail-safe file copy when creating sync.ffs_db files
+Prepare support for GTK3 GUI framework (Linux)
+Support sound output via SDL (Linux)
+Shrink standard system icons if needed (Linux)
+Add Windows Defender exclusions asynchronously
+Fixed main dialog out-of-screen position on startup (macOS)
+Activated CDN for all web accesses
+Redirect error dialog to stderr during sound playback (Linux)
+Updated translation files
+
+
 FreeFileSync 10.14 [2019-07-14]
 -------------------------------
 Warn if versioning folder paths differ only in case
@@ -34,7 +49,7 @@ Show sync start time and date in progress dialog title
 Added duration of comparison to log
 Show all total times in full HH:MM:SS format
 Added sync start time to log file header
-Add Windows Defender exclusions to fix CURLE_OPERATION_TIMEDOUT
+Add Windows Defender exclusions to fix CURLE_PARTIAL_FILE
 New RealTimeSync option to hide console window
 Support launching through symlink (Windows)
 Dropped support for Windows XP, Server 2003, and Vista
diff --git a/FreeFileSync/Build/Resources/styles.gtk_rc b/FreeFileSync/Build/Resources/Gtk2Styles.rc
index b13985a0..b13985a0 100755
--- a/FreeFileSync/Build/Resources/styles.gtk_rc
+++ b/FreeFileSync/Build/Resources/Gtk2Styles.rc
diff --git a/FreeFileSync/Build/Resources/Gtk3Styles.css b/FreeFileSync/Build/Resources/Gtk3Styles.css
new file mode 100755
index 00000000..977d45e3
--- /dev/null
+++ b/FreeFileSync/Build/Resources/Gtk3Styles.css
@@ -0,0 +1,7 @@
+button
+{
+	/*remove excessive inner border from bitmap buttons*/
+	padding: 2px;
+	min-width: 0;
+	min-height: 0;
+}
diff --git a/FreeFileSync/Build/Resources/Icons.zip b/FreeFileSync/Build/Resources/Icons.zip
index 899c2e93..af35c0b3 100755
--- a/FreeFileSync/Build/Resources/Icons.zip
+++ b/FreeFileSync/Build/Resources/Icons.zip
diff --git a/FreeFileSync/Build/Resources/Languages/arabic.lng b/FreeFileSync/Build/Resources/Languages/arabic.lng
index 022fb2eb..dea9b522 100755
--- a/FreeFileSync/Build/Resources/Languages/arabic.lng
+++ b/FreeFileSync/Build/Resources/Languages/arabic.lng
@@ -7,8 +7,162 @@
 	<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>&Configure</source>
-<target></target>
+<source>Cannot read file %x.</source>
+<target>لا يمكن قراءة الملف  %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+حجم غير متوقع لتدفق البيانات.
+المتوقع: ‎%x bytes
+الفعلي: ‎%y bytes
+</target>
+
+<source>Cannot write file %x.</source>
+<target>لا يمكن كتابة الملف  %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>لا يمكن كتابة أذونات %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>العملية غير مدعومة بين الأجهزة المختلفة.</target>
+
+<source>Cannot delete file %x.</source>
+<target>لا يمكن حذف الملف  %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>لا يمكن حذف الرابط الرمزي %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>لا يمكن حذف المسار %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>لا يمكن نقل الملف  %x إلى %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>لا يمكن نسخ الرابط الرمزي من %x إلى %y.</target>
+
+<source>Error Code %x</source>
+<target>رمز الخطأ %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>لا يمكن قراءة الدليل %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>لا يمكن كتابة وقت تعديل %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>لا يمكن قراءة سمات الملف %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>لا يمكن إنشاء المسار %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>تعذر تحديد المسار النهائي لـ %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>العملية غير مدعومة للجهاز.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>لا يمكن حل الارتباط الرمزي  %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>تعذر نقل %x إلى سلة المحذوفات.</target>
+
+<source>Authentication completed.</source>
+<target>نجحت المصادقة.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>يمكنك غلق هذه الصفحة والاستمرار باستخدام FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>فشلت المصادقة.</target>
+
+<source>Unable to connect to %x.</source>
+<target>لا يمكن الاتصال بـ %x.</target>
+
+<source>Cannot find %x.</source>
+<target>لا يمكن العثور على %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>الاسم %x تم استخدامه اكثر من مرة فى نفس المجلد.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>من فضلك امنح الاذن للمستحدم %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>تعذر فتح الملف %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>الأسم %x مستخدم بالفعل فى عنصر أخر.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>لا يمكن تحديد مساحة القرص الحرة لـ %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>غير قادر على قطع الاتصال من %x.</target>
+
+<source>Unable to access %x.</source>
+<target>لا يمكن الوصول إلى  %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>فشل الحصول على معلومات حول الخادم %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>لا يمكن مراقبة المسار %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>لا يمكن العثور على الجهاز %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>لا يمكن فتح المسار %x.</target>
+
+<source>Unsupported item type.</source>
+<target>نوع العنصر غير مدعم.</target>
+
+<source>Incorrect command line:</source>
+<target>سطر أوامر خاطئ:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>لا يدعم الخادم المصادقة عبر %x.</target>
+
+<source>Required:</source>
+<target>مطلوب:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>انقضت مهلة العملية بعد 0 ثانية.</pluralform>
+<pluralform>انقضت مهلة العملية بعد 1 ثانية.</pluralform>
+<pluralform>انقضت مهلة العملية بعد 2 ثانية.</pluralform>
+<pluralform>انقضت مهلة العملية بعد %x ثوان.</pluralform>
+<pluralform>انقضت مهلة العملية بعد %x ثانية.</pluralform>
+<pluralform>انقضت مهلة العملية بعد %x ثانية.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>لا يمكن الانتظار على أكثر 0 اتصال في وقت واحد.</pluralform>
+<pluralform>لا يمكن الانتظار على أكثر 1 اتصال في وقت واحد.</pluralform>
+<pluralform>لا يمكن الانتظار على أكثر 2 اتصال في وقت واحد.</pluralform>
+<pluralform>لا يمكن الانتظار على أكثر %x اتصالات في وقت واحد.</pluralform>
+<pluralform>لا يمكن الانتظار على أكثر من %x اتصالات في وقت واحد.</pluralform>
+<pluralform>لا يمكن الانتظار على أكثر من %x اتصالات في وقت واحد.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>الاتصال النشط: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>فشل فتح قناة SFTP رقم %x.</target>
 
 <source>Both sides have changed since last synchronization.</source>
 <target>كلا الجانبين قد تغير منذ المزامنة الأخيرة.</target>
@@ -112,9 +266,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>ملفات التثبيت تالفة. الرجاء إعادة تثبيت FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>لا يمكن فتح الملف  %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>تعذر العثور على المجلدات التالية:</target>
 
@@ -146,6 +297,9 @@
 <pluralform>%x عناصر تم العثور عليها</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>الوقت المنقضي:</target>
+
 <source>File %x has an invalid date.</source>
 <target>يحتوي الملف %x تاريخ غير صالح.</target>
 
@@ -164,9 +318,6 @@
 <source>Items differ in attributes only</source>
 <target>العناصر مختلفة في السمات فقط</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>الاسم %x تم استخدامه اكثر من مرة فى نفس المجلد.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>جاري حل المسار الرمزي %x</target>
 
@@ -227,6 +378,15 @@
 <source>Out of memory.</source>
 <target>نفدت الذاكرة.</target>
 
+<source>Show in Explorer</source>
+<target>إظهار في المستكشف</target>
+
+<source>Open with default application</source>
+<target>فتح باستخدام التطبيق الافتراضي</target>
+
+<source>Browse directory</source>
+<target>تصفح المسار</target>
+
 <source>Database file %x is incompatible.</source>
 <target>ملف قاعدة البيانات  %x غير متوافق.</target>
 
@@ -239,12 +399,6 @@
 <source>Database file is corrupted:</source>
 <target>ملف قاعدة البيانات تالف:</target>
 
-<source>Cannot write file %x.</source>
-<target>لا يمكن كتابة الملف  %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>لا يمكن قراءة الملف  %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>لا تحتوي ملفات قاعدة البيانات حتى الآن على معلومات حول المزامنة الأخيرة.</target>
 
@@ -263,9 +417,6 @@
 <source>Cannot get process information.</source>
 <target>لا يمكن الحصول على معلومات العملية.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>لا يمكن قراءة سمات الملف %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>انتظر بينما يتم إنشاء قفل للمسار:</target>
 
@@ -400,27 +551,12 @@
 <pluralform>%x بند</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>لا يمكن قراءة الدليل %x.</target>
-
 <source>%x/sec</source>
 <target>%x ثانية</target>
 
 <source>%x items</source>
 <target>%x عناصر</target>
 
-<source>Show in Explorer</source>
-<target>إظهار في المستكشف</target>
-
-<source>Open with default application</source>
-<target>فتح باستخدام التطبيق الافتراضي</target>
-
-<source>Browse directory</source>
-<target>تصفح المسار</target>
-
-<source>Unable to connect to %x.</source>
-<target>لا يمكن الاتصال بـ %x.</target>
-
 <source>Completed successfully</source>
 <target>تم بنجاح</target>
 
@@ -466,9 +602,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>لا يمكن كتابة سمات الملف %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>تعذر فتح الملف %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x و %y لديهما محتوى مختلف.</target>
 
@@ -499,29 +632,20 @@
 <source>Source item %x not found</source>
 <target>العنصر المصدر %x لم يتم ايجاده</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>لا يمكن نقل الملف  %x إلى %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>المجلد الأصل %x غير موجود.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>الأسم %x مستخدم بالفعل فى عنصر أخر.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>لا يمكن نسخ الملف %x إلى %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>لا يمكن نسخ الرابط الرمزي من %x إلى %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>جاري إنشاء نسخة ظل وسيطة لـ %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>تعذر العثور على المجلد %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>المجلد الهدف %x موجود سابقاً.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target></target>
 
 <source>Target folder input field must not be empty.</source>
 <target>يجب أن لا يكون حقل إدخال المجلد الهدف فارغاً.</target>
@@ -544,17 +668,14 @@
 <source>Not enough free disk space available in:</source>
 <target>المساحة الحرة المتوفرة على القرص غير كافية:</target>
 
-<source>Required:</source>
-<target>مطلوب:</target>
-
 <source>Available:</source>
 <target>متاح:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>ستتم مزامنة بعض الملفات كجزء من مجلدات قاعدة متعددة.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>لتجنب التعارضات، قم بإعداد مرشحات استبعاد بحيث يتم النظر في كل ملف محدث من قبل مجلد أساسي واحد فقط.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target></target>
 
 <source>Versioning folder:</source>
 <target>مجلد الإصدار:</target>
@@ -580,130 +701,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>تعذر إنشاء بصمة زمنية من أجل المفاضلة الزمنية:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-حجم غير متوقع لتدفق البيانات.
-المتوقع: ‎%x bytes
-الفعلي: ‎%y bytes
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>لا يمكن كتابة أذونات %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>العملية غير مدعومة بين الأجهزة المختلفة.</target>
-
-<source>Cannot delete file %x.</source>
-<target>لا يمكن حذف الملف  %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>لا يمكن حذف الرابط الرمزي %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>لا يمكن حذف المسار %x.</target>
-
-<source>Error Code %x</source>
-<target>رمز الخطأ %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>لا يمكن كتابة وقت تعديل %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>لا يمكن إنشاء المسار %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>تعذر تحديد المسار النهائي لـ %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>العملية غير مدعومة للجهاز.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>لا يمكن حل الارتباط الرمزي  %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>تعذر نقل %x إلى سلة المحذوفات.</target>
-
-<source>Authentication completed.</source>
-<target>نجحت المصادقة.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>يمكنك غلق هذه الصفحة والاستمرار باستخدام FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>فشلت المصادقة.</target>
-
-<source>Cannot find %x.</source>
-<target>لا يمكن العثور على %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>من فضلك امنح الاذن للمستحدم %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>لا يمكن تحديد مساحة القرص الحرة لـ %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>غير قادر على قطع الاتصال من %x.</target>
-
-<source>Unable to access %x.</source>
-<target>لا يمكن الوصول إلى  %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>فشل الحصول على معلومات حول الخادم %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>لا يمكن مراقبة المسار %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>لا يمكن العثور على الجهاز %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>لا يمكن فتح المسار %x.</target>
-
-<source>Unsupported item type.</source>
-<target>نوع العنصر غير مدعم.</target>
-
-<source>Incorrect command line:</source>
-<target>سطر أوامر خاطئ:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>لا يدعم الخادم المصادقة عبر %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>انقضت مهلة العملية بعد 0 ثانية.</pluralform>
-<pluralform>انقضت مهلة العملية بعد 1 ثانية.</pluralform>
-<pluralform>انقضت مهلة العملية بعد 2 ثانية.</pluralform>
-<pluralform>انقضت مهلة العملية بعد %x ثوان.</pluralform>
-<pluralform>انقضت مهلة العملية بعد %x ثانية.</pluralform>
-<pluralform>انقضت مهلة العملية بعد %x ثانية.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>لا يمكن الانتظار على أكثر 0 اتصال في وقت واحد.</pluralform>
-<pluralform>لا يمكن الانتظار على أكثر 1 اتصال في وقت واحد.</pluralform>
-<pluralform>لا يمكن الانتظار على أكثر 2 اتصال في وقت واحد.</pluralform>
-<pluralform>لا يمكن الانتظار على أكثر %x اتصالات في وقت واحد.</pluralform>
-<pluralform>لا يمكن الانتظار على أكثر من %x اتصالات في وقت واحد.</pluralform>
-<pluralform>لا يمكن الانتظار على أكثر من %x اتصالات في وقت واحد.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>الاتصال النشط: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>فشل فتح قناة SFTP رقم %x.</target>
-
 <source>Drag && drop</source>
 <target>سحب و إفلات</target>
 
@@ -770,6 +767,9 @@ Actual: %y bytes
 <source>Command line:</source>
 <target>سطر الأوامر:</target>
 
+<source>&Hide console window</source>
+<target></target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -805,6 +805,9 @@ The command is triggered if:
 <source>Waiting until directory is available:</source>
 <target>بإنتظار توافر المسار:</target>
 
+<source>&Configure</source>
+<target></target>
+
 <source>&Show error message</source>
 <target>أ&ظهر رسائل الخطأ.</target>
 
@@ -842,8 +845,8 @@ The command is triggered if:
 <source>Scanning...</source>
 <target>جاري الفحص...</target>
 
-<source>job name</source>
-<target>اسم المهمة</target>
+<source>configuration file</source>
+<target></target>
 
 <source>System: Sleep</source>
 <target>النظام: سكون</target>
@@ -854,8 +857,8 @@ The command is triggered if:
 <source>Nothing to synchronize</source>
 <target>لا يوجد شيء للمزامنة</target>
 
-<source>Executing command %x</source>
-<target>تنفيذ الأمر %x</target>
+<source>Executing command:</source>
+<target></target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>بإمكانك العودة إلى نافذة FreeFileSync الرئيسية لحل هذه المشكلة.</target>
@@ -1059,6 +1062,12 @@ The command is triggered if:
 <source>Match case</source>
 <target>مطابقة الحالة</target>
 
+<source>Processed:</source>
+<target></target>
+
+<source>Remaining:</source>
+<target></target>
+
 <source>New</source>
 <target>جديد</target>
 
@@ -1295,14 +1304,17 @@ The command is triggered if:
 <source>&Don't show this dialog again</source>
 <target>&لا تظهر نافذة الحوار هذه مرة ثانية</target>
 
-<source>Items found:</source>
-<target>العناصر التي تم العثور عليها:</target>
+<source>Bytes:</source>
+<target></target>
 
-<source>Time remaining:</source>
-<target>الوقت المتبقي:</target>
+<source>Items:</source>
+<target></target>
 
-<source>Time elapsed:</source>
-<target>الوقت المنقضي:</target>
+<source>Synchronizing...</source>
+<target>مزامنة...</target>
+
+<source>Minimize to notification area</source>
+<target>تصغير إلى منطقة التنبيهات</target>
 
 <source>Bytes</source>
 <target>بايت</target>
@@ -1310,12 +1322,6 @@ The command is triggered if:
 <source>Items</source>
 <target>العناصر</target>
 
-<source>Synchronizing...</source>
-<target>مزامنة...</target>
-
-<source>Minimize to notification area</source>
-<target>تصغير إلى منطقة التنبيهات</target>
-
 <source>When finished:</source>
 <target>عند الانتهاء:</target>
 
@@ -1391,6 +1397,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete logs after x days:</source>
 <target>&ازالة السجلات بعد x يوم:</target>
 
+<source>Notification sounds:</source>
+<target></target>
+
+<source>Synchronization finished:</source>
+<target></target>
+
 <source>Customize context menu:</source>
 <target>تخصيص القائمة المحلية:</target>
 
@@ -1611,12 +1623,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete</source>
 <target>&حذف</target>
 
-<source>Include all</source>
-<target>شمول الكل</target>
-
-<source>Exclude all</source>
-<target>استبعاد الكل</target>
-
 <source>Show icons:</source>
 <target>إظهار الأيقونات:</target>
 
@@ -1653,6 +1659,21 @@ This guarantees a consistent state even in case of a serious error.
 <source>Do&n't save</source>
 <target>&لا تحفظ</target>
 
+<source>%x cannot be renamed.</source>
+<target></target>
+
+<source>New name:</source>
+<target></target>
+
+<source>Rename Configuration</source>
+<target></target>
+
+<source>Configuration name must not be empty.</source>
+<target></target>
+
+<source>&Rename...</source>
+<target></target>
+
 <source>Hide configuration</source>
 <target>اخفاء التكوين</target>
 
@@ -1764,8 +1785,8 @@ This guarantees a consistent state even in case of a serious error.
 <source>Password:</source>
 <target>كلمة المرور:</target>
 
-<source>Key password:</source>
-<target>كلمة المرور الرئيسية:</target>
+<source>Key passphrase:</source>
+<target></target>
 
 <source>Please enter a file path.</source>
 <target>الرجاء إدخال مسار الملف.</target>
@@ -2010,6 +2031,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>The file is locked by another process:</source>
 <target>الملف مقفول من قبل عملية أخرى:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target></target>
+
 <source>Cannot read security context of %x.</source>
 <target>لا يمكن قراءة سياق الأمان %x.</target>
 
@@ -2069,12 +2093,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>Cannot change process I/O priorities.</source>
 <target>تعذر تغيير أولويات I/O للعملية.</target>
 
-<source>Unable to shut down the system.</source>
-<target>غير فادر على إيقاف تشغيل النظام.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>فشل تصفح سلة المهملات من أجل الملف %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>غير فادر على إيقاف تشغيل النظام.</target>
+
 <source>Prepare installation</source>
 <target>الاستعداد للتثبيت</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/bulgarian.lng b/FreeFileSync/Build/Resources/Languages/bulgarian.lng
index 3efecf07..b0ecdafd 100755
--- a/FreeFileSync/Build/Resources/Languages/bulgarian.lng
+++ b/FreeFileSync/Build/Resources/Languages/bulgarian.lng
@@ -7,6 +7,155 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>Не може да прочете файл %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Неочакван размер на потока данни.
+Очаквани: %x байта
+Фактически: %y байта
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Не може да запише файл %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Не може да запише правата за достъп на %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Операцията не се поддържа между различни устройства.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Не може да изтрие файл %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Не може да изтрие символна връзка %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Не може да изтрие директория %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Не може да премести файл %x в %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Не може да копира символна връзка %x в %y.</target>
+
+<source>Error Code %x</source>
+<target>Код на грешка %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>Не може да прочете директория %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Не може да запише времето на промяна на %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Не може да прочете атрибутите на файл %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Не може да създаде директория %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Не може да определи крайния път за %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Операцията не се поддържа от устройството.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Не може да проследи символна връзка %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Не може да премести %x в кошчето.</target>
+
+<source>Authentication completed.</source>
+<target>Аутентификацията завърши.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Може да затворите тази страница и да продължите с FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Аутентификацията неуспешна.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Не може да се свърже със %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Не може да намери %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>Името %x се използва от повече от един елемент в папката.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Моля, оторизирайте достъпа до потребителски акаунт %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Не може да отвори файл %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>Името %x вече се използва от друг елемент.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Не може да определи свободното дисково пространство за %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Не може да прекъсне връзката от %x.</target>
+
+<source>Unable to access %x.</source>
+<target>Няма достъп до %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Не може да получи информация за сървъра %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Не може да следи директория %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Не може да намери устройство %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Не може да отвори директория %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Неподдържан тип елемент.</target>
+
+<source>Incorrect command line:</source>
+<target>Невалиден команден ред:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>Сървърът не поддържа идентификация чрез %x.</target>
+
+<source>Required:</source>
+<target>Необходимо:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Времето на операцията изтича след 1 секунда.</pluralform>
+<pluralform>Времето на операцията изтича след %x секунди.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Не може да чака за повече от 1 връзка едновременно.</pluralform>
+<pluralform>Не може да чака за повече от %x връзки едновременно.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Активни връзки: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Не може да отвори SFTP-канал номер %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Двете страни променени след последната синхронизация.</target>
 
@@ -109,9 +258,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Инсталационните файлове са повредени. Моля, преинсталирайте FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Не може да зареди файл %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Не може да намери следните папки:</target>
 
@@ -139,6 +285,9 @@
 <pluralform>%x елемента намерени</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Изминало време:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Файл %x има невалидна дата.</target>
 
@@ -157,9 +306,6 @@
 <source>Items differ in attributes only</source>
 <target>Елементите се различават само по атрибути</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>Името %x се използва от повече от един елемент в папката.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Проследява символна връзка %x</target>
 
@@ -220,6 +366,15 @@
 <source>Out of memory.</source>
 <target>Недостатъчна памет.</target>
 
+<source>Show in Explorer</source>
+<target>Покажи в Експлорера</target>
+
+<source>Open with default application</source>
+<target>Отвори с подразбираното приложение</target>
+
+<source>Browse directory</source>
+<target>Преглед на директорията</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Базата данни %x е несъвместима.</target>
 
@@ -232,12 +387,6 @@
 <source>Database file is corrupted:</source>
 <target>Базата данни е повредена:</target>
 
-<source>Cannot write file %x.</source>
-<target>Не може да запише файл %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Не може да прочете файл %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Базите данни още не съдържат информация за последната синхронизация.</target>
 
@@ -256,9 +405,6 @@
 <source>Cannot get process information.</source>
 <target>Не може да получи информация за процеса.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Не може да прочете атрибутите на файл %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Изчаква, докато е заключена директорията:</target>
 
@@ -331,6 +477,27 @@
 <source>Update attributes on right</source>
 <target>Актуализирай атрибутите на десния елемент</target>
 
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Грешка при анализ на файл %x, ред %y, колона %z.</target>
+
+<source>Services</source>
+<target>Услуги</target>
+
+<source>Show All</source>
+<target>Покажи всички</target>
+
+<source>Hide Others</source>
+<target>Скрий другите</target>
+
+<source>Hide %x</source>
+<target>Скрий %x</target>
+
+<source>Quit %x</source>
+<target>Край на %x</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>Не може да заключи директориите за следните папки:</target>
+
 <source>Errors:</source>
 <target>Грешки:</target>
 
@@ -355,27 +522,6 @@
 <source>Cleaning up log files:</source>
 <target>Почистване на log-файловете:</target>
 
-<source>Error parsing file %x, row %y, column %z.</source>
-<target>Грешка при анализ на файл %x, ред %y, колона %z.</target>
-
-<source>Services</source>
-<target>Услуги</target>
-
-<source>Show All</source>
-<target>Покажи всички</target>
-
-<source>Hide Others</source>
-<target>Скрий другите</target>
-
-<source>Hide %x</source>
-<target>Скрий %x</target>
-
-<source>Quit %x</source>
-<target>Край на %x</target>
-
-<source>Cannot set directory locks for the following folders:</source>
-<target>Не може да заключи директориите за следните папки:</target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
@@ -385,27 +531,12 @@
 <pluralform>%x нишки</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Не може да прочете директория %x.</target>
-
 <source>%x/sec</source>
 <target>%x/сек.</target>
 
 <source>%x items</source>
 <target>%x елемента</target>
 
-<source>Show in Explorer</source>
-<target>Покажи в Експлорера</target>
-
-<source>Open with default application</source>
-<target>Отвори с подразбираното приложение</target>
-
-<source>Browse directory</source>
-<target>Преглед на директорията</target>
-
-<source>Unable to connect to %x.</source>
-<target>Не може да се свърже със %x.</target>
-
 <source>Completed successfully</source>
 <target>Завърши успешно</target>
 
@@ -451,9 +582,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Не може да запише файловите атрибути на %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Не може да отвори файл %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x и %y имат различно съдържание.</target>
 
@@ -484,29 +612,20 @@
 <source>Source item %x not found</source>
 <target>Изходен елемент %x не е намерен</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Не може да премести файл %x в %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Родителска папка %x не съществува.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>Името %x вече се използва от друг елемент.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Не може да копира файл %x в %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Не може да копира символна връзка %x в %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Създава се Volume Shadow Copy за %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Не е намерена папка %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Целевата папка %x вече съществува.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Целевата папка %x вече съществува, но не е била достъпна при сравняването на папки.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Полето за целева папка не бива да е празно.</target>
@@ -529,17 +648,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Недостатъчно свободно дисково пространство в:</target>
 
-<source>Required:</source>
-<target>Необходимо:</target>
-
 <source>Available:</source>
 <target>Налично:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Някои файлове ще бъдат синхронизирани като част от повече базови папки.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>За избягване конфликти задайте изключващи филтри, тъй че всеки актуализиран файл да бъде следен само от една базова папка.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>За избягване на конфликти задайте изключващи филтри, така че всеки обновен файл да е включен само в една базова папка.</target>
 
 <source>Versioning folder:</source>
 <target>Папка за версии:</target>
@@ -565,122 +681,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Не може да маркира времето на версиите:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Неочакван размер на потока данни.
-Очаквани: %x байта
-Фактически: %y байта
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Не може да запише правата за достъп на %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Операцията не се поддържа между различни устройства.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Не може да изтрие файл %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Не може да изтрие символна връзка %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Не може да изтрие директория %x.</target>
-
-<source>Error Code %x</source>
-<target>Код на грешка %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Не може да запише времето на промяна на %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Не може да създаде директория %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Не може да определи крайния път за %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Операцията не се поддържа от устройството.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Не може да проследи символна връзка %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Не може да премести %x в кошчето.</target>
-
-<source>Authentication completed.</source>
-<target>Аутентификацията завърши.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Може да затворите тази страница и да продължите с FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Аутентификацията неуспешна.</target>
-
-<source>Cannot find %x.</source>
-<target>Не може да намери %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Моля, оторизирайте достъпа до потребителски акаунт %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Не може да определи свободното дисково пространство за %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Не може да прекъсне връзката от %x.</target>
-
-<source>Unable to access %x.</source>
-<target>Няма достъп до %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Не може да получи информация за сървъра %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Не може да следи директория %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Не може да намери устройство %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Не може да отвори директория %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Неподдържан тип елемент.</target>
-
-<source>Incorrect command line:</source>
-<target>Невалиден команден ред:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>Сървърът не поддържа идентификация чрез %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Времето на операцията изтича след 1 секунда.</pluralform>
-<pluralform>Времето на операцията изтича след %x секунди.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Не може да чака за повече от 1 връзка едновременно.</pluralform>
-<pluralform>Не може да чака за повече от %x връзки едновременно.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Активни връзки: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Не може да отвори SFTP-канал номер %x.</target>
-
 <source>Drag && drop</source>
 <target>Влачете и пуснете</target>
 
@@ -747,6 +747,9 @@ Actual: %y bytes
 <source>Command line:</source>
 <target>Команден ред:</target>
 
+<source>&Hide console window</source>
+<target>&Скрий прозореца на конзолата</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -782,8 +785,8 @@ The command is triggered if:
 <source>Waiting until directory is available:</source>
 <target>Изчаква достъп до директорията:</target>
 
-<source>&Restore</source>
-<target>&Възстановяване</target>
+<source>&Configure</source>
+<target>&Конфигурирай</target>
 
 <source>&Show error message</source>
 <target>&Покажи съобщение за грешка</target>
@@ -818,8 +821,8 @@ The command is triggered if:
 <source>Scanning...</source>
 <target>Търси файлове...</target>
 
-<source>job name</source>
-<target>име на задача</target>
+<source>configuration file</source>
+<target>конфигурационен файл</target>
 
 <source>System: Sleep</source>
 <target>Система: Заспиване</target>
@@ -830,8 +833,8 @@ The command is triggered if:
 <source>Nothing to synchronize</source>
 <target>Нищо за синхронизиране</target>
 
-<source>Executing command %x</source>
-<target>Изпълнява команда %x</target>
+<source>Executing command:</source>
+<target>Изпълнява команда:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Може да идете в главния прозорец на FreeFileSync, за да решите проблема.</target>
@@ -1031,6 +1034,12 @@ The command is triggered if:
 <source>Match case</source>
 <target>Големи/малки букви</target>
 
+<source>Processed:</source>
+<target>Обработени:</target>
+
+<source>Remaining:</source>
+<target>Оставащи:</target>
+
 <source>New</source>
 <target>Нова</target>
 
@@ -1267,14 +1276,17 @@ The command is triggered if:
 <source>&Don't show this dialog again</source>
 <target>&Не показвай повече този диалог</target>
 
-<source>Items found:</source>
-<target>Открити елементи:</target>
+<source>Bytes:</source>
+<target>Байтове:</target>
 
-<source>Time remaining:</source>
-<target>Оставащо време:</target>
+<source>Items:</source>
+<target>Елементи:</target>
 
-<source>Time elapsed:</source>
-<target>Изминало време:</target>
+<source>Synchronizing...</source>
+<target>Синхронизация...</target>
+
+<source>Minimize to notification area</source>
+<target>Минимизирай в известяващото поле</target>
 
 <source>Bytes</source>
 <target>Байтове</target>
@@ -1282,12 +1294,6 @@ The command is triggered if:
 <source>Items</source>
 <target>Елементи</target>
 
-<source>Synchronizing...</source>
-<target>Синхронизация...</target>
-
-<source>Minimize to notification area</source>
-<target>Минимизирай в известяващото поле</target>
-
 <source>When finished:</source>
 <target>След завършване:</target>
 
@@ -1363,6 +1369,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete logs after x days:</source>
 <target>&Изтрий протоколите след x дни:</target>
 
+<source>Notification sounds:</source>
+<target>Известяващи звуци:</target>
+
+<source>Synchronization finished:</source>
+<target>Синхронизацията завърши:</target>
+
 <source>Customize context menu:</source>
 <target>Настрой контекстното меню:</target>
 
@@ -1513,33 +1525,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Execute</source>
 <target>&Изпълни</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 директория</pluralform>
-<pluralform>%x директории</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 файл</pluralform>
-<pluralform>%x файла</pluralform>
-</target>
-
-<source>
-<pluralform>Showing %y of 1 row</pluralform>
-<pluralform>Showing %y of %x rows</pluralform>
-</source>
-<target>
-<pluralform>Показани: %y от 1 ред</pluralform>
-<pluralform>Показани: %y от %x реда</pluralform>
-</target>
-
 <source>Set direction:</source>
 <target>Задай посока:</target>
 
@@ -1567,12 +1552,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete</source>
 <target>&Изтрий</target>
 
-<source>Include all</source>
-<target>Включи всички</target>
-
-<source>Exclude all</source>
-<target>Изключи всички</target>
-
 <source>Show icons:</source>
 <target>Покажи иконите:</target>
 
@@ -1609,6 +1588,21 @@ This guarantees a consistent state even in case of a serious error.
 <source>Do&n't save</source>
 <target>&Не запазвай</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x не може да се преименува.</target>
+
+<source>New name:</source>
+<target>Ново име:</target>
+
+<source>Rename Configuration</source>
+<target>Преименувай конфигурацията</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Името на конфигурацията не бива да е празно.</target>
+
+<source>&Rename...</source>
+<target>&Преименувай...</target>
+
 <source>Hide configuration</source>
 <target>Скрий конфигурацията</target>
 
@@ -1669,6 +1663,33 @@ This guarantees a consistent state even in case of a serious error.
 <source>All files are in sync</source>
 <target>Всички файлове са синхронизирани</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 директория</pluralform>
+<pluralform>%x директории</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 файл</pluralform>
+<pluralform>%x файла</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>Показани: %y от 1 ред</pluralform>
+<pluralform>Показани: %y от %x реда</pluralform>
+</target>
+
 <source>Cannot find %x</source>
 <target>Не е открит %x</target>
 
@@ -1720,8 +1741,8 @@ This guarantees a consistent state even in case of a serious error.
 <source>Password:</source>
 <target>Парола:</target>
 
-<source>Key password:</source>
-<target>Ключова фраза:</target>
+<source>Key passphrase:</source>
+<target>Фраза за достъп:</target>
 
 <source>Please enter a file path.</source>
 <target>Моля, въведете файлов път.</target>
@@ -1885,6 +1906,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Минималния брой версии трябва да е по-малък от максималния.</target>
 
+<source>&Restore</source>
+<target>&Възстановяване</target>
+
 <source>Files</source>
 <target>Файлове</target>
 
@@ -1951,6 +1975,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>The file is locked by another process:</source>
 <target>Файлът е заключен от друг процес:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Не може да определи поддръжката на права за достъп за папка %x.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Не може да прочете контекста за сигурност на %x.</target>
 
@@ -2002,12 +2029,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>Cannot change process I/O priorities.</source>
 <target>Не може да промени I/O-приоритетите на процеса.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Не може да изключи системата.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Неуспешна проверка на кошчето за папка %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Не може да изключи системата.</target>
+
 <source>Prepare installation</source>
 <target>Подготовка за инсталиране</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/chinese_simple.lng b/FreeFileSync/Build/Resources/Languages/chinese_simple.lng
index 7935f2d9..7b00b32b 100755
--- a/FreeFileSync/Build/Resources/Languages/chinese_simple.lng
+++ b/FreeFileSync/Build/Resources/Languages/chinese_simple.lng
@@ -7,6 +7,153 @@
 	<plural_definition>0</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>无法读取文件 %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+意外大小的数据流.
+预期: %x 字节
+实际: %y 字节
+</target>
+
+<source>Cannot write file %x.</source>
+<target>无法写入文件 %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>无法写入 %x 的权限.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>不同设备之间不支持此操作.</target>
+
+<source>Cannot delete file %x.</source>
+<target>无法删除文件 %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>无法删除符号链接 %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>无法删除目录 %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>无法移动文件 %x 到 %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>无法复制符号连接 %x 到 %y.</target>
+
+<source>Error Code %x</source>
+<target>错误代码 %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>无法读取目录 %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>无法写入 %x 的最后修改时间.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>无法读取 %x 的文件属性.</target>
+
+<source>Cannot create directory %x.</source>
+<target>无法创建目录 %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>无法确定 %x 的最终路径.</target>
+
+<source>Operation not supported by device.</source>
+<target>设备不支持此操作.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>无法解决符号连接 %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>无法将 %x 移动到回收站.</target>
+
+<source>Authentication completed.</source>
+<target>验证完成.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>你可以现在关闭本页面并继续使用 FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>验证失败.</target>
+
+<source>Unable to connect to %x.</source>
+<target>无法连接到 %x.</target>
+
+<source>Cannot find %x.</source>
+<target>无法找到 %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>%x 此名称在文件夹中被一个以上的项目所使用.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>请为用户账户 %x 授权访问.</target>
+
+<source>Cannot open file %x.</source>
+<target>无法打开文件 %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>名称 %x 已被其他项目使用.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>无法确定 %x 上的可用磁盘空间.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>无法从 %x 断开连接.</target>
+
+<source>Unable to access %x.</source>
+<target>无法访问 %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>获取关于服务器 %x 的信息时失败.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>无法监视目录 %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>无法找到设备 %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>无法打开目录 %x.</target>
+
+<source>Unsupported item type.</source>
+<target>不支持的项目类型.</target>
+
+<source>Incorrect command line:</source>
+<target>不正确的命令行:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>此服务器并不支持通过 %x 进行认证.</target>
+
+<source>Required:</source>
+<target>必需:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>%x 秒后操作超时.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>一次无法等待多于 %x 个的连接.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>活动的连接: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>打开SFTP通道号 %x 时失败.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>在最后的同步之后两边均已改变.</target>
 
@@ -109,9 +256,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>安装文件已损坏, 请重新安装FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>不能载入文件 %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>无法找到如下文件夹:</target>
 
@@ -138,6 +282,9 @@
 <pluralform>找到 %x 个项目</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>已用时间:</target>
+
 <source>File %x has an invalid date.</source>
 <target>文件 %x 的日期非法.</target>
 
@@ -156,9 +303,6 @@
 <source>Items differ in attributes only</source>
 <target>项目仅是文件属性不同</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>%x 此名称在文件夹中被一个以上的项目所使用.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>正在解决符号连接 %x</target>
 
@@ -219,6 +363,15 @@
 <source>Out of memory.</source>
 <target>内存不足.</target>
 
+<source>Show in Explorer</source>
+<target>在Explorer中显示</target>
+
+<source>Open with default application</source>
+<target>用默认应用软件打开</target>
+
+<source>Browse directory</source>
+<target>浏览目录</target>
+
 <source>Database file %x is incompatible.</source>
 <target>数据库文件 %x 不兼容.</target>
 
@@ -231,12 +384,6 @@
 <source>Database file is corrupted:</source>
 <target>数据库文件已损坏:</target>
 
-<source>Cannot write file %x.</source>
-<target>无法写入文件 %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>无法读取文件 %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>此数据库文件并未包含 有关最后同步的信息.</target>
 
@@ -255,9 +402,6 @@
 <source>Cannot get process information.</source>
 <target>无法取得进程信息.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>无法读取 %x 的文件属性.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>正在等待因目录被锁定:</target>
 
@@ -382,27 +526,12 @@
 <pluralform>%x 线程</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>无法读取目录 %x.</target>
-
 <source>%x/sec</source>
 <target>%x/秒</target>
 
 <source>%x items</source>
 <target>%x 个项目</target>
 
-<source>Show in Explorer</source>
-<target>在Explorer中显示</target>
-
-<source>Open with default application</source>
-<target>用默认应用软件打开</target>
-
-<source>Browse directory</source>
-<target>浏览目录</target>
-
-<source>Unable to connect to %x.</source>
-<target>无法连接到 %x.</target>
-
 <source>Completed successfully</source>
 <target>成功完成</target>
 
@@ -448,9 +577,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>无法写入 %x 的文件属性.</target>
 
-<source>Cannot open file %x.</source>
-<target>无法打开文件 %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x 和 %y 有着不同的内容.</target>
 
@@ -481,29 +607,20 @@
 <source>Source item %x not found</source>
 <target>来源项目 %x 未找到</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>无法移动文件 %x 到 %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>上级文件夹 %x 不存在.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>名称 %x 已被其他项目使用.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>无法复制文件 %x 到 %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>无法复制符号连接 %x 到 %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>正在为 %x 创建一个卷影副本...</target>
 
 <source>Cannot find folder %x.</source>
 <target>无法找到文件夹 %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>目标文件夹 %x 已经存在.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>目标文件夹 %x 已经存在, 但比较期间不可用.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>目标文件夹输入框必须不为空.</target>
@@ -526,17 +643,14 @@
 <source>Not enough free disk space available in:</source>
 <target>没有足够的可用磁盘空间:</target>
 
-<source>Required:</source>
-<target>必需:</target>
-
 <source>Available:</source>
 <target>可用:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>某些文件将作为多个基础文件夹 的一部分被同步.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>为了避免冲突, 请设置排除过滤器, 以便每个已更新的文件 仅被一个基础文件夹所考虑.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>为避免冲突, 请设置排除过滤器, 以便每个已更新的文件只被一个基础文件夹所包含.</target>
 
 <source>Versioning folder:</source>
 <target>历史版本文件夹:</target>
@@ -562,120 +676,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>无法为历史版本创建时间戳:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-意外大小的数据流.
-预期: %x 字节
-实际: %y 字节
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>无法写入 %x 的权限.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>不同设备之间不支持此操作.</target>
-
-<source>Cannot delete file %x.</source>
-<target>无法删除文件 %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>无法删除符号链接 %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>无法删除目录 %x.</target>
-
-<source>Error Code %x</source>
-<target>错误代码 %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>无法写入 %x 的最后修改时间.</target>
-
-<source>Cannot create directory %x.</source>
-<target>无法创建目录 %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>无法确定 %x 的最终路径.</target>
-
-<source>Operation not supported by device.</source>
-<target>设备不支持此操作.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>无法解决符号连接 %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>无法将 %x 移动到回收站.</target>
-
-<source>Authentication completed.</source>
-<target>验证完成.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>你可以现在关闭本页面并继续使用 FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>验证失败.</target>
-
-<source>Cannot find %x.</source>
-<target>无法找到 %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>请为用户账户 %x 授权访问.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>无法确定 %x 上的可用磁盘空间.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>无法从 %x 断开连接.</target>
-
-<source>Unable to access %x.</source>
-<target>无法访问 %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>获取关于服务器 %x 的信息时失败.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>无法监视目录 %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>无法找到设备 %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>无法打开目录 %x.</target>
-
-<source>Unsupported item type.</source>
-<target>不支持的项目类型.</target>
-
-<source>Incorrect command line:</source>
-<target>不正确的命令行:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>此服务器并不支持通过 %x 进行认证.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>%x 秒后操作超时.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>一次无法等待多于 %x 个的连接.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>活动的连接: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>打开SFTP通道号 %x 时失败.</target>
-
 <source>Drag && drop</source>
 <target>拖放</target>
 
@@ -742,6 +742,9 @@ Actual: %y bytes
 <source>Command line:</source>
 <target>命令行:</target>
 
+<source>&Hide console window</source>
+<target>隐藏控制台窗口(&H)</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -777,8 +780,8 @@ The command is triggered if:
 <source>Waiting until directory is available:</source>
 <target>等待直到目录可用:</target>
 
-<source>&Restore</source>
-<target>恢复(&R)</target>
+<source>&Configure</source>
+<target>配置(&C)</target>
 
 <source>&Show error message</source>
 <target>显示错误信息(&S)</target>
@@ -812,8 +815,8 @@ The command is triggered if:
 <source>Scanning...</source>
 <target>正扫描...</target>
 
-<source>job name</source>
-<target>作业名称</target>
+<source>configuration file</source>
+<target>配置文件</target>
 
 <source>System: Sleep</source>
 <target>系统: 休眠</target>
@@ -824,8 +827,8 @@ The command is triggered if:
 <source>Nothing to synchronize</source>
 <target>没有什么可同步</target>
 
-<source>Executing command %x</source>
-<target>正在执行命令 %x</target>
+<source>Executing command:</source>
+<target>执行命令:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>你可以切换至 FreeFileSync 的主窗口来解决这个问题.</target>
@@ -1024,6 +1027,12 @@ The command is triggered if:
 <source>Match case</source>
 <target>匹配大小写</target>
 
+<source>Processed:</source>
+<target>已处理:</target>
+
+<source>Remaining:</source>
+<target>剩余:</target>
+
 <source>New</source>
 <target>新建</target>
 
@@ -1260,14 +1269,17 @@ The command is triggered if:
 <source>&Don't show this dialog again</source>
 <target>不要再显示这个对话框(&D)</target>
 
-<source>Items found:</source>
-<target>已找到的项目:</target>
+<source>Bytes:</source>
+<target>字节:</target>
 
-<source>Time remaining:</source>
-<target>剩余时间:</target>
+<source>Items:</source>
+<target>项目:</target>
 
-<source>Time elapsed:</source>
-<target>已用时间:</target>
+<source>Synchronizing...</source>
+<target>同步中...</target>
+
+<source>Minimize to notification area</source>
+<target>最小化到系统托盘</target>
 
 <source>Bytes</source>
 <target>字节</target>
@@ -1275,12 +1287,6 @@ The command is triggered if:
 <source>Items</source>
 <target>项目</target>
 
-<source>Synchronizing...</source>
-<target>同步中...</target>
-
-<source>Minimize to notification area</source>
-<target>最小化到系统托盘</target>
-
 <source>When finished:</source>
 <target>当完成时:</target>
 
@@ -1353,6 +1359,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete logs after x days:</source>
 <target>在 x 天后删除日志(&D):</target>
 
+<source>Notification sounds:</source>
+<target>通知声音:</target>
+
+<source>Synchronization finished:</source>
+<target>同步完成:</target>
+
 <source>Customize context menu:</source>
 <target>自定义右键菜单:</target>
 
@@ -1553,12 +1565,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete</source>
 <target>删除(&D)</target>
 
-<source>Include all</source>
-<target>包括所有</target>
-
-<source>Exclude all</source>
-<target>排除所有</target>
-
 <source>Show icons:</source>
 <target>显示图标:</target>
 
@@ -1595,6 +1601,21 @@ This guarantees a consistent state even in case of a serious error.
 <source>Do&n't save</source>
 <target>不保存(&N)</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x 无法被重命名.</target>
+
+<source>New name:</source>
+<target>新文件名:</target>
+
+<source>Rename Configuration</source>
+<target>重命名配置</target>
+
+<source>Configuration name must not be empty.</source>
+<target>配置名称必须不为空.</target>
+
+<source>&Rename...</source>
+<target>重命名(&R)...</target>
+
 <source>Hide configuration</source>
 <target>隐藏配置文件</target>
 
@@ -1706,8 +1727,8 @@ This guarantees a consistent state even in case of a serious error.
 <source>Password:</source>
 <target>密码:</target>
 
-<source>Key password:</source>
-<target>密钥密码:</target>
+<source>Key passphrase:</source>
+<target>密钥口令短语:</target>
 
 <source>Please enter a file path.</source>
 <target>请输入一个文件路径.</target>
@@ -1868,6 +1889,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>最小版本计数必须小于最大计数.</target>
 
+<source>&Restore</source>
+<target>恢复(&R)</target>
+
 <source>Files</source>
 <target>文件</target>
 
@@ -1934,6 +1958,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>The file is locked by another process:</source>
 <target>此文件被另一进程锁定:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>无法确定文件夹 %x 所支持的权限.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>无法读取 %x 的安全上下文.</target>
 
@@ -1983,12 +2010,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>Cannot change process I/O priorities.</source>
 <target>无法更改进程的I/O优先级.</target>
 
-<source>Unable to shut down the system.</source>
-<target>无法关闭系统.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>检查文件夹 %x 的回收站失败.</target>
 
+<source>Unable to shut down the system.</source>
+<target>无法关闭系统.</target>
+
 <source>Prepare installation</source>
 <target>准备安装</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/chinese_traditional.lng b/FreeFileSync/Build/Resources/Languages/chinese_traditional.lng
index 95c942d2..901500b9 100755
--- a/FreeFileSync/Build/Resources/Languages/chinese_traditional.lng
+++ b/FreeFileSync/Build/Resources/Languages/chinese_traditional.lng
@@ -7,6 +7,153 @@
 	<plural_definition>0</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>無法讀取檔案 %x。</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+非預期的資料流大小。
+預期：%x 位元組
+實際：%y 位元組
+</target>
+
+<source>Cannot write file %x.</source>
+<target>無法寫入檔案 %x。</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>無法寫入 %x 的權限。</target>
+
+<source>Operation not supported between different devices.</source>
+<target>不支援不同裝置間的操作。</target>
+
+<source>Cannot delete file %x.</source>
+<target>無法刪除目錄 %x。</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>無法刪除符號連結 %x。</target>
+
+<source>Cannot delete directory %x.</source>
+<target>無法刪除目錄 %x。</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>無法移動檔案 %x 到 %y。</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>無法複製符號連結 %x 到 %y。</target>
+
+<source>Error Code %x</source>
+<target>錯誤碼 %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>無法讀取目錄 %x。</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>無法寫入 %x 的修改時間。</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>無法讀取 %x 的檔案屬性。</target>
+
+<source>Cannot create directory %x.</source>
+<target>無法建立目錄 %x。</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>無法確定 %x 最後路徑。</target>
+
+<source>Operation not supported by device.</source>
+<target>不支援該裝置的操作。</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>無法解析符號連結 %x。</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>無法將 %x 移動到資源回收筒。</target>
+
+<source>Authentication completed.</source>
+<target>驗證完成。</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>您可以立即關閉此頁面並繼續使用FreeFileSync。</target>
+
+<source>Authentication failed.</source>
+<target>驗證失敗。</target>
+
+<source>Unable to connect to %x.</source>
+<target>無法連接到 %x。</target>
+
+<source>Cannot find %x.</source>
+<target>找不到 %x。</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>名稱 %x 已被資料夾中的多個項目使用。</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>請授權存取使用者帳號 %x。</target>
+
+<source>Cannot open file %x.</source>
+<target>無法開啟檔案 %x。</target>
+
+<source>The name %x is already used by another item.</source>
+<target>名稱 %x 已被另一個項目使用。</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>無法確定 %x 的可用磁碟空間。</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>無法中斷 %x 的連線。</target>
+
+<source>Unable to access %x.</source>
+<target>無法存取 %x。</target>
+
+<source>Failed to get information about server %x.</source>
+<target>無法取得關於伺服器 %x 的資訊。</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>無法監測目錄 %x。</target>
+
+<source>Cannot find device %x.</source>
+<target>找不到裝置 %x。</target>
+
+<source>Cannot open directory %x.</source>
+<target>無法開啟目錄 %x。</target>
+
+<source>Unsupported item type.</source>
+<target>不支援的項目類型。</target>
+
+<source>Incorrect command line:</source>
+<target>不正確的命令列：</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>伺服器不支援 %x 進行驗證。</target>
+
+<source>Required:</source>
+<target>必要：</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>在 %x 秒後操作逾時。</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>無法一次等待超過 %x 個連線數。</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>活動連線數：%x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>無法開啟SFTP通道號 %x。</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>自上次同步後，兩邊均已變更過。</target>
 
@@ -77,7 +224,7 @@
 <target>目錄透過命令列設定時，該設定檔不能包含配對目錄層級的設定。</target>
 
 <source>Directories cannot be set for more than one configuration file.</source>
-<target>目錄無法設定多個配置檔。</target>
+<target>目錄無法設定多個配置檔案。</target>
 
 <source>Command line</source>
 <target>命令列</target>
@@ -109,9 +256,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>安裝檔已損壞。請重新安裝FreeFileSync。</target>
 
-<source>Cannot load file %x.</source>
-<target>無法載入檔案 %x。</target>
-
 <source>Cannot find the following folders:</source>
 <target>找不到下列資料夾：</target>
 
@@ -122,7 +266,7 @@
 <target>這些資料夾是在需要時自動建立的。</target>
 
 <source>The following folder paths differ in case. Please use a single form in order to avoid duplicate accesses.</source>
-<target>以下資料夾路徑大小寫不同。請使用單一形式，避免重複存取。</target>
+<target>下列資料夾路徑大小寫不同。請使用單一形式，避免重複存取。</target>
 
 <source>Scanning:</source>
 <target>正在掃瞄：</target>
@@ -138,6 +282,9 @@
 <pluralform>找到 %x 個項目。</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>經過時間：</target>
+
 <source>File %x has an invalid date.</source>
 <target>檔案 %x 的日期無效。</target>
 
@@ -156,9 +303,6 @@
 <source>Items differ in attributes only</source>
 <target>只有項目的屬性不同</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>名稱 %x 已被資料夾中的多個項目使用。</target>
-
 <source>Resolving symbolic link %x</source>
 <target>正在解析符號連結 %x</target>
 
@@ -175,7 +319,7 @@
 <target>啟用</target>
 
 <source>Disabled</source>
-<target>禁用</target>
+<target>停用</target>
 
 <source>Copy locked files</source>
 <target>複製被鎖定的檔案</target>
@@ -202,7 +346,7 @@
 <target>資料夾輸入欄位是空白。</target>
 
 <source>The corresponding folder will be considered as empty.</source>
-<target>對應的資料夾將視為空的。</target>
+<target>對應的資料夾將視為空資料夾。</target>
 
 <source>Exclude:</source>
 <target>排除：</target>
@@ -219,6 +363,15 @@
 <source>Out of memory.</source>
 <target>記憶體不足。</target>
 
+<source>Show in Explorer</source>
+<target>在檔案總管中顯示</target>
+
+<source>Open with default application</source>
+<target>使用預設的應用程式開啟</target>
+
+<source>Browse directory</source>
+<target>瀏覽目錄</target>
+
 <source>Database file %x is incompatible.</source>
 <target>資料庫檔案 %x 不相容。</target>
 
@@ -231,14 +384,8 @@
 <source>Database file is corrupted:</source>
 <target>資料庫檔案已損壞：</target>
 
-<source>Cannot write file %x.</source>
-<target>無法寫入檔案 %x。</target>
-
-<source>Cannot read file %x.</source>
-<target>無法讀取檔案 %x。</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
-<target>資料庫檔案尚未包含關於上次同步資訊。</target>
+<target>資料庫檔案未包含上次同步資訊。</target>
 
 <source>Loading file %x...</source>
 <target>正在讀取檔案 %x…</target>
@@ -255,9 +402,6 @@
 <source>Cannot get process information.</source>
 <target>無法取得處理訊息。</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>無法讀取 %x 的檔案屬性。</target>
-
 <source>Waiting while directory is locked:</source>
 <target>等待目錄被鎖定：</target>
 
@@ -309,10 +453,10 @@
 <target>刪除右邊項目</target>
 
 <source>Move file on left</source>
-<target>移動左邊的檔案</target>
+<target>移動左邊檔案</target>
 
 <source>Move file on right</source>
-<target>移動右邊的檔案</target>
+<target>移動右邊檔案</target>
 
 <source>Update left item</source>
 <target>更新左邊項目</target>
@@ -324,10 +468,31 @@
 <target>維持原狀</target>
 
 <source>Update attributes on left</source>
-<target>更新左邊的屬性</target>
+<target>更新左邊屬性</target>
 
 <source>Update attributes on right</source>
-<target>更新右邊的屬性</target>
+<target>更新右邊屬性</target>
+
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>解析 %x 檔案，第 %y 列，第 %z 行出現錯誤。</target>
+
+<source>Services</source>
+<target>服務</target>
+
+<source>Show All</source>
+<target>顯示全部</target>
+
+<source>Hide Others</source>
+<target>隱藏其他</target>
+
+<source>Hide %x</source>
+<target>隱藏 %x</target>
+
+<source>Quit %x</source>
+<target>結束 %x</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>無法為以下資料夾設定目錄鎖定：</target>
 
 <source>Errors:</source>
 <target>錯誤：</target>
@@ -353,27 +518,6 @@
 <source>Cleaning up log files:</source>
 <target>清除紀錄檔：</target>
 
-<source>Error parsing file %x, row %y, column %z.</source>
-<target>解析 %x 檔案，第 %y 列，第 %z 行出現錯誤。</target>
-
-<source>Services</source>
-<target>服務</target>
-
-<source>Show All</source>
-<target>顯示全部</target>
-
-<source>Hide Others</source>
-<target>隱藏其他</target>
-
-<source>Hide %x</source>
-<target>隱藏 %x</target>
-
-<source>Quit %x</source>
-<target>結束 %x</target>
-
-<source>Cannot set directory locks for the following folders:</source>
-<target>無法為以下資料夾設定目錄鎖定：</target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
@@ -382,27 +526,12 @@
 <pluralform>%x 個執行緒</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>無法讀取目錄 %x。</target>
-
 <source>%x/sec</source>
 <target>%x/秒</target>
 
 <source>%x items</source>
 <target>%x 項目</target>
 
-<source>Show in Explorer</source>
-<target>在資源管理器中顯示</target>
-
-<source>Open with default application</source>
-<target>使用預設的應用程式開啟</target>
-
-<source>Browse directory</source>
-<target>瀏覽目錄</target>
-
-<source>Unable to connect to %x.</source>
-<target>無法連接到 %x。</target>
-
 <source>Completed successfully</source>
 <target>成功完成</target>
 
@@ -448,9 +577,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>無法寫入 %x 的檔案屬性。</target>
 
-<source>Cannot open file %x.</source>
-<target>無法開啟檔案 %x。</target>
-
 <source>%x and %y have different content.</source>
 <target>%x 和 %y 具有不同的內容。</target>
 
@@ -481,29 +607,20 @@
 <source>Source item %x not found</source>
 <target>找不到來源項目 %x</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>無法移動檔案 %x 到 %y。</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>上層資料夾 %x 不存在。</target>
 
-<source>The name %x is already used by another item.</source>
-<target>名稱 %x 已被另一個項目使用。</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>無法複製檔案 %x 到 %y。</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>無法複製符號連結 %x 到 %y。</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>正在建立磁碟區陰影複製為 %x…</target>
 
 <source>Cannot find folder %x.</source>
 <target>找不到資料夾 %x。</target>
 
-<source>Target folder %x already existing.</source>
-<target>目標資料夾 %x 已存在。</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>目標資料夾 %x 已存在，在資料夾比對時不可用。</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>目標資料夾輸入欄位不能為空白。</target>
@@ -526,17 +643,14 @@
 <source>Not enough free disk space available in:</source>
 <target>沒有足夠的可用磁碟空間：</target>
 
-<source>Required:</source>
-<target>必要：</target>
-
 <source>Available:</source>
 <target>可用：</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>某些檔案將作為多個底層資料夾的一部分進行同步。</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>為了避免衝突，設定排除過濾器，以便每個更新過的檔案被視為只有一個底層資料夾。</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>為了避免衝突，請設定排除篩選器，以便每個更新檔案僅包含一個底層資料夾。</target>
 
 <source>Versioning folder:</source>
 <target>版本控制資料夾：</target>
@@ -562,120 +676,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>無法建立時間戳記的版本控制：</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-非預期的資料流大小。
-預期：%x 位元組
-實際：%y 位元組
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>無法寫入 %x 的權限。</target>
-
-<source>Operation not supported between different devices.</source>
-<target>不支援不同裝置間的操作。</target>
-
-<source>Cannot delete file %x.</source>
-<target>無法刪除目錄 %x。</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>無法刪除符號連結 %x。</target>
-
-<source>Cannot delete directory %x.</source>
-<target>無法刪除目錄 %x。</target>
-
-<source>Error Code %x</source>
-<target>錯誤代碼 %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>無法寫入 %x 的修改時間。</target>
-
-<source>Cannot create directory %x.</source>
-<target>無法建立目錄 %x。</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>無法確定 %x 最後路徑。</target>
-
-<source>Operation not supported by device.</source>
-<target>不支援該裝置的操作。</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>無法解析符號連結 %x。</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>無法將 %x 移動到資源回收筒。</target>
-
-<source>Authentication completed.</source>
-<target>認證完成。</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>您可以立即關閉此頁面並繼續使用FreeFileSync。</target>
-
-<source>Authentication failed.</source>
-<target>認證失敗。</target>
-
-<source>Cannot find %x.</source>
-<target>找不到 %x。</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>請授權存取使用者帳號 %x。</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>無法確定 %x 的可用磁碟空間。</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>無法中斷 %x 的連線。</target>
-
-<source>Unable to access %x.</source>
-<target>無法存取 %x。</target>
-
-<source>Failed to get information about server %x.</source>
-<target>無法取得關於伺服器 %x 的資訊。</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>無法監測目錄 %x。</target>
-
-<source>Cannot find device %x.</source>
-<target>找不到裝置 %x。</target>
-
-<source>Cannot open directory %x.</source>
-<target>無法開啟目錄 %x。</target>
-
-<source>Unsupported item type.</source>
-<target>不支援的項類型。</target>
-
-<source>Incorrect command line:</source>
-<target>不正確的命令列：</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>伺服器不支援 %x 進行認證。</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>在 %x 秒後操作逾時。</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>無法一次等待超過 %x 個連線數。</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>活動連線數：%x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>無法開啟SFTP通道號 %x。</target>
-
 <source>Drag && drop</source>
 <target>拖放</target>
 
@@ -742,6 +742,9 @@ Actual: %y bytes
 <source>Command line:</source>
 <target>命令列：</target>
 
+<source>&Hide console window</source>
+<target>隱藏主控台視窗(&H)</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -777,8 +780,8 @@ The command is triggered if:
 <source>Waiting until directory is available:</source>
 <target>正在等待可用目錄：</target>
 
-<source>&Restore</source>
-<target>還原(&R)</target>
+<source>&Configure</source>
+<target>配置(&C)</target>
 
 <source>&Show error message</source>
 <target>顯示錯誤訊息(&S)</target>
@@ -812,8 +815,8 @@ The command is triggered if:
 <source>Scanning...</source>
 <target>正在掃瞄…</target>
 
-<source>job name</source>
-<target>工作名稱</target>
+<source>configuration file</source>
+<target>配置檔案</target>
 
 <source>System: Sleep</source>
 <target>系統：睡眠</target>
@@ -824,8 +827,8 @@ The command is triggered if:
 <source>Nothing to synchronize</source>
 <target>沒有要同步的內容</target>
 
-<source>Executing command %x</source>
-<target>執行命令 %x</target>
+<source>Executing command:</source>
+<target>執行命令：</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>您可以切換到FreeFileSync的主視窗來解決此問題。</target>
@@ -1024,6 +1027,12 @@ The command is triggered if:
 <source>Match case</source>
 <target>區分大小寫</target>
 
+<source>Processed:</source>
+<target>已處理：</target>
+
+<source>Remaining:</source>
+<target>剩餘：</target>
+
 <source>New</source>
 <target>新增</target>
 
@@ -1192,7 +1201,7 @@ The command is triggered if:
 <target>連線類型：</target>
 
 <source>Connected user accounts:</source>
-<target>連線的使用者帳號：</target>
+<target>已連線的使用者帳號：</target>
 
 <source>&Add connection</source>
 <target>新增連線(&A)</target>
@@ -1213,13 +1222,13 @@ The command is triggered if:
 <target>加密：</target>
 
 <source>&Disabled</source>
-<target>已禁用(&D)</target>
+<target>停用(&D)</target>
 
 <source>&Explicit SSL/TLS</source>
 <target>外顯式SSL/TLS(&E)</target>
 
 <source>Authentication:</source>
-<target>認證：</target>
+<target>驗證：</target>
 
 <source>&Password</source>
 <target>密碼(&P)：</target>
@@ -1260,14 +1269,17 @@ The command is triggered if:
 <source>&Don't show this dialog again</source>
 <target>不再顯示此對話框(&D)</target>
 
-<source>Items found:</source>
-<target>找到的項目：</target>
+<source>Bytes:</source>
+<target>位元組：</target>
 
-<source>Time remaining:</source>
-<target>剩餘時間：</target>
+<source>Items:</source>
+<target>項目：</target>
 
-<source>Time elapsed:</source>
-<target>經過時間：</target>
+<source>Synchronizing...</source>
+<target>正在同步…</target>
+
+<source>Minimize to notification area</source>
+<target>最小化到通知區域</target>
 
 <source>Bytes</source>
 <target>位元組</target>
@@ -1275,12 +1287,6 @@ The command is triggered if:
 <source>Items</source>
 <target>項目</target>
 
-<source>Synchronizing...</source>
-<target>正在同步…</target>
-
-<source>Minimize to notification area</source>
-<target>最小化到通知區域</target>
-
 <source>When finished:</source>
 <target>完成後：</target>
 
@@ -1342,7 +1348,7 @@ This guarantees a consistent state even in case of a serious error.
 <target>共用的副本或鎖定的檔案使用磁碟區陰影複製服務。</target>
 
 <source>requires administrator rights</source>
-<target>需要管理員權限</target>
+<target>需要系統管理員權限</target>
 
 <source>Transfer file and folder permissions.</source>
 <target>傳輸檔案和資料夾的權限。</target>
@@ -1356,8 +1362,14 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete logs after x days:</source>
 <target>在 x 天後刪除紀錄(&D)：</target>
 
+<source>Notification sounds:</source>
+<target>通知音效：</target>
+
+<source>Synchronization finished:</source>
+<target>同步完成：</target>
+
 <source>Customize context menu:</source>
-<target>自訂內容功能表：</target>
+<target>自訂右鍵功能表：</target>
 
 <source>Description</source>
 <target>描述</target>
@@ -1384,7 +1396,7 @@ This guarantees a consistent state even in case of a serious error.
 <target>贊助與支持</target>
 
 <source>The auto updater was disabled by the administrator.</source>
-<target>自動更新程式已被管理員禁用。</target>
+<target>自動更新程式被系統管理員停用。</target>
 
 <source>Donation details</source>
 <target>贊助詳情</target>
@@ -1459,7 +1471,7 @@ This guarantees a consistent state even in case of a serious error.
 <target>選項(&O)</target>
 
 <source>Main Bar</source>
-<target>主欄位</target>
+<target>主要欄位</target>
 
 <source>Folder Pairs</source>
 <target>配對資料夾</target>
@@ -1505,30 +1517,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Execute</source>
 <target>執行(&E)</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x 個目錄</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x 個檔案</pluralform>
-</target>
-
-<source>
-<pluralform>Showing %y of 1 row</pluralform>
-<pluralform>Showing %y of %x rows</pluralform>
-</source>
-<target>
-<pluralform>顯示第 %x 列中的第 %y 列</pluralform>
-</target>
-
 <source>Set direction:</source>
 <target>設定方向：</target>
 
@@ -1556,12 +1544,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete</source>
 <target>刪除(&D)</target>
 
-<source>Include all</source>
-<target>包含所有</target>
-
-<source>Exclude all</source>
-<target>排除所有</target>
-
 <source>Show icons:</source>
 <target>顯示圖示：</target>
 
@@ -1598,6 +1580,21 @@ This guarantees a consistent state even in case of a serious error.
 <source>Do&n't save</source>
 <target>不儲存(&N)</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x 無法重新命名。</target>
+
+<source>New name:</source>
+<target>新名稱：</target>
+
+<source>Rename Configuration</source>
+<target>重新命名配置名稱</target>
+
+<source>Configuration name must not be empty.</source>
+<target>配置名稱不能空白。</target>
+
+<source>&Rename...</source>
+<target>重新命名(&R)…</target>
+
 <source>Hide configuration</source>
 <target>隱藏配置</target>
 
@@ -1620,10 +1617,10 @@ This guarantees a consistent state even in case of a serious error.
 <target>顯示右邊較新的檔案</target>
 
 <source>Show files that are equal</source>
-<target>顯示相同的檔案</target>
+<target>顯示相同檔案</target>
 
 <source>Show files that are different</source>
-<target>顯示不同的檔案</target>
+<target>顯示不同檔案</target>
 
 <source>Show conflicts</source>
 <target>顯示衝突</target>
@@ -1658,6 +1655,30 @@ This guarantees a consistent state even in case of a serious error.
 <source>All files are in sync</source>
 <target>所有檔案都同步</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x 個目錄</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x 個檔案</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>顯示第 %x 列中的第 %y 列</pluralform>
+</target>
+
 <source>Cannot find %x</source>
 <target>找不到 %x</target>
 
@@ -1709,7 +1730,7 @@ This guarantees a consistent state even in case of a serious error.
 <source>Password:</source>
 <target>密碼：</target>
 
-<source>Key password:</source>
+<source>Key passphrase:</source>
 <target>金鑰密碼：</target>
 
 <source>Please enter a file path.</source>
@@ -1755,7 +1776,7 @@ This guarantees a consistent state even in case of a serious error.
 <target>複製DACL、SACL、擁有者、群組</target>
 
 <source>Integrate external applications into context menu. The following macros are available:</source>
-<target>整合內容功能表中的外部應用程式。可使用下列的巨集：</target>
+<target>整合右鍵功能表中的外部應用程式。可使用下列的巨集：</target>
 
 <source>Full file or folder path</source>
 <target>完整檔案或資料夾路徑</target>
@@ -1871,6 +1892,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>最小版本總數必須小於最大總數。</target>
 
+<source>&Restore</source>
+<target>還原(&R)</target>
+
 <source>Files</source>
 <target>檔案</target>
 
@@ -1937,6 +1961,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>The file is locked by another process:</source>
 <target>檔案被另一個處理程序鎖定：</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>無法確定資料夾 %x 的檔案權限。</target>
+
 <source>Cannot read security context of %x.</source>
 <target>無法讀取 %x 的安全內容。</target>
 
@@ -1986,17 +2013,17 @@ This guarantees a consistent state even in case of a serious error.
 <source>Cannot change process I/O priorities.</source>
 <target>無法更改I/O處理優先順序。</target>
 
-<source>Unable to shut down the system.</source>
-<target>無法關閉系統。</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>檢查資源回收筒的資料夾 %x 失敗。</target>
 
+<source>Unable to shut down the system.</source>
+<target>無法關閉系統。</target>
+
 <source>Prepare installation</source>
 <target>準備安裝</target>
 
 <source>Choose which components you want to install.</source>
-<target>選擇您想要安裝哪些元件。</target>
+<target>選擇您要安裝的元件。</target>
 
 <source>Select installation type:</source>
 <target>選擇安裝類型：</target>
@@ -2014,7 +2041,7 @@ This guarantees a consistent state even in case of a serious error.
 <target>註冊FreeFileSync檔案關聯</target>
 
 <source>Create Explorer context menu entries</source>
-<target>建立資源管理器右鍵選單項目</target>
+<target>建立檔案總管右鍵功能表</target>
 
 <source>Save settings in installation directory</source>
 <target>儲存設定到安裝目錄</target>
diff --git a/FreeFileSync/Build/Resources/Languages/croatian.lng b/FreeFileSync/Build/Resources/Languages/croatian.lng
index 09495a23..1acf95e3 100755
--- a/FreeFileSync/Build/Resources/Languages/croatian.lng
+++ b/FreeFileSync/Build/Resources/Languages/croatian.lng
@@ -7,6 +7,157 @@
 	<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>Cannot read file %x.</source>
+<target>Ne mogu čitati datoteku %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Neočekivana veličina podataka.
+Očekivano: %x bajta
+Stvarno: %y bajta
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Ne mogu zapisati datoteku %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Ne mogu zapisati dopuštenja za %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Zadatak nije podržan između različitih uređaja.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Ne mogu izbrisati datoteku %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Nije moguće brisanje simbolične poveznice %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Ne mogu izbrisati mapu %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Ne mogu premjestiti datoteku %x u %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Ne može se kopirati simbolična poveznica %x prema %y.</target>
+
+<source>Error Code %x</source>
+<target>Kod greške %x.</target>
+
+<source>Cannot read directory %x.</source>
+<target>Nije moguće učitati mapu %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Ne mogu zapisati vrijeme izmjene %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Ne mogu pročitati osobine od %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Ne mogu izraditi mapu %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Ne mogu odrediti završnu putanju za %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Zadatak nije podržan od uređaja.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Ne mogu odrediti simboličnu poveznicu %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Nije moguće premjestiti %x u koš za smeće.</target>
+
+<source>Authentication completed.</source>
+<target>Provjera autentičnosti dovršena.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Sada možete zatvoriti ovu stranicu i nastaviti sa FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Provjera autentičnosti nije uspjela.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Nije moguće povezivanje na %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Nije moguće pronaći %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>Naziv %x se koristi za više od jedne stavke u mapi.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Molimo odobrite pristup korisničkom računu %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Ne mogu otvoriti datoteku %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>Naziv %x se već koristi u drugoj datoteci.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Nije moguće izračunati slobodan prostor diska za %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Nije moguće prekinuti vezu s %x.</target>
+
+<source>Unable to access %x.</source>
+<target>Nije moguće pristupiti %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Nije moguće pristupiti informacijama servera %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Ne mogu nadzirati direktorij %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Nije moguće pronaći uređaj %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Ne mogu otvoriti mapu %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Nepodržan tip datoteke.</target>
+
+<source>Incorrect command line:</source>
+<target>Netočna naredbena linija:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>Server ne podržava provjeru autentičnosti preko %x.</target>
+
+<source>Required:</source>
+<target>Potrebno:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Vrijeme za operaciju je isteklo nakon %x sekundu.</pluralform>
+<pluralform>Vrijeme za operaciju je isteklo nakon %x sekundi.</pluralform>
+<pluralform>Vrijeme za operaciju je isteklo nakon %x sekundi.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Ne može se čekati na više od %x konekcije istovremeno.</pluralform>
+<pluralform>Ne može se čekati na više od %x konekcija istovremeno.</pluralform>
+<pluralform>Ne može se čekati na više od %x konekcija istovremeno.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Aktivne konekcije: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Nije uspjelo povezivanje na SFTP kanal broj %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Obje strane su promjenjene nakon zadnje sinkronizacije.</target>
 
@@ -109,9 +260,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Instalacijske datoteke su oštećene. Molimo ponovno instalirajte FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Ne mogu učitati datoteku %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Ne mogu pronaći slijedeće mape:</target>
 
@@ -140,6 +288,9 @@
 <pluralform>%x stavki pronađeno</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Proteklo vremena:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Datoteka %x ima nevažeći datum.</target>
 
@@ -158,9 +309,6 @@
 <source>Items differ in attributes only</source>
 <target>Stavke se razlikuju samo u atributima</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>Naziv %x se koristi za više od jedne stavke u mapi.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Rješavam simboličku vezu %x</target>
 
@@ -221,6 +369,15 @@
 <source>Out of memory.</source>
 <target>Nedostatak memorije.</target>
 
+<source>Show in Explorer</source>
+<target>Prikaži u Exploreru</target>
+
+<source>Open with default application</source>
+<target>Otvori s zadanom aplikacijom</target>
+
+<source>Browse directory</source>
+<target>Odaberi direktorij</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Datoteka baze %x je nekompatibilna.</target>
 
@@ -233,12 +390,6 @@
 <source>Database file is corrupted:</source>
 <target>Datoteka baze je oštećena:</target>
 
-<source>Cannot write file %x.</source>
-<target>Ne mogu zapisati datoteku %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Ne mogu čitati datoteku %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Datoteke baze još uvijek ne sadrže informacije o zadnjoj sinkronizaciji.</target>
 
@@ -257,9 +408,6 @@
 <source>Cannot get process information.</source>
 <target>Ne mogu dobit informacije o procesu.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Ne mogu pročitati osobine od %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Čekam dok se mapa zaključa:</target>
 
@@ -333,6 +481,27 @@
 <source>Update attributes on right</source>
 <target>Osvježi atribute desno</target>
 
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Greška u analizi datoteke %x, red %y, stupac %z.</target>
+
+<source>Services</source>
+<target>Servisi</target>
+
+<source>Show All</source>
+<target>Prikaži sve</target>
+
+<source>Hide Others</source>
+<target>Sakrij ostale</target>
+
+<source>Hide %x</source>
+<target>Sakrij %x</target>
+
+<source>Quit %x</source>
+<target>Napusti %x</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>Nije moguće zaključavanje slijedećih foldera:</target>
+
 <source>Errors:</source>
 <target>Pogreške:</target>
 
@@ -357,27 +526,6 @@
 <source>Cleaning up log files:</source>
 <target>Brisanje log datoteka:</target>
 
-<source>Error parsing file %x, row %y, column %z.</source>
-<target>Greška u analizi datoteke %x, red %y, stupac %z.</target>
-
-<source>Services</source>
-<target>Servisi</target>
-
-<source>Show All</source>
-<target>Prikaži sve</target>
-
-<source>Hide Others</source>
-<target>Sakrij ostale</target>
-
-<source>Hide %x</source>
-<target>Sakrij %x</target>
-
-<source>Quit %x</source>
-<target>Napusti %x</target>
-
-<source>Cannot set directory locks for the following folders:</source>
-<target>Nije moguće zaključavanje slijedećih foldera:</target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
@@ -388,27 +536,12 @@
 <pluralform>%x niti</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Nije moguće učitati mapu %x.</target>
-
 <source>%x/sec</source>
 <target>%x/sek</target>
 
 <source>%x items</source>
 <target>%x stavki</target>
 
-<source>Show in Explorer</source>
-<target>Prikaži u Exploreru</target>
-
-<source>Open with default application</source>
-<target>Otvori s zadanom aplikacijom</target>
-
-<source>Browse directory</source>
-<target>Odaberi direktorij</target>
-
-<source>Unable to connect to %x.</source>
-<target>Nije moguće povezivanje na %x.</target>
-
 <source>Completed successfully</source>
 <target>Dovršeno uspješno</target>
 
@@ -454,9 +587,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Ne mogu zapisati svojstva od %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Ne mogu otvoriti datoteku %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x. i %y imaju različit sadržaj.</target>
 
@@ -487,29 +617,20 @@
 <source>Source item %x not found</source>
 <target>Izvorna datoteka %x nije pronađena</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Ne mogu premjestiti datoteku %x u %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Glavna mapa %x ne postoji.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>Naziv %x se već koristi u drugoj datoteci.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Ne mogu kopirati datoteku %x na %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Ne može se kopirati simbolična poveznica %x prema %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Kreiranje Volume Shadow Copy za %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Ne mogu pronaći mapu %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Odredišna mapa %x već postoji.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Ciljna mapa %x već postoji, ali nije bila dostupna prilikom usporedbe mapa.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Odredišna mapa ne može biti prazna.</target>
@@ -532,17 +653,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Nedovoljno prostora na disku:</target>
 
-<source>Required:</source>
-<target>Potrebno:</target>
-
 <source>Available:</source>
 <target>Dostupno:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Neke datoteke će biti sinkronizirane kao dio više baznih mapa.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Da bi izbjegli konflikt, postavite filtere za izdvajanje tako da se svaka ažurirana datoteka uzima u obzir samo kod jedne bazne mape.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Da biste izbjegli sukobe, postavite filtere za izuzeće tako da svaka ažurirana datoteka bude sadržana u samo jednoj baznoj mapi.</target>
 
 <source>Versioning folder:</source>
 <target>Verzija mape:</target>
@@ -568,124 +686,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Nije moguća izrada vremenske oznake za označavanje:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Neočekivana veličina podataka.
-Očekivano: %x bajta
-Stvarno: %y bajta
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Ne mogu zapisati dopuštenja za %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Zadatak nije podržan između različitih uređaja.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Ne mogu izbrisati datoteku %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Nije moguće brisanje simbolične poveznice %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Ne mogu izbrisati mapu %x.</target>
-
-<source>Error Code %x</source>
-<target>Kod greške %x.</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Ne mogu zapisati vrijeme izmjene %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Ne mogu izraditi mapu %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Ne mogu odrediti završnu putanju za %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Zadatak nije podržan od uređaja.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Ne mogu odrediti simboličnu poveznicu %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Nije moguće premjestiti %x u koš za smeće.</target>
-
-<source>Authentication completed.</source>
-<target>Provjera autentičnosti dovršena.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Sada možete zatvoriti ovu stranicu i nastaviti sa FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Provjera autentičnosti nije uspjela.</target>
-
-<source>Cannot find %x.</source>
-<target>Nije moguće pronaći %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Molimo odobrite pristup korisničkom računu %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Nije moguće izračunati slobodan prostor diska za %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Nije moguće prekinuti vezu s %x.</target>
-
-<source>Unable to access %x.</source>
-<target>Nije moguće pristupiti %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Nije moguće pristupiti informacijama servera %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Ne mogu nadzirati direktorij %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Nije moguće pronaći uređaj %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Ne mogu otvoriti mapu %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Nepodržan tip datoteke.</target>
-
-<source>Incorrect command line:</source>
-<target>Netočna naredbena linija:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>Server ne podržava provjeru autentičnosti preko %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Vrijeme za operaciju je isteklo nakon %x sekundu.</pluralform>
-<pluralform>Vrijeme za operaciju je isteklo nakon %x sekundi.</pluralform>
-<pluralform>Vrijeme za operaciju je isteklo nakon %x sekundi.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Ne može se čekati na više od %x konekcije istovremeno.</pluralform>
-<pluralform>Ne može se čekati na više od %x konekcija istovremeno.</pluralform>
-<pluralform>Ne može se čekati na više od %x konekcija istovremeno.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Aktivne konekcije: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Nije uspjelo povezivanje na SFTP kanal broj %x.</target>
-
 <source>Drag && drop</source>
 <target>Povuci && ispusti</target>
 
@@ -752,6 +752,9 @@ Stvarno: %y bajta
 <source>Command line:</source>
 <target>Naredbena linija:</target>
 
+<source>&Hide console window</source>
+<target>&Sakrij upravljački prozor</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -787,8 +790,8 @@ Naredba će biti pokrenuta ako se:
 <source>Waiting until directory is available:</source>
 <target>Čekanje dok mapa bude dostupna:</target>
 
-<source>&Restore</source>
-<target>&Vrati</target>
+<source>&Configure</source>
+<target>&Postavke</target>
 
 <source>&Show error message</source>
 <target>&Pokaži poruke o greškama</target>
@@ -824,8 +827,8 @@ Naredba će biti pokrenuta ako se:
 <source>Scanning...</source>
 <target>Tražim...</target>
 
-<source>job name</source>
-<target>Naziv zadatka</target>
+<source>configuration file</source>
+<target>datoteka postavki</target>
 
 <source>System: Sleep</source>
 <target>Sistem: Spavanje</target>
@@ -836,8 +839,8 @@ Naredba će biti pokrenuta ako se:
 <source>Nothing to synchronize</source>
 <target>Ništa za sinkronizirati</target>
 
-<source>Executing command %x</source>
-<target>Izvršavanje naredbe %x</target>
+<source>Executing command:</source>
+<target>Naredba za izuzeće:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Možete prijeći na glavni prozor FreeFileSynca da bi rješili ovaj problem.</target>
@@ -1038,6 +1041,12 @@ Naredba će biti pokrenuta ako se:
 <source>Match case</source>
 <target>Identičan naziv</target>
 
+<source>Processed:</source>
+<target>Odrađeno:</target>
+
+<source>Remaining:</source>
+<target>Preostalo:</target>
+
 <source>New</source>
 <target>Novo</target>
 
@@ -1274,14 +1283,17 @@ Naredba će biti pokrenuta ako se:
 <source>&Don't show this dialog again</source>
 <target>&Nemoj više prikazivati ovaj dijaloški prozor</target>
 
-<source>Items found:</source>
-<target>Pronađene stavke:</target>
+<source>Bytes:</source>
+<target>Bajta:</target>
 
-<source>Time remaining:</source>
-<target>Preostalo vremena:</target>
+<source>Items:</source>
+<target>Stavki:</target>
 
-<source>Time elapsed:</source>
-<target>Proteklo vremena:</target>
+<source>Synchronizing...</source>
+<target>Sinkroniziranje...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimiziraj u područje obavjesti</target>
 
 <source>Bytes</source>
 <target>Bajta</target>
@@ -1289,12 +1301,6 @@ Naredba će biti pokrenuta ako se:
 <source>Items</source>
 <target>Stavke</target>
 
-<source>Synchronizing...</source>
-<target>Sinkroniziranje...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimiziraj u područje obavjesti</target>
-
 <source>When finished:</source>
 <target>Nakon završetka:</target>
 
@@ -1370,6 +1376,12 @@ Ovo garantira stabilno stanje čak u slučaju ozbiljne greške.
 <source>&Delete logs after x days:</source>
 <target>&Izbrisati zapisnike nakon x dana:</target>
 
+<source>Notification sounds:</source>
+<target>Zvukovi upozorenja:</target>
+
+<source>Synchronization finished:</source>
+<target>Sinkronizacija dovršena:</target>
+
 <source>Customize context menu:</source>
 <target>Prilagodite kontekstni izbornik:</target>
 
@@ -1521,36 +1533,6 @@ Ovo garantira stabilno stanje čak u slučaju ozbiljne greške.
 <source>&Execute</source>
 <target>&Izvrši</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x direktorij</pluralform>
-<pluralform>%x direktorija</pluralform>
-<pluralform>%x direktorija</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x datoteka</pluralform>
-<pluralform>%x datoteke</pluralform>
-<pluralform>%x datoteka</pluralform>
-</target>
-
-<source>
-<pluralform>Showing %y of 1 row</pluralform>
-<pluralform>Showing %y of %x rows</pluralform>
-</source>
-<target>
-<pluralform>Prikazano %y od %x reda</pluralform>
-<pluralform>Prikazano %y od %x redova</pluralform>
-<pluralform>Prikazano %y od %x redova</pluralform>
-</target>
-
 <source>Set direction:</source>
 <target>Odaberi smjer:</target>
 
@@ -1578,12 +1560,6 @@ Ovo garantira stabilno stanje čak u slučaju ozbiljne greške.
 <source>&Delete</source>
 <target>&Izbriši</target>
 
-<source>Include all</source>
-<target>Uključi sve</target>
-
-<source>Exclude all</source>
-<target>Izdvoji sve</target>
-
 <source>Show icons:</source>
 <target>Prikaži ikone:</target>
 
@@ -1620,6 +1596,21 @@ Ovo garantira stabilno stanje čak u slučaju ozbiljne greške.
 <source>Do&n't save</source>
 <target>&Nemoj spremiti</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x nije moguće preimenovati.</target>
+
+<source>New name:</source>
+<target>Novi naziv:</target>
+
+<source>Rename Configuration</source>
+<target>Postavke preimenovanja</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Naziv postavki ne može biti prazan.</target>
+
+<source>&Rename...</source>
+<target>&Preimenovanje...</target>
+
 <source>Hide configuration</source>
 <target>Sakrij postavke</target>
 
@@ -1680,6 +1671,36 @@ Ovo garantira stabilno stanje čak u slučaju ozbiljne greške.
 <source>All files are in sync</source>
 <target>Sve datoteke su u sinkronizaciji</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x direktorij</pluralform>
+<pluralform>%x direktorija</pluralform>
+<pluralform>%x direktorija</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x datoteka</pluralform>
+<pluralform>%x datoteke</pluralform>
+<pluralform>%x datoteka</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>Prikazano %y od %x reda</pluralform>
+<pluralform>Prikazano %y od %x redova</pluralform>
+<pluralform>Prikazano %y od %x redova</pluralform>
+</target>
+
 <source>Cannot find %x</source>
 <target>Ne mogu pronaći %x</target>
 
@@ -1731,8 +1752,8 @@ Ovo garantira stabilno stanje čak u slučaju ozbiljne greške.
 <source>Password:</source>
 <target>Lozinka:</target>
 
-<source>Key password:</source>
-<target>Aktivacijski ključ:</target>
+<source>Key passphrase:</source>
+<target>Lozinka:</target>
 
 <source>Please enter a file path.</source>
 <target>Molimo unesite putanju datoteke.</target>
@@ -1899,6 +1920,9 @@ Ovo garantira stabilno stanje čak u slučaju ozbiljne greške.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Broj minimalnih verzija treba biti manji od maksimalnog broja.</target>
 
+<source>&Restore</source>
+<target>&Vrati</target>
+
 <source>Files</source>
 <target>Datoteke</target>
 
@@ -1965,6 +1989,9 @@ Ovo garantira stabilno stanje čak u slučaju ozbiljne greške.
 <source>The file is locked by another process:</source>
 <target>Datoteku koristi drugi proces:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Neuspješno otkrivanje dopuštenja pristupa za mapu %x.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Ne mogu čitati zaštićeni sadržaj %x.</target>
 
@@ -2018,12 +2045,12 @@ Ovo garantira stabilno stanje čak u slučaju ozbiljne greške.
 <source>Cannot change process I/O priorities.</source>
 <target>Ne može se promjeniti proces I/O prioriteta.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Nije moguće isključiti računalo.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Provjeravanje koša za smeće neuspješno za mapu %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Nije moguće isključiti računalo.</target>
+
 <source>Prepare installation</source>
 <target>Pripremam instalaciju</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/czech.lng b/FreeFileSync/Build/Resources/Languages/czech.lng
index a9624a8b..006c8dc8 100755
--- a/FreeFileSync/Build/Resources/Languages/czech.lng
+++ b/FreeFileSync/Build/Resources/Languages/czech.lng
@@ -7,6 +7,157 @@
 	<plural_definition>n==1 ? 0 : n>=2 && n<=4 ? 1 : 2</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>Nelze číst soubor %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
++Neočekávaná velikost dat.
+Očekáváno: %x b
+Aktuálně: %y b
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Nelze zapsat soubor %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Nelze zapsat oprávnění pro %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Operace není podporována mezi různými zařízeními.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Nelze smazat soubor %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Nelze smazat symbolický odkaz %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Nelze smazat adresář %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Nelze přesunout soubor %x do %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Nelze kopírovat symbolický odkaz %x do %y.</target>
+
+<source>Error Code %x</source>
+<target>Chybový kód %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>Nelze číst adresář %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Nelze nastavit čas změny ve vlastnostech %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Nelze číst vlastnosti souboru %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Nelze vytvořit adresář %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Nelze určit výslednou cestu pro %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Operace není zařízením podporována.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Nelze najít odkaz zástupce %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Není možné přesunout %x do Koše.</target>
+
+<source>Authentication completed.</source>
+<target>Přístup povolen.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Nyní můžete tuto stránku zavřít a pokračovat s FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Přístup odmítnut.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Nepodařilo se připojit k %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Nelze najít %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>Název %x je použit více jak jednou položkou ve složce.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Prosím autorizujte přístup k uživatelskému účtu %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Nelze otevřít soubor %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>Název %x je již používán jinou položkou.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Nelze zjistit volné místo na disku %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Nelze se odpojit od %x.</target>
+
+<source>Unable to access %x.</source>
+<target>Nepodařil se přístup k %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Nelze získat informace o serveru %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Nelze nastavit monitorování adresáře %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Nelze nalézt zařízení %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Nelze otevřít adresář %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Nepodporovaný typ položky.</target>
+
+<source>Incorrect command line:</source>
+<target>Neplatný příkaz:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>Server nepodporuje ověření pomocí %x.</target>
+
+<source>Required:</source>
+<target>Požadováno:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Vypršel čas 1 sekundy pro dokončení operace.</pluralform>
+<pluralform>Vypršel čas %x sekund pro dokončení operace.</pluralform>
+<pluralform>Vypršel čas %x sekund pro dokončení operace.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Nelze čekat na více jak 1 spojení najednou.</pluralform>
+<pluralform>Nelze čekat na více jak %x spojení najednou.</pluralform>
+<pluralform>Nelze čekat na více jak %x spojení najednou.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Aktivní spojení: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Nelze otevřít SFTP kanál %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Došlo ke změně obou stran od poslední synchronizace.</target>
 
@@ -109,9 +260,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Instalace programu je poškozena. Prosím nainstalujte znovu FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Nelze načíst soubor %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Nelze najít následující složky:</target>
 
@@ -140,6 +288,9 @@
 <pluralform>%x položek nalezeno</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Uplynulý čas:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Soubor %x má chybné datum.</target>
 
@@ -158,9 +309,6 @@
 <source>Items differ in attributes only</source>
 <target>Položky se liší pouze ve vlastnostech</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>Název %x je použit více jak jednou položkou ve složce.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Hledání odkazu symbolického zástupce %x</target>
 
@@ -221,6 +369,15 @@
 <source>Out of memory.</source>
 <target>Nedostatek pracovní paměti.</target>
 
+<source>Show in Explorer</source>
+<target>Zobrazit v Průzkumníkovi</target>
+
+<source>Open with default application</source>
+<target>Otevřít výchozí aplikací</target>
+
+<source>Browse directory</source>
+<target>Procházet adresář</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Chybný formát databáze %x.</target>
 
@@ -233,12 +390,6 @@
 <source>Database file is corrupted:</source>
 <target>Databáze je poškozená:</target>
 
-<source>Cannot write file %x.</source>
-<target>Nelze zapsat soubor %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Nelze číst soubor %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Databázový soubor ještě neobsahuje informace o poslední synchronizaci.</target>
 
@@ -257,9 +408,6 @@
 <source>Cannot get process information.</source>
 <target>Nelze získat informace procesu.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Nelze číst vlastnosti souboru %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Čekání na uzamčení adresáře:</target>
 
@@ -333,6 +481,27 @@
 <source>Update attributes on right</source>
 <target>Nastavit vlastnosti vpravo</target>
 
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Chyba zpracování souboru %x: na řádku %y ve sloupci %z.</target>
+
+<source>Services</source>
+<target>Služby</target>
+
+<source>Show All</source>
+<target>Zobrazit vše</target>
+
+<source>Hide Others</source>
+<target>Skrýt ostatní</target>
+
+<source>Hide %x</source>
+<target>Skrýt %x</target>
+
+<source>Quit %x</source>
+<target>Ukončit %x</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>Nelze uzamčít následující adresáře:</target>
+
 <source>Errors:</source>
 <target>Chyb:</target>
 
@@ -357,27 +526,6 @@
 <source>Cleaning up log files:</source>
 <target>Vyčištění žurnálů:</target>
 
-<source>Error parsing file %x, row %y, column %z.</source>
-<target>Chyba zpracování souboru %x: na řádku %y ve sloupci %z.</target>
-
-<source>Services</source>
-<target>Služby</target>
-
-<source>Show All</source>
-<target>Zobrazit vše</target>
-
-<source>Hide Others</source>
-<target>Skrýt ostatní</target>
-
-<source>Hide %x</source>
-<target>Skrýt %x</target>
-
-<source>Quit %x</source>
-<target>Ukončit %x</target>
-
-<source>Cannot set directory locks for the following folders:</source>
-<target>Nelze uzamčít následující adresáře:</target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
@@ -388,27 +536,12 @@
 <pluralform>%x procesů</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Nelze číst adresář %x.</target>
-
 <source>%x/sec</source>
 <target>%x/s</target>
 
 <source>%x items</source>
 <target>%x položek</target>
 
-<source>Show in Explorer</source>
-<target>Zobrazit v Průzkumníkovi</target>
-
-<source>Open with default application</source>
-<target>Otevřít výchozí aplikací</target>
-
-<source>Browse directory</source>
-<target>Procházet adresář</target>
-
-<source>Unable to connect to %x.</source>
-<target>Nepodařilo se připojit k %x.</target>
-
 <source>Completed successfully</source>
 <target>Úspěšně dokončeno</target>
 
@@ -454,9 +587,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Nelze zapsat vlastnosti souboru %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Nelze otevřít soubor %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x a %y mají odlišný obsah.</target>
 
@@ -487,29 +617,20 @@
 <source>Source item %x not found</source>
 <target>Zdrojová položka %x nenalezena.</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Nelze přesunout soubor %x do %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Nadřazená složka %x neexistuje.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>Název %x je již používán jinou položkou.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Nelze kopírovat soubor %x do %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Nelze kopírovat symbolický odkaz %x do %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Vytváření Stínové kopie pro %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Nelze najít složku %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Cílová složka %x již existuje.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Cílová složka %x již existuje, ale při porovnávání nebyla k dispozici.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Cílová složka nesmí být prázdná.</target>
@@ -532,16 +653,13 @@
 <source>Not enough free disk space available in:</source>
 <target>Nedostatek místa na disku:</target>
 
-<source>Required:</source>
-<target>Požadováno:</target>
-
 <source>Available:</source>
 <target>K dispozici:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Některé soubory budou synchronizovány jako součást vícezdrojových složek.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
 <target>K předejití konfliktů je potřeba nastavit filtr tak, aby každý soubor měl pouze jednu základní nadřazenou složku.</target>
 
 <source>Versioning folder:</source>
@@ -568,124 +686,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Nelze vytvořit časové značky verzování:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-+Neočekávaná velikost dat.
-Očekáváno: %x b
-Aktuálně: %y b
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Nelze zapsat oprávnění pro %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Operace není podporována mezi různými zařízeními.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Nelze smazat soubor %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Nelze smazat symbolický odkaz %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Nelze smazat adresář %x.</target>
-
-<source>Error Code %x</source>
-<target>Chybový kód %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Nelze nastavit čas změny ve vlastnostech %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Nelze vytvořit adresář %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Nelze určit výslednou cestu pro %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Operace není zařízením podporována.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Nelze najít odkaz zástupce %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Není možné přesunout %x do Koše.</target>
-
-<source>Authentication completed.</source>
-<target>Přístup povolen.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Nyní můžete tuto stránku zavřít a pokračovat s FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Přístup odmítnut.</target>
-
-<source>Cannot find %x.</source>
-<target>Nelze najít %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Prosím autorizujte přístup k uživatelskému účtu %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Nelze zjistit volné místo na disku %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Nelze se odpojit od %x.</target>
-
-<source>Unable to access %x.</source>
-<target>Nepodařil se přístup k %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Nelze získat informace o serveru %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Nelze nastavit monitorování adresáře %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Nelze nalézt zařízení %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Nelze otevřít adresář %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Nepodporovaný typ položky.</target>
-
-<source>Incorrect command line:</source>
-<target>Neplatný příkaz:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>Server nepodporuje ověření pomocí %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Vypršel čas 1 sekundy pro dokončení operace.</pluralform>
-<pluralform>Vypršel čas %x sekund pro dokončení operace.</pluralform>
-<pluralform>Vypršel čas %x sekund pro dokončení operace.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Nelze čekat na více jak 1 spojení najednou.</pluralform>
-<pluralform>Nelze čekat na více jak %x spojení najednou.</pluralform>
-<pluralform>Nelze čekat na více jak %x spojení najednou.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Aktivní spojení: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Nelze otevřít SFTP kanál %x.</target>
-
 <source>Drag && drop</source>
 <target>Přetáhni sem && pusť</target>
 
@@ -752,6 +752,9 @@ Aktuálně: %y b
 <source>Command line:</source>
 <target>Příkazová řádka:</target>
 
+<source>&Hide console window</source>
+<target>&Skrýt příkazové okno</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -787,8 +790,8 @@ Příkaz je spuštěn když:
 <source>Waiting until directory is available:</source>
 <target>Čekání na dostupnost adresáře:</target>
 
-<source>&Restore</source>
-<target>&Obnovit</target>
+<source>&Configure</source>
+<target>&Nastavit</target>
 
 <source>&Show error message</source>
 <target>Zobrazit chybové &hlášení</target>
@@ -824,8 +827,8 @@ Příkaz je spuštěn když:
 <source>Scanning...</source>
 <target>Zpracovávání...</target>
 
-<source>job name</source>
-<target>název úlohy</target>
+<source>configuration file</source>
+<target>soubor nastavení</target>
 
 <source>System: Sleep</source>
 <target>Režim spánku počítače</target>
@@ -836,8 +839,8 @@ Příkaz je spuštěn když:
 <source>Nothing to synchronize</source>
 <target>Není co synchronizovat</target>
 
-<source>Executing command %x</source>
-<target>Spuštění příkazu %x</target>
+<source>Executing command:</source>
+<target>Spuštění příkazu:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>K odstranění tohoto problému se přepněte do hlavního okna FreeFileSync.</target>
@@ -1038,6 +1041,12 @@ Příkaz je spuštěn když:
 <source>Match case</source>
 <target>Rozlišovat malá a velká písmena</target>
 
+<source>Processed:</source>
+<target>Zpracováno:</target>
+
+<source>Remaining:</source>
+<target>Zbývá:</target>
+
 <source>New</source>
 <target>Nový</target>
 
@@ -1274,14 +1283,17 @@ Příkaz je spuštěn když:
 <source>&Don't show this dialog again</source>
 <target>Tento dialog již &nezobrazovat</target>
 
-<source>Items found:</source>
-<target>Nalezeno položek:</target>
+<source>Bytes:</source>
+<target>Dat:</target>
 
-<source>Time remaining:</source>
-<target>Zbývající čas:</target>
+<source>Items:</source>
+<target>Položek:</target>
 
-<source>Time elapsed:</source>
-<target>Uplynulý čas:</target>
+<source>Synchronizing...</source>
+<target>Synchronizuji...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimalizovat do oznamovací oblasti</target>
 
 <source>Bytes</source>
 <target>Bajtů</target>
@@ -1289,12 +1301,6 @@ Příkaz je spuštěn když:
 <source>Items</source>
 <target>Položek</target>
 
-<source>Synchronizing...</source>
-<target>Synchronizuji...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimalizovat do oznamovací oblasti</target>
-
 <source>When finished:</source>
 <target>Po dokončení:</target>
 
@@ -1367,6 +1373,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete logs after x days:</source>
 <target>&Smazat žurnály po (dnech):</target>
 
+<source>Notification sounds:</source>
+<target>Zvuky upozornění:</target>
+
+<source>Synchronization finished:</source>
+<target>Dokončení synchronizace:</target>
+
 <source>Customize context menu:</source>
 <target>Přizpůsobit kontextovou nabídku:</target>
 
@@ -1518,36 +1530,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Execute</source>
 <target>&Spustit</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 adresář</pluralform>
-<pluralform>%x adresáře</pluralform>
-<pluralform>%x adresářů</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 soubor</pluralform>
-<pluralform>%x soubory</pluralform>
-<pluralform>%x souborů</pluralform>
-</target>
-
-<source>
-<pluralform>Showing %y of 1 row</pluralform>
-<pluralform>Showing %y of %x rows</pluralform>
-</source>
-<target>
-<pluralform>Zobrazení %y z 1 řádku</pluralform>
-<pluralform>Zobrazení %y z %x řádků</pluralform>
-<pluralform>Zobrazení %y z %x řádků</pluralform>
-</target>
-
 <source>Set direction:</source>
 <target>Nastavit adresář:</target>
 
@@ -1575,12 +1557,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete</source>
 <target>&Smazat</target>
 
-<source>Include all</source>
-<target>Zahrnout vše</target>
-
-<source>Exclude all</source>
-<target>Vynechat vše</target>
-
 <source>Show icons:</source>
 <target>Ikony:</target>
 
@@ -1617,6 +1593,21 @@ This guarantees a consistent state even in case of a serious error.
 <source>Do&n't save</source>
 <target>&Neukládat</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x nelze prejmenovat.</target>
+
+<source>New name:</source>
+<target>Nové jméno:</target>
+
+<source>Rename Configuration</source>
+<target>Přejmenovat konfiguraci</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Název konfigurace nesmí být prázdný.</target>
+
+<source>&Rename...</source>
+<target>&Přejmenovat...</target>
+
 <source>Hide configuration</source>
 <target>Skrýt položky</target>
 
@@ -1677,6 +1668,36 @@ This guarantees a consistent state even in case of a serious error.
 <source>All files are in sync</source>
 <target>Všechny soubory jsou synchronizovány</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 adresář</pluralform>
+<pluralform>%x adresáře</pluralform>
+<pluralform>%x adresářů</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 soubor</pluralform>
+<pluralform>%x soubory</pluralform>
+<pluralform>%x souborů</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>Zobrazení %y z 1 řádku</pluralform>
+<pluralform>Zobrazení %y z %x řádků</pluralform>
+<pluralform>Zobrazení %y z %x řádků</pluralform>
+</target>
+
 <source>Cannot find %x</source>
 <target>Nelze najít %x</target>
 
@@ -1728,7 +1749,7 @@ This guarantees a consistent state even in case of a serious error.
 <source>Password:</source>
 <target>Heslo:</target>
 
-<source>Key password:</source>
+<source>Key passphrase:</source>
 <target>Klíč:</target>
 
 <source>Please enter a file path.</source>
@@ -1896,6 +1917,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Minimální verze musí být menší než maximum.</target>
 
+<source>&Restore</source>
+<target>&Obnovit</target>
+
 <source>Files</source>
 <target>Soubory</target>
 
@@ -1962,6 +1986,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>The file is locked by another process:</source>
 <target>Soubor je uzamčen jiným procesem:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Nepodařilo se zjistit možnosti oprávnění pro složku %x.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Nelze číst přístupová práva pro %x.</target>
 
@@ -2015,12 +2042,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>Cannot change process I/O priorities.</source>
 <target>Nelze nastavit priority procesu.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Nepodařilo se vypnout systém.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Selhala kontrola Koše pro složku %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Nepodařilo se vypnout systém.</target>
+
 <source>Prepare installation</source>
 <target>Příprava instalace</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/danish.lng b/FreeFileSync/Build/Resources/Languages/danish.lng
index 00fadfec..df98938c 100755
--- a/FreeFileSync/Build/Resources/Languages/danish.lng
+++ b/FreeFileSync/Build/Resources/Languages/danish.lng
@@ -7,6 +7,155 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>Kan ikke læse filen %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Uventet datastørrelse.
+Forventet: %x byte
+Aktuel: %y byte
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Kan ikke oprette filen %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Kan ikke skrive tilladelserne til %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Handlingen støttes ikke mellem forskellige enheder.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Kan ikke slette filen %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Kan ikke slette det symbolske link %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Kan ikke slette mappen %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Kan ikke flytte filen %x til %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Kan ikke kopiere symlink fra %x til %y.</target>
+
+<source>Error Code %x</source>
+<target>Fejlkode %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>Kan ikke læse mappen %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Kan ikke opdatere tidsændring på %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Kan ikke læse filattributterne på %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Kan ikke oprette mappen %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Kan ikke bestemme endelig sti for %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Handlingen understøttes ikke af enheden.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Kan ikke følge symlinket %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Kunne ikke flytte %x til papirkurv.</target>
+
+<source>Authentication completed.</source>
+<target>Godkendelse gennemført.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Du kan lukke siden og returnere til FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Godkendelse fejlede.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Kan ikke kontakte %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Kan ikke finde %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>Navnet %x bruges af flere emner i mappen.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Godkend adgang til %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Filen %x kan ikke åbnes.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>Navnet %x findes allerede.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Kan ikke definere ledig plads på %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Forbindelsen til %x kan ikke afbrydes.</target>
+
+<source>Unable to access %x.</source>
+<target>Kan ikke tilgå %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Kunne ikke hente oplysninger om serveren %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Kan ikke overvåge mappen %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Kan ikke finde enheden %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Kan ikke åbne mappen %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Emnetype ikke understøttet.</target>
+
+<source>Incorrect command line:</source>
+<target>Ugyldig kommando:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>Serveren støtter ikke godkendelse via %x.</target>
+
+<source>Required:</source>
+<target>Krævet:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Tiden udløb efter 1 sekund.</pluralform>
+<pluralform>Tiden udløb efter %x sekunder.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Kan ikke vente på mere end 1 forbindelse af gangen.</pluralform>
+<pluralform>Kan ikke vente på mere end %x forbindelser af gangen.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Aktive forbindelser: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Fejl ved åbning af SFTP kanal nr. %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Begge sider ændret siden sidste synkronisering.</target>
 
@@ -109,9 +258,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Ødelagte installationsfiler. Geninstaller FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Kan ikke indlæse filen %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Kan ikke finde følgende mapper:</target>
 
@@ -139,6 +285,9 @@
 <pluralform>%x emner fundet</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Brugt tid:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Filen %x har en ugyldig dato.</target>
 
@@ -157,9 +306,6 @@
 <source>Items differ in attributes only</source>
 <target>Enhederne har kun attributter til forskel</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>Navnet %x bruges af flere emner i mappen.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Løser symbolsk link %x</target>
 
@@ -220,6 +366,15 @@
 <source>Out of memory.</source>
 <target>Ikke nok hukommelse.</target>
 
+<source>Show in Explorer</source>
+<target>Åben filplacering</target>
+
+<source>Open with default application</source>
+<target>Åben med standardprogram</target>
+
+<source>Browse directory</source>
+<target>Gennemse mappe</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Databasefilen %x er inkompatibel.</target>
 
@@ -232,12 +387,6 @@
 <source>Database file is corrupted:</source>
 <target>Databasefil i stykker:</target>
 
-<source>Cannot write file %x.</source>
-<target>Kan ikke oprette filen %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Kan ikke læse filen %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Databasefilen indeholder endnu ikke oplysninger om sidste synkronisering.</target>
 
@@ -256,9 +405,6 @@
 <source>Cannot get process information.</source>
 <target>Kan ikke hente procesinformation.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Kan ikke læse filattributterne på %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Venter mens mappe låses:</target>
 
@@ -385,27 +531,12 @@
 <pluralform>%x tråde</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Kan ikke læse mappen %x.</target>
-
 <source>%x/sec</source>
 <target>%x/sek</target>
 
 <source>%x items</source>
 <target>%x emner</target>
 
-<source>Show in Explorer</source>
-<target>Åben filplacering</target>
-
-<source>Open with default application</source>
-<target>Åben med standardprogram</target>
-
-<source>Browse directory</source>
-<target>Gennemse mappe</target>
-
-<source>Unable to connect to %x.</source>
-<target>Kan ikke kontakte %x.</target>
-
 <source>Completed successfully</source>
 <target>Gennemført</target>
 
@@ -451,9 +582,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Kan ikke skrive filattributter til %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Filen %x kan ikke åbnes.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x og %y har forskelligt indhold.</target>
 
@@ -484,29 +612,20 @@
 <source>Source item %x not found</source>
 <target>Kildeemne %x ikke fundet</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Kan ikke flytte filen %x til %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Overordnet mappe %x findes ikke.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>Navnet %x findes allerede.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Kan ikke kopiere filen %x til %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Kan ikke kopiere symlink fra %x til %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Opretter VSS kopi for %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Kan ikke finde mappen %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Destinationsmappen %x findes allerede.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Destinationsmappen %x findes allerede, men var utilgængelig under analysen.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Destinationsmappen skal angives.</target>
@@ -529,17 +648,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Ikke nok ledig diskplads på:</target>
 
-<source>Required:</source>
-<target>Krævet:</target>
-
 <source>Available:</source>
 <target>Tilgængeligt:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Nogle filer synkroniseres som del af flere basismapper.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Undgå konflikter ved at bruge filtre, så hver opdateret fil kun relateres til en basismappe.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>For at undgå konflikter, bør ekskluderede filer kun findes i en kildemappe.</target>
 
 <source>Versioning folder:</source>
 <target>Versioneringsmappe:</target>
@@ -565,122 +681,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Kan ikke oprette tidsstempel til versionering:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Uventet datastørrelse.
-Forventet: %x byte
-Aktuel: %y byte
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Kan ikke skrive tilladelserne til %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Handlingen støttes ikke mellem forskellige enheder.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Kan ikke slette filen %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Kan ikke slette det symbolske link %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Kan ikke slette mappen %x.</target>
-
-<source>Error Code %x</source>
-<target>Fejlkode %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Kan ikke opdatere tidsændring på %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Kan ikke oprette mappen %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Kan ikke bestemme endelig sti for %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Handlingen understøttes ikke af enheden.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Kan ikke følge symlinket %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Kunne ikke flytte %x til papirkurv.</target>
-
-<source>Authentication completed.</source>
-<target>Godkendelse gennemført.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Du kan lukke siden og returnere til FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Godkendelse fejlede.</target>
-
-<source>Cannot find %x.</source>
-<target>Kan ikke finde %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Godkend adgang til %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Kan ikke definere ledig plads på %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Forbindelsen til %x kan ikke afbrydes.</target>
-
-<source>Unable to access %x.</source>
-<target>Kan ikke tilgå %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Kunne ikke hente oplysninger om serveren %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Kan ikke overvåge mappen %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Kan ikke finde enheden %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Kan ikke åbne mappen %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Emnetype ikke understøttet.</target>
-
-<source>Incorrect command line:</source>
-<target>Ugyldig kommando:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>Serveren støtter ikke godkendelse via %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Tiden udløb efter 1 sekund.</pluralform>
-<pluralform>Tiden udløb efter %x sekunder.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Kan ikke vente på mere end 1 forbindelse af gangen.</pluralform>
-<pluralform>Kan ikke vente på mere end %x forbindelser af gangen.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Aktive forbindelser: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Fejl ved åbning af SFTP kanal nr. %x.</target>
-
 <source>Drag && drop</source>
 <target>Træk emner hertil</target>
 
@@ -747,6 +747,9 @@ Aktuel: %y byte
 <source>Command line:</source>
 <target>Kommando:</target>
 
+<source>&Hide console window</source>
+<target>&Skjul vindue</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -782,8 +785,8 @@ Kommandoen udføres hvis:
 <source>Waiting until directory is available:</source>
 <target>Venter til mappe er tilgængelig:</target>
 
-<source>&Restore</source>
-<target>&Vis vindue</target>
+<source>&Configure</source>
+<target>&Indstil</target>
 
 <source>&Show error message</source>
 <target>V&is fejlbesked</target>
@@ -818,8 +821,8 @@ Kommandoen udføres hvis:
 <source>Scanning...</source>
 <target>Skanner...</target>
 
-<source>job name</source>
-<target>Jobnavn</target>
+<source>configuration file</source>
+<target>Indstillingsfil</target>
 
 <source>System: Sleep</source>
 <target>System: Slumre</target>
@@ -830,8 +833,8 @@ Kommandoen udføres hvis:
 <source>Nothing to synchronize</source>
 <target>Alt er synkroniseret</target>
 
-<source>Executing command %x</source>
-<target>Kører kommandoen %x</target>
+<source>Executing command:</source>
+<target>Udfører kommando:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Skift til FreeFileSyncs hovedvindue for at løse problemet.</target>
@@ -1031,6 +1034,12 @@ Kommandoen udføres hvis:
 <source>Match case</source>
 <target>Versalfølsom (a/A)</target>
 
+<source>Processed:</source>
+<target>Behandlet:</target>
+
+<source>Remaining:</source>
+<target>Resterende:</target>
+
 <source>New</source>
 <target>Ny</target>
 
@@ -1267,14 +1276,17 @@ Kommandoen udføres hvis:
 <source>&Don't show this dialog again</source>
 <target>&Vis ikke igen</target>
 
-<source>Items found:</source>
-<target>Emner fundet:</target>
+<source>Bytes:</source>
+<target>Bytes:</target>
 
-<source>Time remaining:</source>
-<target>Resterende tid:</target>
+<source>Items:</source>
+<target>Emner:</target>
 
-<source>Time elapsed:</source>
-<target>Brugt tid:</target>
+<source>Synchronizing...</source>
+<target>Synkroniserer...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimér til uret</target>
 
 <source>Bytes</source>
 <target>Bytes</target>
@@ -1282,12 +1294,6 @@ Kommandoen udføres hvis:
 <source>Items</source>
 <target>Emner</target>
 
-<source>Synchronizing...</source>
-<target>Synkroniserer...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimér til uret</target>
-
 <source>When finished:</source>
 <target>Når gennemført:</target>
 
@@ -1363,6 +1369,12 @@ Sikrer processen ved alvorlige fejl.
 <source>&Delete logs after x days:</source>
 <target>&Slet logs efter x dage:</target>
 
+<source>Notification sounds:</source>
+<target>Beskedlyde:</target>
+
+<source>Synchronization finished:</source>
+<target>Synkronisering gennemført:</target>
+
 <source>Customize context menu:</source>
 <target>Tilpas kontekstmenu:</target>
 
@@ -1567,12 +1579,6 @@ Sikrer processen ved alvorlige fejl.
 <source>&Delete</source>
 <target>&Slet</target>
 
-<source>Include all</source>
-<target>Vælg alle</target>
-
-<source>Exclude all</source>
-<target>Fravælg alle</target>
-
 <source>Show icons:</source>
 <target>Vis ikoner:</target>
 
@@ -1609,6 +1615,21 @@ Sikrer processen ved alvorlige fejl.
 <source>Do&n't save</source>
 <target>&Gem ikke</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x kan ikke omdøbes.</target>
+
+<source>New name:</source>
+<target>Nyt navn:</target>
+
+<source>Rename Configuration</source>
+<target>Indstillinger</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Indstillingsnavn skal udfyldes.</target>
+
+<source>&Rename...</source>
+<target>&Omdøb...</target>
+
 <source>Hide configuration</source>
 <target>Skjul indstillinger</target>
 
@@ -1720,8 +1741,8 @@ Sikrer processen ved alvorlige fejl.
 <source>Password:</source>
 <target>Kodeord:</target>
 
-<source>Key password:</source>
-<target>Nøglekodeord:</target>
+<source>Key passphrase:</source>
+<target>Nøglesætning:</target>
 
 <source>Please enter a file path.</source>
 <target>Angiv placering.</target>
@@ -1885,6 +1906,9 @@ Sikrer processen ved alvorlige fejl.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Mindste antal versioner skal være mindre end det maksimale.</target>
 
+<source>&Restore</source>
+<target>&Vis vindue</target>
+
 <source>Files</source>
 <target>Filer</target>
 
@@ -1951,6 +1975,9 @@ Sikrer processen ved alvorlige fejl.
 <source>The file is locked by another process:</source>
 <target>Filen er låst af en anden process:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Filtilladelser for mappen %x kunne ikke bestemmes.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Kan ikke læse sikkerhedsindstillinger på %x.</target>
 
@@ -2002,12 +2029,12 @@ Sikrer processen ved alvorlige fejl.
 <source>Cannot change process I/O priorities.</source>
 <target>Kan ikke ændre I/O prioriteter.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Kunne ikke lukke computeren.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Check papirkurv fejlede for mappen %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Kunne ikke lukke computeren.</target>
+
 <source>Prepare installation</source>
 <target>Forbereder installering</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/dutch.lng b/FreeFileSync/Build/Resources/Languages/dutch.lng
index 5f8dd2d4..62a3ef67 100755
--- a/FreeFileSync/Build/Resources/Languages/dutch.lng
+++ b/FreeFileSync/Build/Resources/Languages/dutch.lng
@@ -7,6 +7,155 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>Kan het bestand %x niet lezen.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Onverwachte grootte van de gegevensstroom.
+Verwacht: %x bytes
+Werkelijk: %y bytes
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Kan bestand %x niet schrijven.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Kan de aangegeven machtigingen van %x niet schrijven.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Bewerking wordt niet ondersteund tussen verschillende apparaten.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Kan bestand %x niet verwijderen.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Kan de symbolische koppeling %x niet verwijderen.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>De map %x kan niet verwijderd worden.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Het bestand %x kan niet naar %y verplaatst worden.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Kan de symbolische koppeling %x niet kopiëren naar %y.</target>
+
+<source>Error Code %x</source>
+<target>Foutcode %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>Kan de map %x niet lezen.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>De modificatie-tijd van %x kan niet geschreven worden.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Kan de bestandskenmerken van %x niet lezen.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Kan de map %x niet maken.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Kan het uiteindelijke pad voor %x niet bepalen.</target>
+
+<source>Operation not supported by device.</source>
+<target>Bewerking wordt niet ondersteund door het apparaat.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Kan de symbolische koppeling %x niet oplossen.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Niet in staat om %x naar de prullenbak te verplaatsen.</target>
+
+<source>Authentication completed.</source>
+<target>Authenticatie voltooid.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>U kunt deze pagina nu sluiten en doorgaan met FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Verificatie mislukt.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Kan geen verbinding maken met %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Kan %x niet vinden.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>De naam %x wordt gebruikt door meer dan één item in de map.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Gelieve toestemming te geven om toegang tot het gebruikersaccount %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Het bestand %x kan niet geopend worden.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>De naam %x wordt al door een ander item gebruikt.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Kan de vrije schijfruimte voor %x niet bepalen.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Kan verbinding van %x niet verbreken.</target>
+
+<source>Unable to access %x.</source>
+<target>Geen toegang tot %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Fout bij het ophalen van informatie over server %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Kan map %x niet bewaken.</target>
+
+<source>Cannot find device %x.</source>
+<target>Kan apparaat %x niet vinden.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Kan de map %x niet openen.</target>
+
+<source>Unsupported item type.</source>
+<target>Niet-ondersteund item type.</target>
+
+<source>Incorrect command line:</source>
+<target>Onjuiste opdrachtregel:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>De server ondersteunt geen verificatie via %x.</target>
+
+<source>Required:</source>
+<target>Vereist:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Bewerking na 1 seconde verlopen.</pluralform>
+<pluralform>Bewerking na %x seconden verlopen.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Kan niet meer dan op 1 verbinding tegelijk wachten.</pluralform>
+<pluralform>Kan niet meer dan op %x verbindingen tegelijk wachten.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Actieve verbindingen: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Fout bij het openen van SFTP kanaalnummer %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Beide zijden zijn gewijzigd sinds de laatste synchronisatie.</target>
 
@@ -109,9 +258,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Installatiebestanden zijn beschadigd. Installeer FreeFileSync opnieuw.</target>
 
-<source>Cannot load file %x.</source>
-<target>Kan bestand %x niet inlezen.</target>
-
 <source>Cannot find the following folders:</source>
 <target>De volgende mappen konden niet worden gevonden:</target>
 
@@ -139,6 +285,9 @@
 <pluralform>%x items gevonden</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Verstreken tijd:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Het bestand %x heeft een ongeldige datum.</target>
 
@@ -157,9 +306,6 @@
 <source>Items differ in attributes only</source>
 <target>De items verschillen alleen in de kenmerken</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>De naam %x wordt gebruikt door meer dan één item in de map.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Symbolische link %x oplossen</target>
 
@@ -220,6 +366,15 @@
 <source>Out of memory.</source>
 <target>Onvoldoende werkgeheugen.</target>
 
+<source>Show in Explorer</source>
+<target>In Explorer weergeven</target>
+
+<source>Open with default application</source>
+<target>Openen met standaardtoepassing</target>
+
+<source>Browse directory</source>
+<target>Blader in map</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Databasebestand %x is niet compatibel.</target>
 
@@ -232,12 +387,6 @@
 <source>Database file is corrupted:</source>
 <target>Databasebestand is beschadigd:</target>
 
-<source>Cannot write file %x.</source>
-<target>Kan bestand %x niet schrijven.</target>
-
-<source>Cannot read file %x.</source>
-<target>Kan het bestand %x niet lezen.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>De databasebestanden bevatten nog geen informatie over de laatste synchronisatie.</target>
 
@@ -256,9 +405,6 @@
 <source>Cannot get process information.</source>
 <target>Kan geen procesinformatie krijgen.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Kan de bestandskenmerken van %x niet lezen.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Wachten terwijl de map is vergrendeld:</target>
 
@@ -385,27 +531,12 @@
 <pluralform>%x threads</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Kan de map %x niet lezen.</target>
-
 <source>%x/sec</source>
 <target>%x/sec</target>
 
 <source>%x items</source>
 <target>%x items</target>
 
-<source>Show in Explorer</source>
-<target>In Explorer weergeven</target>
-
-<source>Open with default application</source>
-<target>Openen met standaardtoepassing</target>
-
-<source>Browse directory</source>
-<target>Blader in map</target>
-
-<source>Unable to connect to %x.</source>
-<target>Kan geen verbinding maken met %x.</target>
-
 <source>Completed successfully</source>
 <target>Succesvol voltooid</target>
 
@@ -451,9 +582,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>De bestandskenmerken voor %x kunnen niet geschreven worden.</target>
 
-<source>Cannot open file %x.</source>
-<target>Het bestand %x kan niet geopend worden.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x en %y hebben verschillende inhoud.</target>
 
@@ -484,29 +612,20 @@
 <source>Source item %x not found</source>
 <target>Bronitem %x niet gevonden</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Het bestand %x kan niet naar %y verplaatst worden.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Bovenliggende map %x bestaat niet.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>De naam %x wordt al door een ander item gebruikt.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Kan bestand %x niet kopiëren naar %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Kan de symbolische koppeling %x niet kopiëren naar %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Maken van een volume schaduwkopie voor %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Kan de map %x niet vinden.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Doelmap %x bestaat reeds.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Doelmap %x bestaat al, maar was niet beschikbaar tijdens het vergelijken van de mappen.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Het invoerveld van de doelmap moet niet leeg zijn.</target>
@@ -529,17 +648,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Er is onvoldoende vrije schijfruimte beschikbaar in:</target>
 
-<source>Required:</source>
-<target>Vereist:</target>
-
 <source>Available:</source>
 <target>Beschikbaar:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Sommige bestanden worden gesynchroniseerd als onderdeel van meerdere basis mappen.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Om conflicten te voorkomen, filters uitsluitingen zodanig instellen dat elke bijgewerkte bestand wordt beschouwd als slechts één basismap.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Om conflicten te voorkomen, stelt u de uitsluitingsfilters zo in dat elk bijgewerkt bestand slechts door één basismap wordt opgenomen.</target>
 
 <source>Versioning folder:</source>
 <target>Map versiebeheer:</target>
@@ -565,122 +681,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Kan geen tijdstempel maken voor versiebeheer:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Onverwachte grootte van de gegevensstroom.
-Verwacht: %x bytes
-Werkelijk: %y bytes
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Kan de aangegeven machtigingen van %x niet schrijven.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Bewerking wordt niet ondersteund tussen verschillende apparaten.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Kan bestand %x niet verwijderen.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Kan de symbolische koppeling %x niet verwijderen.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>De map %x kan niet verwijderd worden.</target>
-
-<source>Error Code %x</source>
-<target>Foutcode %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>De modificatie-tijd van %x kan niet geschreven worden.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Kan de map %x niet maken.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Kan het uiteindelijke pad voor %x niet bepalen.</target>
-
-<source>Operation not supported by device.</source>
-<target>Bewerking wordt niet ondersteund door het apparaat.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Kan de symbolische koppeling %x niet oplossen.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Niet in staat om %x naar de prullenbak te verplaatsen.</target>
-
-<source>Authentication completed.</source>
-<target>Authenticatie voltooid.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>U kunt deze pagina nu sluiten en doorgaan met FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Verificatie mislukt.</target>
-
-<source>Cannot find %x.</source>
-<target>Kan %x niet vinden.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Gelieve toestemming te geven om toegang tot het gebruikersaccount %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Kan de vrije schijfruimte voor %x niet bepalen.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Kan verbinding van %x niet verbreken.</target>
-
-<source>Unable to access %x.</source>
-<target>Geen toegang tot %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Fout bij het ophalen van informatie over server %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Kan map %x niet bewaken.</target>
-
-<source>Cannot find device %x.</source>
-<target>Kan apparaat %x niet vinden.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Kan de map %x niet openen.</target>
-
-<source>Unsupported item type.</source>
-<target>Niet-ondersteund item type.</target>
-
-<source>Incorrect command line:</source>
-<target>Onjuiste opdrachtregel:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>De server ondersteunt geen verificatie via %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Bewerking na 1 seconde verlopen.</pluralform>
-<pluralform>Bewerking na %x seconden verlopen.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Kan niet meer dan op 1 verbinding tegelijk wachten.</pluralform>
-<pluralform>Kan niet meer dan op %x verbindingen tegelijk wachten.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Actieve verbindingen: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Fout bij het openen van SFTP kanaalnummer %x.</target>
-
 <source>Drag && drop</source>
 <target>Slepen && neerzetten</target>
 
@@ -747,6 +747,9 @@ Werkelijk: %y bytes
 <source>Command line:</source>
 <target>Opdrachtregel:</target>
 
+<source>&Hide console window</source>
+<target>&Verberg bedieningspaneel</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -782,8 +785,8 @@ De opdracht wordt geactiveerd als:
 <source>Waiting until directory is available:</source>
 <target>Wachten tot de map beschikbaar is:</target>
 
-<source>&Restore</source>
-<target>&Herstellen</target>
+<source>&Configure</source>
+<target>&Configureer</target>
 
 <source>&Show error message</source>
 <target>&Toon foutmelding</target>
@@ -818,8 +821,8 @@ De opdracht wordt geactiveerd als:
 <source>Scanning...</source>
 <target>Scannen...</target>
 
-<source>job name</source>
-<target>taaknaam</target>
+<source>configuration file</source>
+<target>configuratiebestand</target>
 
 <source>System: Sleep</source>
 <target>Systeem: Slaapstand</target>
@@ -830,8 +833,8 @@ De opdracht wordt geactiveerd als:
 <source>Nothing to synchronize</source>
 <target>Niets om te synchroniseren</target>
 
-<source>Executing command %x</source>
-<target>Opdracht %x uitvoeren</target>
+<source>Executing command:</source>
+<target>Opdracht uitvoeren:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>U kunt overschakelen naar het hoofdvenster van FreeFileSync om dit probleem op te lossen.</target>
@@ -1031,6 +1034,12 @@ De opdracht wordt geactiveerd als:
 <source>Match case</source>
 <target>Hoofdlettergevoelig</target>
 
+<source>Processed:</source>
+<target>Verwerkt:</target>
+
+<source>Remaining:</source>
+<target>Resterend:</target>
+
 <source>New</source>
 <target>Nieuw</target>
 
@@ -1267,14 +1276,17 @@ De opdracht wordt geactiveerd als:
 <source>&Don't show this dialog again</source>
 <target>&Dit dialoogvenster niet opnieuw weergeven</target>
 
-<source>Items found:</source>
-<target>Gevonden objecten:</target>
+<source>Bytes:</source>
+<target>Bytes:</target>
 
-<source>Time remaining:</source>
-<target>Resterende tijd:</target>
+<source>Items:</source>
+<target>Objecten:</target>
 
-<source>Time elapsed:</source>
-<target>Verstreken tijd:</target>
+<source>Synchronizing...</source>
+<target>Synchroniseren...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimaliseren naar systeemvak</target>
 
 <source>Bytes</source>
 <target>Bytes</target>
@@ -1282,12 +1294,6 @@ De opdracht wordt geactiveerd als:
 <source>Items</source>
 <target>Objecten</target>
 
-<source>Synchronizing...</source>
-<target>Synchroniseren...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimaliseren naar systeemvak</target>
-
 <source>When finished:</source>
 <target>Indien gereed:</target>
 
@@ -1363,6 +1369,12 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout.
 <source>&Delete logs after x days:</source>
 <target>&Verwijder logboeken na x dagen:</target>
 
+<source>Notification sounds:</source>
+<target>Meldingsgeluiden:</target>
+
+<source>Synchronization finished:</source>
+<target>De synchronisatie is voltooid:</target>
+
 <source>Customize context menu:</source>
 <target>Contextmenu aanpassen:</target>
 
@@ -1466,7 +1478,7 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout.
 <target>&Opties</target>
 
 <source>Main Bar</source>
-<target>Hoofd balk</target>
+<target>Hoofdbalk</target>
 
 <source>Folder Pairs</source>
 <target>Map-paren</target>
@@ -1567,12 +1579,6 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout.
 <source>&Delete</source>
 <target>&Verwijderen</target>
 
-<source>Include all</source>
-<target>Omvat alles</target>
-
-<source>Exclude all</source>
-<target>Alles uitgesloten</target>
-
 <source>Show icons:</source>
 <target>Pictogrammen weergeven:</target>
 
@@ -1609,6 +1615,21 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout.
 <source>Do&n't save</source>
 <target>&Niet opslaan</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x kan niet worden hernoemd.</target>
+
+<source>New name:</source>
+<target>Nieuwe naam:</target>
+
+<source>Rename Configuration</source>
+<target>Hernoem configuratie</target>
+
+<source>Configuration name must not be empty.</source>
+<target>De configuratienaam mag niet leeg zijn.</target>
+
+<source>&Rename...</source>
+<target>&Hernoem....</target>
+
 <source>Hide configuration</source>
 <target>Verberg configuratie</target>
 
@@ -1720,8 +1741,8 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout.
 <source>Password:</source>
 <target>Wachtwoord:</target>
 
-<source>Key password:</source>
-<target>Sleutel wachtwoord:</target>
+<source>Key passphrase:</source>
+<target>Wachtwoordzin:</target>
 
 <source>Please enter a file path.</source>
 <target>Voer een bestandspad in.</target>
@@ -1885,6 +1906,9 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Het minimum aantal versies moet kleiner zijn dan het maximale aantal.</target>
 
+<source>&Restore</source>
+<target>&Herstellen</target>
+
 <source>Files</source>
 <target>Bestanden</target>
 
@@ -1951,6 +1975,9 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout.
 <source>The file is locked by another process:</source>
 <target>Het bestand is vergrendeld door een ander proces:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Kan ondersteuning voor bestandsrechten voor map %x niet bepalen.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Kan de beveiligingscontext van %x niet lezen.</target>
 
@@ -2002,12 +2029,12 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout.
 <source>Cannot change process I/O priorities.</source>
 <target>De input/output prioriteiten kunnen niet gewijzigd worden.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Kan het systeem niet afsluiten.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Controle van de prullenbak voor map %x is mislukt.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Kan het systeem niet afsluiten.</target>
+
 <source>Prepare installation</source>
 <target>Installatie voorbereiden</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/english_uk.lng b/FreeFileSync/Build/Resources/Languages/english_uk.lng
index f8814e1e..29715212 100755
--- a/FreeFileSync/Build/Resources/Languages/english_uk.lng
+++ b/FreeFileSync/Build/Resources/Languages/english_uk.lng
@@ -7,6 +7,158 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target></target>
+
+<source>Cannot read file %x.</source>
+<target>Cannot read file %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Cannot write file %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Cannot write permissions of %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Operation not supported between different devices.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Cannot delete file %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Cannot delete symbolic link %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Cannot delete directory %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Cannot move file %x to %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Cannot copy symbolic link %x to %y.</target>
+
+<source>Error Code %x</source>
+<target>Error Code %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>Cannot read directory %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Cannot write modification time of %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Cannot read file attributes of %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Cannot create directory %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Cannot determine final path for %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Operation not supported by device.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Cannot resolve symbolic link %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Unable to move %x to the recycle bin.</target>
+
+<source>Authentication completed.</source>
+<target>Authentication completed.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>You may close this page now and continue with FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Authentication failed.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Unable to connect to %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Cannot find %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>The name %x is used by more than one item in the folder.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Please authorise access to user account %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Cannot open file %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>The name %x is already used by another item.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Cannot determine free disk space for %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Unable to disconnect from %x.</target>
+
+<source>Unable to access %x.</source>
+<target>Unable to access %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Failed to get information about server %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Cannot monitor directory %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Cannot find device %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Cannot open directory %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Unsupported item type.</target>
+
+<source>Incorrect command line:</source>
+<target>Incorrect command line:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>The server does not support authentication via %x.</target>
+
+<source>Required:</source>
+<target>Required:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Active connections: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Failed to open SFTP channel number %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Both sides have changed since last synchronisation.</target>
 
@@ -109,9 +261,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Installation files are corrupted. Please reinstall FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Cannot load file %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Cannot find the following folders:</target>
 
@@ -139,6 +288,9 @@
 <pluralform>%x items found</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Time elapsed:</target>
+
 <source>File %x has an invalid date.</source>
 <target>File %x has an invalid date.</target>
 
@@ -157,9 +309,6 @@
 <source>Items differ in attributes only</source>
 <target>Items differ in attributes only</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>The name %x is used by more than one item in the folder.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Resolving symbolic link %x</target>
 
@@ -220,6 +369,15 @@
 <source>Out of memory.</source>
 <target>Out of memory.</target>
 
+<source>Show in Explorer</source>
+<target>Show in Explorer</target>
+
+<source>Open with default application</source>
+<target>Open with default application</target>
+
+<source>Browse directory</source>
+<target>Browse directory</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Database file %x is incompatible.</target>
 
@@ -232,12 +390,6 @@
 <source>Database file is corrupted:</source>
 <target>Database file is corrupted:</target>
 
-<source>Cannot write file %x.</source>
-<target>Cannot write file %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Cannot read file %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>The database files do not yet contain information about the last synchronisation.</target>
 
@@ -256,9 +408,6 @@
 <source>Cannot get process information.</source>
 <target>Cannot get process information.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Cannot read file attributes of %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Waiting while directory is locked:</target>
 
@@ -385,27 +534,12 @@
 <pluralform>%x threads</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Cannot read directory %x.</target>
-
 <source>%x/sec</source>
 <target>%x/sec</target>
 
 <source>%x items</source>
 <target>%x items</target>
 
-<source>Show in Explorer</source>
-<target>Show in Explorer</target>
-
-<source>Open with default application</source>
-<target>Open with default application</target>
-
-<source>Browse directory</source>
-<target>Browse directory</target>
-
-<source>Unable to connect to %x.</source>
-<target>Unable to connect to %x.</target>
-
 <source>Completed successfully</source>
 <target>Completed successfully</target>
 
@@ -451,9 +585,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Cannot write file attributes of %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Cannot open file %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x and %y have different content.</target>
 
@@ -484,29 +615,20 @@
 <source>Source item %x not found</source>
 <target>Source item %x not found</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Cannot move file %x to %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Parent folder %x is not existing.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>The name %x is already used by another item.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Cannot copy file %x to %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Cannot copy symbolic link %x to %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Creating a Volume Shadow Copy for %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Cannot find folder %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Target folder %x already existing.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Target folder %x is already existing, but was not available during folder comparison.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Target folder input field must not be empty.</target>
@@ -529,17 +651,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Not enough free disk space available in:</target>
 
-<source>Required:</source>
-<target>Required:</target>
-
 <source>Available:</source>
 <target>Available:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Some files will be synchronised as part of multiple base folders.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</target>
 
 <source>Versioning folder:</source>
 <target>Versioning folder:</target>
@@ -565,122 +684,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Unable to create time stamp for versioning:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Cannot write permissions of %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Operation not supported between different devices.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Cannot delete file %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Cannot delete symbolic link %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Cannot delete directory %x.</target>
-
-<source>Error Code %x</source>
-<target>Error Code %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Cannot write modification time of %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Cannot create directory %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Cannot determine final path for %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Operation not supported by device.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Cannot resolve symbolic link %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Unable to move %x to the recycle bin.</target>
-
-<source>Authentication completed.</source>
-<target>Authentication completed.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>You may close this page now and continue with FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Authentication failed.</target>
-
-<source>Cannot find %x.</source>
-<target>Cannot find %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Please authorise access to user account %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Cannot determine free disk space for %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Unable to disconnect from %x.</target>
-
-<source>Unable to access %x.</source>
-<target>Unable to access %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Failed to get information about server %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Cannot monitor directory %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Cannot find device %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Cannot open directory %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Unsupported item type.</target>
-
-<source>Incorrect command line:</source>
-<target>Incorrect command line:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>The server does not support authentication via %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Active connections: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Failed to open SFTP channel number %x.</target>
-
 <source>Drag && drop</source>
 <target>Drag && drop</target>
 
@@ -747,6 +750,9 @@ Actual: %y bytes
 <source>Command line:</source>
 <target>Command line:</target>
 
+<source>&Hide console window</source>
+<target>&Hide console window</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -782,8 +788,8 @@ The command is triggered if:
 <source>Waiting until directory is available:</source>
 <target>Waiting until directory is available:</target>
 
-<source>&Restore</source>
-<target>&Restore</target>
+<source>&Configure</source>
+<target>&Configure</target>
 
 <source>&Show error message</source>
 <target>&Show error message</target>
@@ -818,8 +824,8 @@ The command is triggered if:
 <source>Scanning...</source>
 <target>Scanning...</target>
 
-<source>job name</source>
-<target>job name</target>
+<source>configuration file</source>
+<target>configuration file</target>
 
 <source>System: Sleep</source>
 <target>System: Sleep</target>
@@ -830,8 +836,8 @@ The command is triggered if:
 <source>Nothing to synchronize</source>
 <target>Nothing to synchronise</target>
 
-<source>Executing command %x</source>
-<target>Executing command %x</target>
+<source>Executing command:</source>
+<target>Executing command:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>You can switch to FreeFileSync's main window to resolve this issue.</target>
@@ -1031,6 +1037,12 @@ The command is triggered if:
 <source>Match case</source>
 <target>Match case</target>
 
+<source>Processed:</source>
+<target>Processed:</target>
+
+<source>Remaining:</source>
+<target>Remaining:</target>
+
 <source>New</source>
 <target>New</target>
 
@@ -1267,14 +1279,17 @@ The command is triggered if:
 <source>&Don't show this dialog again</source>
 <target>&Don't show this dialogue again</target>
 
-<source>Items found:</source>
-<target>Elements found:</target>
+<source>Bytes:</source>
+<target>Bytes:</target>
 
-<source>Time remaining:</source>
-<target>Time remaining:</target>
+<source>Items:</source>
+<target>Items:</target>
 
-<source>Time elapsed:</source>
-<target>Time elapsed:</target>
+<source>Synchronizing...</source>
+<target>Synchronising...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimise to notification area</target>
 
 <source>Bytes</source>
 <target>Bytes</target>
@@ -1282,12 +1297,6 @@ The command is triggered if:
 <source>Items</source>
 <target>Items</target>
 
-<source>Synchronizing...</source>
-<target>Synchronising...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimise to notification area</target>
-
 <source>When finished:</source>
 <target>When finished:</target>
 
@@ -1363,6 +1372,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete logs after x days:</source>
 <target>&Delete logs after x days:</target>
 
+<source>Notification sounds:</source>
+<target>Notification sounds:</target>
+
+<source>Synchronization finished:</source>
+<target>Synchronisation finished:</target>
+
 <source>Customize context menu:</source>
 <target>Customise context menu:</target>
 
@@ -1567,12 +1582,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete</source>
 <target>&Delete</target>
 
-<source>Include all</source>
-<target>Include all</target>
-
-<source>Exclude all</source>
-<target>Exclude all</target>
-
 <source>Show icons:</source>
 <target>Show icons:</target>
 
@@ -1609,6 +1618,21 @@ This guarantees a consistent state even in case of a serious error.
 <source>Do&n't save</source>
 <target>Do&n't save</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x cannot be renamed.</target>
+
+<source>New name:</source>
+<target>New name:</target>
+
+<source>Rename Configuration</source>
+<target>Rename Configuration</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Configuration name must not be empty.</target>
+
+<source>&Rename...</source>
+<target>&Rename...</target>
+
 <source>Hide configuration</source>
 <target>Hide configuration</target>
 
@@ -1720,8 +1744,8 @@ This guarantees a consistent state even in case of a serious error.
 <source>Password:</source>
 <target>Password:</target>
 
-<source>Key password:</source>
-<target>Key password:</target>
+<source>Key passphrase:</source>
+<target>Key passphrase:</target>
 
 <source>Please enter a file path.</source>
 <target>Please enter a file path.</target>
@@ -1885,6 +1909,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Minimum version count must be smaller than maximum count.</target>
 
+<source>&Restore</source>
+<target>&Restore</target>
+
 <source>Files</source>
 <target>Files</target>
 
@@ -2002,12 +2029,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>Cannot change process I/O priorities.</source>
 <target>Cannot change process I/O priorities.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Unable to shut down the system.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Checking recycle bin failed for folder %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Unable to shut down the system.</target>
+
 <source>Prepare installation</source>
 <target>Prepare installation</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/french.lng b/FreeFileSync/Build/Resources/Languages/french.lng
index cd449f40..aee43f7c 100755
--- a/FreeFileSync/Build/Resources/Languages/french.lng
+++ b/FreeFileSync/Build/Resources/Languages/french.lng
@@ -7,18 +7,6 @@
 	<plural_definition>n <= 1 ? 0 : 1</plural_definition>
 </header>
 
-<source>Checking file permissions failed for folder %x.</source>
-<target></target>
-
-<source>Executing command:</source>
-<target></target>
-
-<source>&Configure</source>
-<target></target>
-
-<source>&Hide console window</source>
-<target></target>
-
 <source>Cannot read file %x.</source>
 <target>Impossible de lire le fichier %x.</target>
 
@@ -489,6 +477,27 @@ Trouvé : %y octets
 <source>Update attributes on right</source>
 <target>Mise à jour des attributs à droite</target>
 
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Erreur lors de l'analyse du fichier %x, ligne %y, colonne %z.</target>
+
+<source>Services</source>
+<target>Services</target>
+
+<source>Show All</source>
+<target>Tout afficher</target>
+
+<source>Hide Others</source>
+<target>Masquer les autres</target>
+
+<source>Hide %x</source>
+<target>Masquer %x</target>
+
+<source>Quit %x</source>
+<target>Quitter %x</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>Impossible de verrouiller les répertoires des dossiers suivants :</target>
+
 <source>Errors:</source>
 <target>Erreurs :</target>
 
@@ -513,27 +522,6 @@ Trouvé : %y octets
 <source>Cleaning up log files:</source>
 <target>Nettoyage des journaux :</target>
 
-<source>Error parsing file %x, row %y, column %z.</source>
-<target>Erreur lors de l'analyse du fichier %x, ligne %y, colonne %z.</target>
-
-<source>Services</source>
-<target>Services</target>
-
-<source>Show All</source>
-<target>Tout afficher</target>
-
-<source>Hide Others</source>
-<target>Masquer les autres</target>
-
-<source>Hide %x</source>
-<target>Masquer %x</target>
-
-<source>Quit %x</source>
-<target>Quitter %x</target>
-
-<source>Cannot set directory locks for the following folders:</source>
-<target>Impossible de verrouiller les répertoires des dossiers suivants :</target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
@@ -636,8 +624,8 @@ Trouvé : %y octets
 <source>Cannot find folder %x.</source>
 <target>Dossier %x introuvable.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Le dossier destination %x existe déjà.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Le dossier cible %x existe déjà, mais n'est pas disponible pendant la comparaison des dossiers.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Le champ dossier de destination ne doit pas être vide.</target>
@@ -666,8 +654,8 @@ Trouvé : %y octets
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Certains fichiers seront synchronisés comme éléments de plusieurs dossiers de base.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Pour éviter les conflits, configurez les filtres d'exclusion afin que chaque fichier mis à jour ne soit traité que par un seul dossier de base.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Pour éviter les conflits, veuillez configurer les filtres d'exclusion afin que chaque fichier mis à jour soit inclus par un seul dossier de base.</target>
 
 <source>Versioning folder:</source>
 <target>Dossier de gestion des versions :</target>
@@ -759,6 +747,9 @@ Trouvé : %y octets
 <source>Command line:</source>
 <target>Ligne de commande :</target>
 
+<source>&Hide console window</source>
+<target>&Masquer la fenêtre de console</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -794,6 +785,9 @@ La commande est déclenchée si :
 <source>Waiting until directory is available:</source>
 <target>En attente de la disponibilité du répertoire :</target>
 
+<source>&Configure</source>
+<target>&Configurer</target>
+
 <source>&Show error message</source>
 <target>&Afficher les messages d'erreur</target>
 
@@ -827,8 +821,8 @@ La commande est déclenchée si :
 <source>Scanning...</source>
 <target>Lecture en cours ...</target>
 
-<source>job name</source>
-<target>nom du job</target>
+<source>configuration file</source>
+<target>Fichier de configuration</target>
 
 <source>System: Sleep</source>
 <target>Système : Mise en veille</target>
@@ -839,6 +833,9 @@ La commande est déclenchée si :
 <source>Nothing to synchronize</source>
 <target>Rien à synchroniser</target>
 
+<source>Executing command:</source>
+<target>Exécution de la commande :</target>
+
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Vous pouvez basculer vers la fenêtre principale de FreeFileSync pour résoudre ce problème.</target>
 
@@ -1037,6 +1034,12 @@ La commande est déclenchée si :
 <source>Match case</source>
 <target>Respect de la casse</target>
 
+<source>Processed:</source>
+<target>Traité :</target>
+
+<source>Remaining:</source>
+<target>Restant :</target>
+
 <source>New</source>
 <target>Nouveau</target>
 
@@ -1273,17 +1276,11 @@ La commande est déclenchée si :
 <source>&Don't show this dialog again</source>
 <target>&Ne plus afficher cette boîte de dialogue</target>
 
-<source>Items found:</source>
-<target>Élements trouvés :</target>
-
-<source>Time remaining:</source>
-<target>Temps restant :</target>
+<source>Bytes:</source>
+<target>Octets :</target>
 
-<source>Bytes</source>
-<target>Octets</target>
-
-<source>Items</source>
-<target>Eléments</target>
+<source>Items:</source>
+<target>Elément :</target>
 
 <source>Synchronizing...</source>
 <target>Synchronisation en cours ...</target>
@@ -1291,6 +1288,12 @@ La commande est déclenchée si :
 <source>Minimize to notification area</source>
 <target>Réduction à la zone de notification</target>
 
+<source>Bytes</source>
+<target>Octets</target>
+
+<source>Items</source>
+<target>Eléments</target>
+
 <source>When finished:</source>
 <target>A la fin :</target>
 
@@ -1366,6 +1369,12 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave.
 <source>&Delete logs after x days:</source>
 <target>&Supprimer les journaux après x jours :</target>
 
+<source>Notification sounds:</source>
+<target>Son de la notification :</target>
+
+<source>Synchronization finished:</source>
+<target>Synchronisation terminée :</target>
+
 <source>Customize context menu:</source>
 <target>Personnaliser le menu contextuel :</target>
 
@@ -1516,33 +1525,6 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave.
 <source>&Execute</source>
 <target>&Exécuter</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x répertoire</pluralform>
-<pluralform>%x répertoires</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x fichier</pluralform>
-<pluralform>%x fichiers</pluralform>
-</target>
-
-<source>
-<pluralform>Showing %y of 1 row</pluralform>
-<pluralform>Showing %y of %x rows</pluralform>
-</source>
-<target>
-<pluralform>Affiche %y sur %x ligne</pluralform>
-<pluralform>Affiche %y sur %x lignes</pluralform>
-</target>
-
 <source>Set direction:</source>
 <target>Choix de la direction :</target>
 
@@ -1606,6 +1588,21 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave.
 <source>Do&n't save</source>
 <target>&Ne pas Sauvegarder</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x ne peut être renommé.</target>
+
+<source>New name:</source>
+<target>Nouveau Nom :</target>
+
+<source>Rename Configuration</source>
+<target>Renommer la configuration</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Le nom de configuration ne doit pas être vide.</target>
+
+<source>&Rename...</source>
+<target>&Renommer...</target>
+
 <source>Hide configuration</source>
 <target>Masquer la configuration</target>
 
@@ -1666,6 +1663,33 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave.
 <source>All files are in sync</source>
 <target>Tous les fichiers sont synchronisés</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x répertoire</pluralform>
+<pluralform>%x répertoires</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x fichier</pluralform>
+<pluralform>%x fichiers</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>Affiche %y sur %x ligne</pluralform>
+<pluralform>Affiche %y sur %x lignes</pluralform>
+</target>
+
 <source>Cannot find %x</source>
 <target>Impossible de trouver %x</target>
 
@@ -1717,8 +1741,8 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave.
 <source>Password:</source>
 <target>Mot de passe :</target>
 
-<source>Key password:</source>
-<target>Clé du mot de passe :</target>
+<source>Key passphrase:</source>
+<target>Phrase secrète :</target>
 
 <source>Please enter a file path.</source>
 <target>Veuillez entrer un chemin d'accès.</target>
@@ -1951,6 +1975,9 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave.
 <source>The file is locked by another process:</source>
 <target>Le fichier est verrouillé par un autre process :</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Impossible de déterminer les autorisations de fichier du dossier %x.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Impossible de lire les paramètres de sécurité de %x.</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/german.lng b/FreeFileSync/Build/Resources/Languages/german.lng
index 6bc094dd..45c61939 100755
--- a/FreeFileSync/Build/Resources/Languages/german.lng
+++ b/FreeFileSync/Build/Resources/Languages/german.lng
@@ -654,8 +654,8 @@ Tatsächlich: %y bytes
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Einige Dateien werden als Teil mehrerer Basisordner synchronisiert werden.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Um Konflikte zu vermeiden sollten Ausschlussfilter erstellt werden, so dass jede aktualisierte Datei nur von einem Basisordner berücksichtigt wird.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Um Konflikte zu vermeiden sollten Ausschlussfilter erstellt werden, so dass jede aktualisierte Datei nur einem Basisordner zugeordnet wird.</target>
 
 <source>Versioning folder:</source>
 <target>Versionierungsordner:</target>
@@ -821,8 +821,8 @@ Die Befehlszeile wird ausgelöst, wenn:
 <source>Scanning...</source>
 <target>Suche Dateien...</target>
 
-<source>job name</source>
-<target>Auftragsname</target>
+<source>configuration file</source>
+<target>Konfigurationsdatei</target>
 
 <source>System: Sleep</source>
 <target>System: Energie sparen</target>
@@ -1034,6 +1034,12 @@ Die Befehlszeile wird ausgelöst, wenn:
 <source>Match case</source>
 <target>Groß-/Kleinschreibung</target>
 
+<source>Processed:</source>
+<target>Verarbeitet:</target>
+
+<source>Remaining:</source>
+<target>Verbleibend:</target>
+
 <source>New</source>
 <target>Neu</target>
 
@@ -1270,17 +1276,11 @@ Die Befehlszeile wird ausgelöst, wenn:
 <source>&Don't show this dialog again</source>
 <target>&Diesen Dialog nicht mehr anzeigen</target>
 
-<source>Items found:</source>
-<target>Gefundene Elemente:</target>
+<source>Bytes:</source>
+<target>Bytes:</target>
 
-<source>Time remaining:</source>
-<target>Verbleibende Zeit:</target>
-
-<source>Bytes</source>
-<target>Bytes</target>
-
-<source>Items</source>
-<target>Elemente</target>
+<source>Items:</source>
+<target>Elemente:</target>
 
 <source>Synchronizing...</source>
 <target>Synchronisiere...</target>
@@ -1288,6 +1288,12 @@ Die Befehlszeile wird ausgelöst, wenn:
 <source>Minimize to notification area</source>
 <target>In das Benachrichtigungsfeld minimieren</target>
 
+<source>Bytes</source>
+<target>Bytes</target>
+
+<source>Items</source>
+<target>Elemente</target>
+
 <source>When finished:</source>
 <target>Wenn fertig:</target>
 
@@ -1735,8 +1741,8 @@ Dadurch wird ein konsistenter Datenstand auch bei schweren Fehlern garantiert.
 <source>Password:</source>
 <target>Passwort:</target>
 
-<source>Key password:</source>
-<target>Schlüsselpasswort:</target>
+<source>Key passphrase:</source>
+<target>Passphrase für Schlüssel:</target>
 
 <source>Please enter a file path.</source>
 <target>Bitte geben Sie einen Dateipfad ein.</target>
@@ -1969,8 +1975,8 @@ Dadurch wird ein konsistenter Datenstand auch bei schweren Fehlern garantiert.
 <source>The file is locked by another process:</source>
 <target>Die Datei wird von einem anderen Prozess gesperrt:</target>
 
-<source>Checking file permissions failed for folder %x.</source>
-<target>Die Prüfung der Dateiberechtigungen für Ordner %x ist fehlgeschlagen.</target>
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Die Prüfung auf Unterstützung von Dateiberechtigungen für Ordner %x ist fehlgeschlagen.</target>
 
 <source>Cannot read security context of %x.</source>
 <target>Der Sicherheitskontext von %x kann nicht gelesen werden.</target>
diff --git a/FreeFileSync/Build/Resources/Languages/greek.lng b/FreeFileSync/Build/Resources/Languages/greek.lng
index 1fcaedac..85330175 100755
--- a/FreeFileSync/Build/Resources/Languages/greek.lng
+++ b/FreeFileSync/Build/Resources/Languages/greek.lng
@@ -7,6 +7,155 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>Δεν μπορεί να γίνει ανάγνωση του αρχείου %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Μη αναμενόμενο μέγεθος της ροής δεδομένων.
+Αναμενόμενο: %x bytes
+Βρέθηκε: %y bytes
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Δεν μπορεί να γίνει εγγραφή του αρχείου %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Δεν μπορεί να γίνει εγγραφή των δικαιωμάτων πρόσβασης του %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Η λειτουργία δεν υποστηρίζεται μεταξύ διαφορετικών χώρων αποθήκευσης.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Δεν μπορεί να διαγραφεί το αρχείο %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Δεν μπορεί να διαγραφεί ο συμβολικός σύνδεσμος %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Δεν μπορεί να διαγραφεί ο υποκατάλογος %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Δεν μπορεί το αρχείο %x να μεταφερθεί στο %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Αδυναμία αντιγραφής του συμβολικού συνδέσμου %x στο %y.</target>
+
+<source>Error Code %x</source>
+<target>Κωδικός Σφάλματος %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>Δεν μπορεί να γίνει ανάγνωση του καταλόγου %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Δεν μπορεί να γίνει εγγραφή της ώρας τροποποίησης του %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Δεν μπορεί να γίνει ανάγνωση των χαρακτηριστικών του αρχείου %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Δεν μπορεί να δημιουργηθεί ο υποκατάλογος %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Δεν μπορεί να προσδιοριστεί η τελική διαδρομή για το %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Η λειτουργία δεν υποστηρίζεται από το χώρο αποθήκευσης.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Ο συμβολικός σύνδεσμος %x δεν μπορεί να επιλυθεί.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Δεν ήταν δυνατή η μεταφορά του %x στον κάδο ανακύκλωσης.</target>
+
+<source>Authentication completed.</source>
+<target>Ολοκληρώθηκε η επαλήθευση ταυτότητας.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Τώρα μπορείτε να κλείσετε αυτή τη σελίδα και να συνεχίσετε το FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Η επαλήθευση ταυτότητας απέτυχε.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Δεν μπορεί να πραγματοποιηθεί σύνδεση με το %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Το %x δεν μπορεί να βρεθεί.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>Το όνομα %x χρησιμοποιείται για περισσότερα από ένα αρχεία στον φάκελο.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Παρακαλούμε εξουσιοδοτείστε την πρόσβαση στο λογαριασμό χρήστη %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Δεν είναι δυνατό το άνοιγμα του αρχείου %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>Το όνομα %x χρησιμοποιείται ήδη από άλλο στοιχείο.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Δεν μπορεί να υπολογιστεί ο ελεύθερος χώρος του δίσκου %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Αδυναία αποσύνδεσης από το %x.</target>
+
+<source>Unable to access %x.</source>
+<target>Δεν είναι δυνατή η πρόσβαση στο %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Αποτυχία λήψης πληροφοριών από τον διακομιστή %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Δεν είναι δυνατή η παρακολύθηση του υποκαταλόγου %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Ο χώρος αποθήκευσης %x δεν μπορεί να βρεθεί.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Δεν είναι δυνατό το άνοιγμα του υποκαταλόγου %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Μη υποστηριζόμενος τύπος στοιχείου.</target>
+
+<source>Incorrect command line:</source>
+<target>Εσφαλμένη γραμμή εντολών:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>Ο εξυπηρετητής δεν υποστηρίζει επαλήθευση ταυτότητας μέσω %x.</target>
+
+<source>Required:</source>
+<target>Απαιτείται:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Το χρονικό όριο της λειτουργίας έληξε μετά από 1 δευτερόλεπτο.</pluralform>
+<pluralform>Το χρονικό όριο της λειτουργίας έληξε μετά από %x δευτερόλεπτα.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Δεν είναι δυνατή η αναμονή περισσότερων από 1 σύνδεσης τη φορά.</pluralform>
+<pluralform>Δεν είναι δυνατή η αναμονή περισσότερων από %x συνδέσεων τη φορά.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Ενεργές συνδέσεις: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Αποτυχία ανοίγματος του SFTP καναλιού με αριθμό %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Και οι δυο πλευρές έχουν αλλάξει από τον τελευταίο συγχρονισμό.</target>
 
@@ -109,9 +258,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Τα αρχεία εγκατάστασης είναι κατεστραμμένα. Παρακαλούμε επανεγκαταστείστε το FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Το αρχείο %x δεν ήταν δυνατόν να φορτωθεί.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Οι ακόλουθοι φάκελοι δεν ήταν δυνατό να βρεθούν:</target>
 
@@ -128,7 +274,7 @@
 <target>Ανίχνευση:</target>
 
 <source>Comparison finished:</source>
-<target>Η σύγκριση ολοκληρώθηκε:</target>
+<target>Ολοκλήρωση σύγκρισης:</target>
 
 <source>
 <pluralform>1 item found</pluralform>
@@ -139,6 +285,9 @@
 <pluralform>βρέθηκαν %x στοιχεία</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Πέρασε χρόνος:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Το αρχείο %x δεν έχει έγκυρη ημερομηνία.</target>
 
@@ -157,9 +306,6 @@
 <source>Items differ in attributes only</source>
 <target>Τα στοιχεία διαφέρουν μόνο ως προς τα χαρακτηριστικά τους</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>Το όνομα %x χρησιμοποιείται για περισσότερα από ένα αρχεία στον φάκελο.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Επίλυση του συμβολικού συνδέσμου %x</target>
 
@@ -220,6 +366,15 @@
 <source>Out of memory.</source>
 <target>Ανεπαρκής μνήμη.</target>
 
+<source>Show in Explorer</source>
+<target>Εμφάνιση στην Εξερεύνηση</target>
+
+<source>Open with default application</source>
+<target>Άνοιγμα με την προεπιλεγμένη εφαρμογή</target>
+
+<source>Browse directory</source>
+<target>Αναζήτηση υποκαταλόγου</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Το αρχείο βάσης δεδομένων %x δεν είναι συμβατό.</target>
 
@@ -232,12 +387,6 @@
 <source>Database file is corrupted:</source>
 <target>Το αρχείο βάσης δεδομένων είναι κατεστραμμένο:</target>
 
-<source>Cannot write file %x.</source>
-<target>Δεν μπορεί να γίνει εγγραφή του αρχείου %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Δεν μπορεί να γίνει ανάγνωση του αρχείου %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Τα αρχεία βάσης δεδομένων δεν περιέχουν ακόμα πληροφορίες για τον τελευταίο συγχρονισμό.</target>
 
@@ -256,9 +405,6 @@
 <source>Cannot get process information.</source>
 <target>Δεν μπορούν να ληφθούν πληροφορίες για τις τρέχουσες διαδικασίες.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Δεν μπορεί να γίνει ανάγνωση των χαρακτηριστικών του αρχείου %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Αναμονή μέχρι να κλειδωθεί ο υποκατάλογος:</target>
 
@@ -385,27 +531,12 @@
 <pluralform>%x νήματα</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Δεν μπορεί να γίνει ανάγνωση του καταλόγου %x.</target>
-
 <source>%x/sec</source>
 <target>%x/δευτερόλεπτο</target>
 
 <source>%x items</source>
 <target>%x στοιχεία</target>
 
-<source>Show in Explorer</source>
-<target>Εμφάνιση στην Εξερεύνηση</target>
-
-<source>Open with default application</source>
-<target>Άνοιγμα με την προεπιλεγμένη εφαρμογή</target>
-
-<source>Browse directory</source>
-<target>Αναζήτηση υποκαταλόγου</target>
-
-<source>Unable to connect to %x.</source>
-<target>Δεν μπορεί να πραγματοποιηθεί σύνδεση με το %x.</target>
-
 <source>Completed successfully</source>
 <target>Ολοκληρώθηκε επιτυχώς</target>
 
@@ -451,9 +582,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Δεν μπορεί να γίνει εγγραφή των χαρακτηριστικών αρχείου του %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Δεν είναι δυνατό το άνοιγμα του αρχείου %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>Τα %x και %y έχουν διαφορετικό περιεχόμενο.</target>
 
@@ -484,29 +612,20 @@
 <source>Source item %x not found</source>
 <target>Το στοιχείο προέλευσης %x δεν βρέθηκε</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Δεν μπορεί το αρχείο %x να μεταφερθεί στο %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Ο γονικός φάκελος %x δεν υπάρχει.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>Το όνομα %x χρησιμοποιείται ήδη από άλλο στοιχείο.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Δεν μπορεί να αντιγραφεί το αρχείο %x στο %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Αδυναμία αντιγραφής του συμβολικού συνδέσμου %x στο %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Δημιουργία Σκιώδους Αντίγραφου Τόμου για το %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Ο φάκελος %x δεν μπορεί να βρεθεί.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Ο φάκελος-στόχος %x υπάρχει ήδη.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Ο φάκελος-στόχος %x υπάρχει ήδη, αλλά δεν ήταν διαθέσιμος κατά τη σύγκριση φακέλων.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Το πεδίο εισαγωγής του φακέλου-στόχου πρέπει να μην είναι κενό.</target>
@@ -529,17 +648,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Δεν υπάρχει αρκετός διαθέσιμος χώρος στο δίσκο:</target>
 
-<source>Required:</source>
-<target>Απαιτείται:</target>
-
 <source>Available:</source>
 <target>Διαθέσιμος:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Μερικά αρχεία θα συγχρονιστούν ως μέρη πολλαπλών βασικών φακέλων.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Για να αποφύγετε διενέξεις, δημιουργείστε φίλτρα εξαίρεσης, ώστε κάθε ενημερωμένο αρχείο να εξετάζεται μόνο από έναν βασικό φάκελο.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Για να αποφευχθούν οι διενέξεις, χρειάζεται να δημιουργηθούν φίλτρα, έτσι ώστε κάθε αρχείο να συγχρονίζεται μόνο από έναν βασικό φάκελο.</target>
 
 <source>Versioning folder:</source>
 <target>Διατήρηση παλιών εκδόσεων του φακέλου:</target>
@@ -565,122 +681,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Δεν ήταν δυνατή η δημιουργία χρονικής σήμανσης για τη διατήρηση παλιών εκδόσεων:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Μη αναμενόμενο μέγεθος της ροής δεδομένων.
-Αναμενόμενο: %x bytes
-Βρέθηκε: %y bytes
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Δεν μπορεί να γίνει εγγραφή των δικαιωμάτων πρόσβασης του %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Η λειτουργία δεν υποστηρίζεται μεταξύ διαφορετικών χώρων αποθήκευσης.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Δεν μπορεί να διαγραφεί το αρχείο %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Δεν μπορεί να διαγραφεί ο συμβολικός σύνδεσμος %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Δεν μπορεί να διαγραφεί ο υποκατάλογος %x.</target>
-
-<source>Error Code %x</source>
-<target>Κωδικός Σφάλματος %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Δεν μπορεί να γίνει εγγραφή της ώρας τροποποίησης του %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Δεν μπορεί να δημιουργηθεί ο υποκατάλογος %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Δεν μπορεί να προσδιοριστεί η τελική διαδρομή για το %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Η λειτουργία δεν υποστηρίζεται από το χώρο αποθήκευσης.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Ο συμβολικός σύνδεσμος %x δεν μπορεί να επιλυθεί.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Δεν ήταν δυνατή η μεταφορά του %x στον κάδο ανακύκλωσης.</target>
-
-<source>Authentication completed.</source>
-<target>Ολοκληρώθηκε η επαλήθευση ταυτότητας.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Τώρα μπορείτε να κλείσετε αυτή τη σελίδα και να συνεχίσετε το FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Η επαλήθευση ταυτότητας απέτυχε.</target>
-
-<source>Cannot find %x.</source>
-<target>Το %x δεν μπορεί να βρεθεί.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Παρακαλούμε εξουσιοδοτείστε την πρόσβαση στο λογαριασμό χρήστη %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Δεν μπορεί να υπολογιστεί ο ελεύθερος χώρος του δίσκου %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Αδυναία αποσύνδεσης από το %x.</target>
-
-<source>Unable to access %x.</source>
-<target>Δεν είναι δυνατή η πρόσβαση στο %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Αποτυχία λήψης πληροφοριών από τον διακομιστή %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Δεν είναι δυνατή η παρακολύθηση του υποκαταλόγου %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Ο χώρος αποθήκευσης %x δεν μπορεί να βρεθεί.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Δεν είναι δυνατό το άνοιγμα του υποκαταλόγου %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Μη υποστηριζόμενος τύπος στοιχείου.</target>
-
-<source>Incorrect command line:</source>
-<target>Εσφαλμένη γραμμή εντολών:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>Ο εξυπηρετητής δεν υποστηρίζει επαλήθευση ταυτότητας μέσω %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Το χρονικό όριο της λειτουργίας έληξε μετά από 1 δευτερόλεπτο.</pluralform>
-<pluralform>Το χρονικό όριο της λειτουργίας έληξε μετά από %x δευτερόλεπτα.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Δεν είναι δυνατή η αναμονή περισσότερων από 1 σύνδεσης τη φορά.</pluralform>
-<pluralform>Δεν είναι δυνατή η αναμονή περισσότερων από %x συνδέσεων τη φορά.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Ενεργές συνδέσεις: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Αποτυχία ανοίγματος του SFTP καναλιού με αριθμό %x.</target>
-
 <source>Drag && drop</source>
 <target>Μεταφορά && Απόθεση</target>
 
@@ -747,6 +747,9 @@ Actual: %y bytes
 <source>Command line:</source>
 <target>Γραμμή εντολών:</target>
 
+<source>&Hide console window</source>
+<target>&Απόκρυψη της κονσόλας</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -782,8 +785,8 @@ The command is triggered if:
 <source>Waiting until directory is available:</source>
 <target>Αναμονή μέχρι ο φάκελος να γίνει διαθέσιμος:</target>
 
-<source>&Restore</source>
-<target>&Επαναφορά</target>
+<source>&Configure</source>
+<target>&Ρυθμίσεις</target>
 
 <source>&Show error message</source>
 <target>&Εμφάνιση μηνύματος σφαλμάτων</target>
@@ -818,8 +821,8 @@ The command is triggered if:
 <source>Scanning...</source>
 <target>Ανίχνευση...</target>
 
-<source>job name</source>
-<target>όνομα ενέργειας</target>
+<source>configuration file</source>
+<target>αρχείο παραμέτρων</target>
 
 <source>System: Sleep</source>
 <target>Σύστημα: Αναστολή λειτουργίας</target>
@@ -830,8 +833,8 @@ The command is triggered if:
 <source>Nothing to synchronize</source>
 <target>Δεν υπάρχει τίποτα προς συγχρονισμό</target>
 
-<source>Executing command %x</source>
-<target>Εκτέλεση εντολής %x</target>
+<source>Executing command:</source>
+<target>Εκτέλεση εντολής:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Μπορείτε να επιστρέψετε στο κύριο παράθυρο του FreeFileSync για να επιλύσετε αυτό το θέμα.</target>
@@ -1031,6 +1034,12 @@ The command is triggered if:
 <source>Match case</source>
 <target>Ταίριασμα κεφαλαίων/πεζών</target>
 
+<source>Processed:</source>
+<target>Ολοκληρώθηκαν:</target>
+
+<source>Remaining:</source>
+<target>Απομένουν:</target>
+
 <source>New</source>
 <target>Δημιουργία</target>
 
@@ -1267,14 +1276,17 @@ The command is triggered if:
 <source>&Don't show this dialog again</source>
 <target>&Να μην εμφανιστεί ξανά αυτό το μήνυμα</target>
 
-<source>Items found:</source>
-<target>Βρέθηκαν στοιχεία:</target>
+<source>Bytes:</source>
+<target>Bytes:</target>
 
-<source>Time remaining:</source>
-<target>Απομένει χρόνος:</target>
+<source>Items:</source>
+<target>Στοιχεία:</target>
 
-<source>Time elapsed:</source>
-<target>Πέρασε χρόνος:</target>
+<source>Synchronizing...</source>
+<target>Γίνεται συγχρονισμός...</target>
+
+<source>Minimize to notification area</source>
+<target>Ελαχιστοποίηση στην περιοχή ειδοποιήσεων</target>
 
 <source>Bytes</source>
 <target>Bytes</target>
@@ -1282,12 +1294,6 @@ The command is triggered if:
 <source>Items</source>
 <target>Στοιχεία</target>
 
-<source>Synchronizing...</source>
-<target>Γίνεται συγχρονισμός...</target>
-
-<source>Minimize to notification area</source>
-<target>Ελαχιστοποίηση στην περιοχή ειδοποιήσεων</target>
-
 <source>When finished:</source>
 <target>Μετά την ολοκλήρωση:</target>
 
@@ -1363,6 +1369,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete logs after x days:</source>
 <target>&Διαγραφή των αρχείων καταγραφής μετά από x ημέρες:</target>
 
+<source>Notification sounds:</source>
+<target>Ήχοι ειδοποίησης:</target>
+
+<source>Synchronization finished:</source>
+<target>Ολοκλήρωση συγχρονισμού:</target>
+
 <source>Customize context menu:</source>
 <target>Προσαρμογή μενού περιβάλλοντος:</target>
 
@@ -1567,12 +1579,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete</source>
 <target>&Διαγραφή</target>
 
-<source>Include all</source>
-<target>Συμπερίληψη όλων</target>
-
-<source>Exclude all</source>
-<target>Εξαίρεση όλων</target>
-
 <source>Show icons:</source>
 <target>Εμφάνιση εικονιδίων:</target>
 
@@ -1609,6 +1615,21 @@ This guarantees a consistent state even in case of a serious error.
 <source>Do&n't save</source>
 <target>Να &μην αποθηκευθούν</target>
 
+<source>%x cannot be renamed.</source>
+<target>Το %x δεν μπορεί να μετονομαστεί.</target>
+
+<source>New name:</source>
+<target>Νέο όνομα:</target>
+
+<source>Rename Configuration</source>
+<target>Μετονομασία αρχείου παραμέτρων</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Το όνομα του αρχείου παραμέτρων δεν μπορεί να είναι κενό.</target>
+
+<source>&Rename...</source>
+<target>&Μετονομασία...</target>
+
 <source>Hide configuration</source>
 <target>Απόκρυψη παραμέτρων συγχρονισμού</target>
 
@@ -1720,8 +1741,8 @@ This guarantees a consistent state even in case of a serious error.
 <source>Password:</source>
 <target>Συνθηματικό:</target>
 
-<source>Key password:</source>
-<target>Συνθηματικό κλειδιού:</target>
+<source>Key passphrase:</source>
+<target>Φάση πρόσβασης κλειδιού:</target>
 
 <source>Please enter a file path.</source>
 <target>Παρακαλούμε εισάγετε μια διαδρομή αρχείου.</target>
@@ -1885,6 +1906,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Ο ελάχιστος αριθμός παλιών εκδόσεων πρέπει να είναι μικρότερος από τον μέγιστο αριθμό.</target>
 
+<source>&Restore</source>
+<target>&Επαναφορά</target>
+
 <source>Files</source>
 <target>Αρχεία</target>
 
@@ -1951,6 +1975,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>The file is locked by another process:</source>
 <target>Το αρχείο είναι κλειδωμένο από μια άλλη διαδικασία:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Αποτυχία προσδιορισμού εάν ο φάκελος %x υποστηρίζει δικαιώματα πρόσβασης.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Δεν μπορεί να αναγνωσθεί το περιβάλλον ασφαλείας του %x.</target>
 
@@ -2002,12 +2029,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>Cannot change process I/O priorities.</source>
 <target>Δεν μπορούν να αλλάξουν οι προτεραιότητες I/O της διεργασίας.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Αδυναμία τερματισμού λειτουργίας του συστήματος.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Ο έλεγχος του κάδου ανακύκλωσης απέτυχε για τον υποκατάλογο %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Αδυναμία τερματισμού λειτουργίας του συστήματος.</target>
+
 <source>Prepare installation</source>
 <target>Προετοιμασία εγκατάστασης</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/hebrew.lng b/FreeFileSync/Build/Resources/Languages/hebrew.lng
index aa68375b..0d5d3eb1 100755
--- a/FreeFileSync/Build/Resources/Languages/hebrew.lng
+++ b/FreeFileSync/Build/Resources/Languages/hebrew.lng
@@ -7,6 +7,155 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>לא יכול לקרוא קובץ %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+גודל בלתי צפוי של זרם נתונים.
+צפוי: %x בתים
+בפועל: %y בתים
+</target>
+
+<source>Cannot write file %x.</source>
+<target>לא יכול לכתוב קובץ %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>לא יכול לכתוב הרשאות של %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>הפעולה אינה נתמכת בין התקנים שונים.</target>
+
+<source>Cannot delete file %x.</source>
+<target>לא יכול למחוק קובץ %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>לא ניתן למחוק קישור סימבולי %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>לא יכול למחוק מחיצה %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>לא יכול להעביר קובץ %x אל %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>לא יכול להעתיק קישור סימבולי %x אל %y.</target>
+
+<source>Error Code %x</source>
+<target>קוד שגיאה %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>לא ניתן לקרוא מחיצה %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>לא יכול לרשום זמן שינוי של %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>לא יכול לקרוא תכונות של קובץ %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>לא יכול ליצור מחיצה %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>לא יכול לקבוע את המסלול הסופי ל %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>הפעולה אינה נתמכת על ידי ההתקן.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>לא יכול לפענח את הקישור הסימבולי %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>לא יכול להעביר את %x לסל המחזור.</target>
+
+<source>Authentication completed.</source>
+<target>האימות הושלם.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>אתה יכול לסגור דף זה עכשיו ולהמשיך עם FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>האימות נכשל.</target>
+
+<source>Unable to connect to %x.</source>
+<target>לא יכול להתחבר אל %x.</target>
+
+<source>Cannot find %x.</source>
+<target>לא מוצא %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>בשם %x נעשה שימוש יותר מפעם אחת בתיקייה.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>בבקשה הרשה גישה לחשבון משתמש %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>לא יכול לפתוח קובץ %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>השם %x כבר בשימוש על ידי פריט אחר.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>לא ניתן לקבוע שטח דיסק פנוי עבור %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>לא ניתן להתנתק מ %x.</target>
+
+<source>Unable to access %x.</source>
+<target>לא ניתן לגשת אל %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>נכשלה קבלת מידע על שרת %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>לא יכול לנטר מחיצה %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>לא מוצא התקן %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>לא יכול לפתוח מחיצה %x.</target>
+
+<source>Unsupported item type.</source>
+<target>סוג פריט לא נתמך.</target>
+
+<source>Incorrect command line:</source>
+<target>שורת פקודה לא תקינה:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>השרת אינו תומך באימות באמצעות %x.</target>
+
+<source>Required:</source>
+<target>נדרש:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>זמן הפעולה פקע לאחר שניה 1.</pluralform>
+<pluralform>זמן הםעולה פקע לאחר %x שניות.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>לא ניתן להמתין ליותר מחיבור 1 בכל פעם.</pluralform>
+<pluralform>לא ניתן להמתין ליותר מ %x חיבורים בכל פעם.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>חיבורים פעילים: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>נכשלה פתיחת ערוץ SFTP מספר %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>שני הצדדים שונו מאז הסנכרון האחרון.</target>
 
@@ -109,9 +258,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>קבצי ההתקנה פגומים. בבקשה התקן מחדש את FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>לא יכול לטעון קובץ %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>לא יכול למצוא את התיקיות הבאות:</target>
 
@@ -139,6 +285,9 @@
 <pluralform>%x פריטים נמצאו</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>זמן שעבר:</target>
+
 <source>File %x has an invalid date.</source>
 <target>קובץ %x מכיל תאריך שגוי.</target>
 
@@ -157,9 +306,6 @@
 <source>Items differ in attributes only</source>
 <target>פריטים שונים בתכונות בלבד</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>בשם %x נעשה שימוש יותר מפעם אחת בתיקייה.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>פותר קישור סימבולי %x</target>
 
@@ -220,6 +366,15 @@
 <source>Out of memory.</source>
 <target>תם הזכרון.</target>
 
+<source>Show in Explorer</source>
+<target>הראה בסייר הקבצים</target>
+
+<source>Open with default application</source>
+<target>פתח באמצאות האפליקציה המתאימה</target>
+
+<source>Browse directory</source>
+<target>עיין במחיצה</target>
+
 <source>Database file %x is incompatible.</source>
 <target>קובץ מסד נתונים %x אינו במבנה מתאים.</target>
 
@@ -232,12 +387,6 @@
 <source>Database file is corrupted:</source>
 <target>קובץ בסיס נתונים פגום:</target>
 
-<source>Cannot write file %x.</source>
-<target>לא יכול לכתוב קובץ %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>לא יכול לקרוא קובץ %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>קבצי בסיס הנתונים אינם כוללים עדיין מידע על סינכרון אחרון.</target>
 
@@ -256,9 +405,6 @@
 <source>Cannot get process information.</source>
 <target>לא יכול לקבל את נתוני התהליך.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>לא יכול לקרוא תכונות של קובץ %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>ממתין בזמן שהמחיצה נעולה:</target>
 
@@ -331,6 +477,27 @@
 <source>Update attributes on right</source>
 <target>עדכן תכונות בצד שמאל</target>
 
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>שגיאה בפענוח קובץ %x, שורה %y, טור %z.</target>
+
+<source>Services</source>
+<target>שרותים</target>
+
+<source>Show All</source>
+<target>הראה הכל</target>
+
+<source>Hide Others</source>
+<target>מסתיר אחרים</target>
+
+<source>Hide %x</source>
+<target>מסתיר %x</target>
+
+<source>Quit %x</source>
+<target>יוצא %x</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>אין אפשרות להגדיר נעילות מחיצה עבור התיקיות הבאות:</target>
+
 <source>Errors:</source>
 <target>שגיאות:</target>
 
@@ -355,27 +522,6 @@
 <source>Cleaning up log files:</source>
 <target>מנקה קבצי יומן:</target>
 
-<source>Error parsing file %x, row %y, column %z.</source>
-<target>שגיאה בפענוח קובץ %x, שורה %y, טור %z.</target>
-
-<source>Services</source>
-<target>שרותים</target>
-
-<source>Show All</source>
-<target>הראה הכל</target>
-
-<source>Hide Others</source>
-<target>מסתיר אחרים</target>
-
-<source>Hide %x</source>
-<target>מסתיר %x</target>
-
-<source>Quit %x</source>
-<target>יוצא %x</target>
-
-<source>Cannot set directory locks for the following folders:</source>
-<target>אין אפשרות להגדיר נעילות מחיצה עבור התיקיות הבאות:</target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
@@ -385,27 +531,12 @@
 <pluralform>%x תהליכים</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>לא ניתן לקרוא מחיצה %x.</target>
-
 <source>%x/sec</source>
 <target>%x /שניות</target>
 
 <source>%x items</source>
 <target>%x פריטים</target>
 
-<source>Show in Explorer</source>
-<target>הראה בסייר הקבצים</target>
-
-<source>Open with default application</source>
-<target>פתח באמצאות האפליקציה המתאימה</target>
-
-<source>Browse directory</source>
-<target>עיין במחיצה</target>
-
-<source>Unable to connect to %x.</source>
-<target>לא יכול להתחבר אל %x.</target>
-
 <source>Completed successfully</source>
 <target>הסתיים בהצלחה</target>
 
@@ -451,9 +582,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>לא יכול לכתוב תכונות קובץ של %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>לא יכול לפתוח קובץ %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x ו- %y הם בעלי צוכן שונה.</target>
 
@@ -484,29 +612,20 @@
 <source>Source item %x not found</source>
 <target>פריט מקור %x לא נמצא</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>לא יכול להעביר קובץ %x אל %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>תיקיית אב %x לא קיימת.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>השם %x כבר בשימוש על ידי פריט אחר.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>לא יכול להעתיק קובץ %x  אל %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>לא יכול להעתיק קישור סימבולי %x אל %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>מייצר Volume Shadow Copy עבור %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>לא מוצא תיקייה %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>תיקיית מטרה %x כבר קיימת.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>תיקיית יעד %x קיימת, אך לא הייתה זמינהבזמן השוואת התיקיות.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>קלט תיקיית מטרה אינה יכול להיות ריק.</target>
@@ -529,17 +648,14 @@
 <source>Not enough free disk space available in:</source>
 <target>אין מספיק מקום דיסק פנוי ב:</target>
 
-<source>Required:</source>
-<target>נדרש:</target>
-
 <source>Available:</source>
 <target>זמין:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>קבצים מסויימים יסונכרנו כחלק מתיקיות בסיס מרובות.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>כדי למנוע התנגשויות, הגדר מסננים לאי הכללת קבצים כך שכל קובץ מעודכן ייחשב על ידי תיקיית בסיס אחת.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>כדי למנוע התנגשויות, הגדר מסנני אי הכללה כך שכל עידכון קובץ יכלל על ידי תיקיית בסיס אחת.</target>
 
 <source>Versioning folder:</source>
 <target>תיקיית גרסאות:</target>
@@ -565,122 +681,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>לא ניתן ליצור תג זמן לגרסאות:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-גודל בלתי צפוי של זרם נתונים.
-צפוי: %x בתים
-בפועל: %y בתים
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>לא יכול לכתוב הרשאות של %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>הפעולה אינה נתמכת בין התקנים שונים.</target>
-
-<source>Cannot delete file %x.</source>
-<target>לא יכול למחוק קובץ %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>לא ניתן למחוק קישור סימבולי %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>לא יכול למחוק מחיצה %x.</target>
-
-<source>Error Code %x</source>
-<target>קוד שגיאה %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>לא יכול לרשום זמן שינוי של %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>לא יכול ליצור מחיצה %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>לא יכול לקבוע את המסלול הסופי ל %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>הפעולה אינה נתמכת על ידי ההתקן.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>לא יכול לפענח את הקישור הסימבולי %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>לא יכול להעביר את %x לסל המחזור.</target>
-
-<source>Authentication completed.</source>
-<target>האימות הושלם.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>אתה יכול לסגור דף זה עכשיו ולהמשיך עם FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>האימות נכשל.</target>
-
-<source>Cannot find %x.</source>
-<target>לא מוצא %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>בבקשה הרשה גישה לחשבון משתמש %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>לא ניתן לקבוע שטח דיסק פנוי עבור %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>לא ניתן להתנתק מ %x.</target>
-
-<source>Unable to access %x.</source>
-<target>לא ניתן לגשת אל %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>נכשלה קבלת מידע על שרת %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>לא יכול לנטר מחיצה %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>לא מוצא התקן %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>לא יכול לפתוח מחיצה %x.</target>
-
-<source>Unsupported item type.</source>
-<target>סוג פריט לא נתמך.</target>
-
-<source>Incorrect command line:</source>
-<target>שורת פקודה לא תקינה:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>השרת אינו תומך באימות באמצעות %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>זמן הפעולה פקע לאחר שניה 1.</pluralform>
-<pluralform>זמן הםעולה פקע לאחר %x שניות.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>לא ניתן להמתין ליותר מחיבור 1 בכל פעם.</pluralform>
-<pluralform>לא ניתן להמתין ליותר מ %x חיבורים בכל פעם.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>חיבורים פעילים: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>נכשלה פתיחת ערוץ SFTP מספר %x.</target>
-
 <source>Drag && drop</source>
 <target>גרור ושחרר</target>
 
@@ -747,6 +747,9 @@ Actual: %y bytes
 <source>Command line:</source>
 <target>שורת פקודה:</target>
 
+<source>&Hide console window</source>
+<target>&הסתר חלון מסוף</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -782,8 +785,8 @@ The command is triggered if:
 <source>Waiting until directory is available:</source>
 <target>מחכה עד שהמחיצה זמינה:</target>
 
-<source>&Restore</source>
-<target>&טען מחדש</target>
+<source>&Configure</source>
+<target>&הגדר</target>
 
 <source>&Show error message</source>
 <target>&הצג הודעת שגיאה</target>
@@ -818,8 +821,8 @@ The command is triggered if:
 <source>Scanning...</source>
 <target>סורק...</target>
 
-<source>job name</source>
-<target>שם משימה</target>
+<source>configuration file</source>
+<target>קובץ תצורה</target>
 
 <source>System: Sleep</source>
 <target>מערכת: שינה</target>
@@ -830,8 +833,8 @@ The command is triggered if:
 <source>Nothing to synchronize</source>
 <target>אין מה לסנכרן</target>
 
-<source>Executing command %x</source>
-<target>מבצע פקודה %x</target>
+<source>Executing command:</source>
+<target>מבצע פקודה:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>ניתן לעבור לחלון הראשי של FreeFileSync כדי לפתור את הסוגיה הזו.</target>
@@ -1031,6 +1034,12 @@ The command is triggered if:
 <source>Match case</source>
 <target>התאם רישיות</target>
 
+<source>Processed:</source>
+<target>עבר עיבוד:</target>
+
+<source>Remaining:</source>
+<target>משנה שם:</target>
+
 <source>New</source>
 <target>חדש</target>
 
@@ -1267,14 +1276,17 @@ The command is triggered if:
 <source>&Don't show this dialog again</source>
 <target>&אל תראה דושיח זה שנית</target>
 
-<source>Items found:</source>
-<target>אלמנטים נמצאו:</target>
+<source>Bytes:</source>
+<target>בתים:</target>
 
-<source>Time remaining:</source>
-<target>זמן שנשאר:</target>
+<source>Items:</source>
+<target>פריטים:</target>
 
-<source>Time elapsed:</source>
-<target>זמן שעבר:</target>
+<source>Synchronizing...</source>
+<target>מסנכרן...</target>
+
+<source>Minimize to notification area</source>
+<target>הקטן לאיזור ההתרעות</target>
 
 <source>Bytes</source>
 <target>בתים</target>
@@ -1282,12 +1294,6 @@ The command is triggered if:
 <source>Items</source>
 <target>פריטים</target>
 
-<source>Synchronizing...</source>
-<target>מסנכרן...</target>
-
-<source>Minimize to notification area</source>
-<target>הקטן לאיזור ההתרעות</target>
-
 <source>When finished:</source>
 <target>לאחר הסיום:</target>
 
@@ -1363,6 +1369,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete logs after x days:</source>
 <target>&מחק יומנים לאחר x ימים:</target>
 
+<source>Notification sounds:</source>
+<target>צלילי הודעה:</target>
+
+<source>Synchronization finished:</source>
+<target>סינכרון הסתים:</target>
+
 <source>Customize context menu:</source>
 <target>התאמה אישית של תפריט הקשר:</target>
 
@@ -1513,33 +1525,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Execute</source>
 <target>&בצע</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 מחיצה</pluralform>
-<pluralform>%x מחיצות</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 קובץ</pluralform>
-<pluralform>%x קבצים</pluralform>
-</target>
-
-<source>
-<pluralform>Showing %y of 1 row</pluralform>
-<pluralform>Showing %y of %x rows</pluralform>
-</source>
-<target>
-<pluralform>מראה %y מתוך שורה 1</pluralform>
-<pluralform>מראה %y מתוך %x שורות</pluralform>
-</target>
-
 <source>Set direction:</source>
 <target>בחר כוון:</target>
 
@@ -1567,12 +1552,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete</source>
 <target>&מחק</target>
 
-<source>Include all</source>
-<target>הכלל הכל</target>
-
-<source>Exclude all</source>
-<target>הוצא מן הכלל הכל</target>
-
 <source>Show icons:</source>
 <target>הצג סמלים:</target>
 
@@ -1609,6 +1588,21 @@ This guarantees a consistent state even in case of a serious error.
 <source>Do&n't save</source>
 <target>אל &תשמור</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x לא ניתן לשנות את שמו.</target>
+
+<source>New name:</source>
+<target>שם חדש:</target>
+
+<source>Rename Configuration</source>
+<target>שנה שם תצורה</target>
+
+<source>Configuration name must not be empty.</source>
+<target>אסור ששם התצורה יהיה ריק.</target>
+
+<source>&Rename...</source>
+<target>&שנה שם...</target>
+
 <source>Hide configuration</source>
 <target>הסתר תצורה</target>
 
@@ -1669,6 +1663,33 @@ This guarantees a consistent state even in case of a serious error.
 <source>All files are in sync</source>
 <target>כל הקבצים מסונכרנים</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 מחיצה</pluralform>
+<pluralform>%x מחיצות</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 קובץ</pluralform>
+<pluralform>%x קבצים</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>מראה %y מתוך שורה 1</pluralform>
+<pluralform>מראה %y מתוך %x שורות</pluralform>
+</target>
+
 <source>Cannot find %x</source>
 <target>לא מוצא %x</target>
 
@@ -1720,7 +1741,7 @@ This guarantees a consistent state even in case of a serious error.
 <source>Password:</source>
 <target>סיסמה:</target>
 
-<source>Key password:</source>
+<source>Key passphrase:</source>
 <target>סיסמת מפתח:</target>
 
 <source>Please enter a file path.</source>
@@ -1885,6 +1906,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>מונה גירסה מינימלי חייב להיות קטן ממונה גירסה מקסימלי.</target>
 
+<source>&Restore</source>
+<target>&טען מחדש</target>
+
 <source>Files</source>
 <target>קבצים</target>
 
@@ -1951,6 +1975,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>The file is locked by another process:</source>
 <target>הקובץ נעול ע"י תהליך:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>נכשל בקביעת תמיכה להרשאות קובץ עבור תיקיה %x.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>לא יכול לקרוא הקשר בטיחות של %x.</target>
 
@@ -2002,12 +2029,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>Cannot change process I/O priorities.</source>
 <target>לא יכול לשנות קדימויות של תהליך קלט פלט.</target>
 
-<source>Unable to shut down the system.</source>
-<target>לא מסוגל לכבות את המערכת.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>בודק כשלון בתא מחזור עבור תיקייה %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>לא מסוגל לכבות את המערכת.</target>
+
 <source>Prepare installation</source>
 <target>מכין התקנה</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/hindi.lng b/FreeFileSync/Build/Resources/Languages/hindi.lng
index 9094d3e6..c210fdf6 100755
--- a/FreeFileSync/Build/Resources/Languages/hindi.lng
+++ b/FreeFileSync/Build/Resources/Languages/hindi.lng
@@ -7,6 +7,155 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>फ़ाइल %x पढ़ने में असमर्थ।</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+डेटा स्ट्रीम का आकार अनपेक्षित।
+अपेक्षित: %x बाइट्स
+वास्तविक: %y बाइट्स
+</target>
+
+<source>Cannot write file %x.</source>
+<target>फ़ाइल %x लिखने में असमर्थ।</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>%x की अनुमतियां लिख नहीं सकते।</target>
+
+<source>Operation not supported between different devices.</source>
+<target>विभिन्न उपकरणों के बीच कार्यवाई असमर्थित।</target>
+
+<source>Cannot delete file %x.</source>
+<target>फ़ाइल %x हटा नहीं सकते।</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>प्रतीकात्मक कड़ी %x हटाया नहीं जा सकता।</target>
+
+<source>Cannot delete directory %x.</source>
+<target>निर्देशिका %x हटा नहीं सकते।</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>फ़ाइल %x से %y ले जा नाहीं सकते।</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>सिंबॉलिक लिंक %x से %y प्रतिलिपित नहीं कर सकते।</target>
+
+<source>Error Code %x</source>
+<target>त्रुटि कोड %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>निर्देशिका %x को पढ़ा नहीं जा सकता।</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>%x का संशोधन समय लिख नहीं सकते।</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>%x के फ़ाइल गुण पढ़ने में असमर्थ।</target>
+
+<source>Cannot create directory %x.</source>
+<target>%x निर्देशिका बना नहीं सकते।</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>%x का अंतिम पथ निर्धारित नहीं कर सकते।</target>
+
+<source>Operation not supported by device.</source>
+<target>कार्यवाई उपकरण द्वारा असमर्थित।</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>सिंबॉलिक लिंक %x को हल नहीं कर सकते।</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>%x को रीसायकल बिन ले जाने में असमर्थ।</target>
+
+<source>Authentication completed.</source>
+<target>प्रमाणन पूर्ण।</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>आप अब इस पृष्ठ को बंद कर FreeFileSync जारी रख सकते हैं।</target>
+
+<source>Authentication failed.</source>
+<target>प्रमाणन विफल।</target>
+
+<source>Unable to connect to %x.</source>
+<target>%x से कनेक्ट करने में असमर्थ।</target>
+
+<source>Cannot find %x.</source>
+<target>%x नहीं मिला।</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>%x नाम का उपयोग फ़ोल्डर में एक से अधिक आइटम द्वारा किया गया है।</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>कृपया उपयोगकर्ता खाता %x से पहुँच अधिकृत करें।</target>
+
+<source>Cannot open file %x.</source>
+<target>%x फ़ाइल को खोलने में असमर्थ।</target>
+
+<source>The name %x is already used by another item.</source>
+<target>%x इस नाम का उपयोग पहले से ही किसी अन्य आइटम द्वारा किया गया है।</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>%x के लिए खाली डिस्क जगह निर्धारित नहीं कर सकते।</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>%x से सम्पर्क काटने में असमर्थ।</target>
+
+<source>Unable to access %x.</source>
+<target>%x तक पहुँचने में असमर्थ।</target>
+
+<source>Failed to get information about server %x.</source>
+<target>सर्वर %x की जानकारी प्राप्त करने में विफल।</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>निर्देशिका %x की निगरानी कर नहीं सकते।</target>
+
+<source>Cannot find device %x.</source>
+<target>उपकरण %x नहीं मिला।</target>
+
+<source>Cannot open directory %x.</source>
+<target>निर्देशिका %x खोल नहीं सकते।</target>
+
+<source>Unsupported item type.</source>
+<target>असमर्थित आइटम प्रकार।</target>
+
+<source>Incorrect command line:</source>
+<target>अनुचित आदेश-पंक्ति:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>सर्वर पर %x द्वारा प्रमाणन समर्थित नहीं है।</target>
+
+<source>Required:</source>
+<target>आवश्यक:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>1 सेकंड के बाद कार्यवाई का काल समाप्त हुआ।</pluralform>
+<pluralform>%x सेकंड्स के बाद कार्यवाई का काल समाप्त हुआ।</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>एक समय में 1 कनेक्शन से अधिक पर प्रतीक्षा नहीं कर सकते।</pluralform>
+<pluralform>एक समय में %x कनेक्शन्स से अधिक पर प्रतीक्षा नहीं कर सकते।</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>सक्रिय कनेक्शन्स: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>SFTP चैनल संख्या %x को खोलने में विफल।</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>पिछ्ले सिंक्रनाइज़ेशन के बाद से दोनो तरफ बदलाव है।</target>
 
@@ -109,9 +258,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>स्थापना फ़ाइलें दूषित हैं। FreeFileSync पुनर्स्थापित करें।</target>
 
-<source>Cannot load file %x.</source>
-<target>फ़ाइल %x लोड करने में असमर्थ।</target>
-
 <source>Cannot find the following folders:</source>
 <target>निम्न फ़ोलडर्स नहीं मिले:</target>
 
@@ -139,6 +285,9 @@
 <pluralform>%x आइटम्स मिले</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>बीता समय:</target>
+
 <source>File %x has an invalid date.</source>
 <target>%x फ़ाइल का दिनांक अवैध है।</target>
 
@@ -146,7 +295,7 @@
 <target>दिनांक:</target>
 
 <source>Files have the same date but a different size.</source>
-<target>फाइल्स का दिनांक समान है पर आकार भिन्न है।</target>
+<target>फाइल्स का दिनांक समान है परंतु आकार भिन्न है।</target>
 
 <source>Size:</source>
 <target>आकार:</target>
@@ -157,9 +306,6 @@
 <source>Items differ in attributes only</source>
 <target>आइटम्स के केवल गुण ही भिन्न हैं।</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>%x नाम का उपयोग फ़ोल्डर में एक से अधिक आइटम द्वारा किया गया है।</target>
-
 <source>Resolving symbolic link %x</source>
 <target>%x प्रतीकात्मक कड़ी को हल किया जा रहा है</target>
 
@@ -220,6 +366,15 @@
 <source>Out of memory.</source>
 <target>स्मृति से बाहर।</target>
 
+<source>Show in Explorer</source>
+<target>एक्सप्लोरर में दिखाएं</target>
+
+<source>Open with default application</source>
+<target>डिफ़ॉल्ट अ‍ॅप्लिकेशन के साथ खोलें</target>
+
+<source>Browse directory</source>
+<target>निर्देशिका ब्राउज़ करें</target>
+
 <source>Database file %x is incompatible.</source>
 <target>डेटाबेस फ़ाइल %x विसंगत है।</target>
 
@@ -232,12 +387,6 @@
 <source>Database file is corrupted:</source>
 <target>डेटाबेस फ़ाइल दूषित है:</target>
 
-<source>Cannot write file %x.</source>
-<target>फ़ाइल %x लिखने में असमर्थ।</target>
-
-<source>Cannot read file %x.</source>
-<target>फ़ाइल %x पढ़ने में असमर्थ।</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>डेटाबेस फ़ाइल्स में अभी तक पिछले सिंक्रनाइज़ेशन की जानकारी नहीं है।</target>
 
@@ -256,9 +405,6 @@
 <source>Cannot get process information.</source>
 <target>प्रक्रिया जानकारी प्राप्त करने में असमर्थ।</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>%x के फ़ाइल गुण पढ़ने में असमर्थ।</target>
-
 <source>Waiting while directory is locked:</source>
 <target>प्रतीक्षारत जब कि निर्देशिका अवरोधित है:</target>
 
@@ -385,27 +531,12 @@
 <pluralform>%x थ्रेड्स</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>निर्देशिका %x को पढ़ा नहीं जा सकता।</target>
-
 <source>%x/sec</source>
 <target>%x/सेकंड</target>
 
 <source>%x items</source>
 <target>%x आइटम्स</target>
 
-<source>Show in Explorer</source>
-<target>एक्सप्लोरर में दिखाएं</target>
-
-<source>Open with default application</source>
-<target>डिफ़ॉल्ट अ‍ॅप्लिकेशन के साथ खोलें</target>
-
-<source>Browse directory</source>
-<target>निर्देशिका ब्राउज़ करें</target>
-
-<source>Unable to connect to %x.</source>
-<target>%x से कनेक्ट करने में असमर्थ।</target>
-
 <source>Completed successfully</source>
 <target>सफलतापूर्वक पूर्ण हुआ</target>
 
@@ -451,9 +582,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>%x के फ़ाइल गुण लिख नहीं सकते।</target>
 
-<source>Cannot open file %x.</source>
-<target>%x फ़ाइल को खोलने में असमर्थ।</target>
-
 <source>%x and %y have different content.</source>
 <target>%x और %y की सामग्री भिन्न है।</target>
 
@@ -484,29 +612,20 @@
 <source>Source item %x not found</source>
 <target>स्रोत आइटम %x नहीं मिला</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>फ़ाइल %x से %y ले जा नाहीं सकते।</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>अभिभावक निर्देशिका %x विद्यमान नहीं है।</target>
 
-<source>The name %x is already used by another item.</source>
-<target>%x इस नाम का उपयोग पहले से ही किसी अन्य आइटम द्वारा किया गया है।</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>फ़ाइल %x से %y प्रतिलिपित नहीं कर सकते।</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>सिंबॉलिक लिंक %x से %y प्रतिलिपित नहीं कर सकते।</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>%x के लिए वॉल्यूम शॅडो प्रतिलिपि बनाई जा रही है...</target>
 
 <source>Cannot find folder %x.</source>
 <target>निर्देशिका %x नहीं मिला।</target>
 
-<source>Target folder %x already existing.</source>
-<target>गंतव्य निर्देशिका %x पहले से ही विद्यमान है।</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>गंतव्य निर्देशिका %x पहले से विद्यमान है, परंतु वह निर्देशिका तुलना के समय उपलब्ध नहीं थी।</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>गंतव्य निर्देशिका प्रविष्टि खाली नहीं हो सकती।</target>
@@ -529,17 +648,14 @@
 <source>Not enough free disk space available in:</source>
 <target>यहाँ पर्याप्त खाली डिस्क जगह उपलब्ध नहीं:</target>
 
-<source>Required:</source>
-<target>आवश्यक:</target>
-
 <source>Available:</source>
 <target>उपलब्ध:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>कुछ फ़ाइल्स को एकाधिक आधार निर्देशिकाओं के भाग के रूप में सिंक्रनाइज़ किया जाएगा।</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>विरोधों से बचने के लिए अपवर्जित फ़िल्टर्स सेट करें ताकि प्रत्येक अद्यतित फ़ाइल केवल एक ही आधार निर्देशिका से मानी जाएगी।</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>विरोध टालने के लिए वर्जित फ़िल्टर स्थापित करें ताकि प्रत्येक अद्यतित फ़ाइल केवल एक आधार निर्देशिका द्वारा सम्मिलित हो।</target>
 
 <source>Versioning folder:</source>
 <target>संस्करण निर्देशिका:</target>
@@ -565,122 +681,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>संस्करण के लिए समय मोहर बनाने में असमर्थ:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-डेटा स्ट्रीम का आकार अनपेक्षित।
-अपेक्षित: %x बाइट्स
-वास्तविक: %y बाइट्स
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>%x की अनुमतियां लिख नहीं सकते।</target>
-
-<source>Operation not supported between different devices.</source>
-<target>विभिन्न उपकरणों के बीच कार्यवाई असमर्थित।</target>
-
-<source>Cannot delete file %x.</source>
-<target>फ़ाइल %x हटा नहीं सकते।</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>प्रतीकात्मक कड़ी %x हटाया नहीं जा सकता।</target>
-
-<source>Cannot delete directory %x.</source>
-<target>निर्देशिका %x हटा नहीं सकते।</target>
-
-<source>Error Code %x</source>
-<target>त्रुटि कोड %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>%x का संशोधन समय लिख नहीं सकते।</target>
-
-<source>Cannot create directory %x.</source>
-<target>%x निर्देशिका बना नहीं सकते।</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>%x का अंतिम पथ निर्धारित नहीं कर सकते।</target>
-
-<source>Operation not supported by device.</source>
-<target>कार्यवाई उपकरण द्वारा असमर्थित।</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>सिंबॉलिक लिंक %x को हल नहीं कर सकते।</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>%x को रीसायकल बिन ले जाने में असमर्थ।</target>
-
-<source>Authentication completed.</source>
-<target>प्रमाणन पूर्ण।</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>आप अब इस पृष्ठ को बंद कर FreeFileSync जारी रख सकते हैं।</target>
-
-<source>Authentication failed.</source>
-<target>प्रमाणन विफल।</target>
-
-<source>Cannot find %x.</source>
-<target>%x नहीं मिला।</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>कृपया उपयोगकर्ता खाता %x से पहुँच अधिकृत करें।</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>%x के लिए खाली डिस्क जगह निर्धारित नहीं कर सकते।</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>%x से सम्पर्क काटने में असमर्थ।</target>
-
-<source>Unable to access %x.</source>
-<target>%x तक पहुँचने में असमर्थ।</target>
-
-<source>Failed to get information about server %x.</source>
-<target>सर्वर %x की जानकारी प्राप्त करने में विफल।</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>निर्देशिका %x की निगरानी कर नहीं सकते।</target>
-
-<source>Cannot find device %x.</source>
-<target>उपकरण %x नहीं मिला।</target>
-
-<source>Cannot open directory %x.</source>
-<target>निर्देशिका %x खोल नहीं सकते।</target>
-
-<source>Unsupported item type.</source>
-<target>असमर्थित आइटम प्रकार।</target>
-
-<source>Incorrect command line:</source>
-<target>अनुचित आदेश-पंक्ति:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>सर्वर पर %x द्वारा प्रमाणन समर्थित नहीं है।</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>1 सेकंड के बाद कार्यवाई का काल समाप्त हुआ।</pluralform>
-<pluralform>%x सेकंड्स के बाद कार्यवाई का काल समाप्त हुआ।</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>एक समय में 1 कनेक्शन से अधिक पर प्रतीक्षा नहीं कर सकते।</pluralform>
-<pluralform>एक समय में %x कनेक्शन्स से अधिक पर प्रतीक्षा नहीं कर सकते।</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>सक्रिय कनेक्शन्स: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>SFTP चैनल संख्या %x को खोलने में विफल।</target>
-
 <source>Drag && drop</source>
 <target>ड्रॅग एण्ड ड्रॉप</target>
 
@@ -747,6 +747,9 @@ Actual: %y bytes
 <source>Command line:</source>
 <target>आदेश-पंक्ति:</target>
 
+<source>&Hide console window</source>
+<target>कंसोल विंडो छिपाएँ (&H)</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -782,8 +785,8 @@ The command is triggered if:
 <source>Waiting until directory is available:</source>
 <target>प्रतीक्षारत जब कि निर्देशिका उपलब्ध हो:</target>
 
-<source>&Restore</source>
-<target>पुनर्स्थापित करें (&R)</target>
+<source>&Configure</source>
+<target>कॉन्फ़िगर (&C)</target>
 
 <source>&Show error message</source>
 <target>त्रुटि संदेश दिखाएं (&S)</target>
@@ -818,8 +821,8 @@ The command is triggered if:
 <source>Scanning...</source>
 <target>स्कैनिंग...</target>
 
-<source>job name</source>
-<target>कार्य नाम</target>
+<source>configuration file</source>
+<target>कॉन्फ़िगरेशन फ़ाइल</target>
 
 <source>System: Sleep</source>
 <target>सिस्टम: स्लीप</target>
@@ -830,8 +833,8 @@ The command is triggered if:
 <source>Nothing to synchronize</source>
 <target>सिंक्रनाइज़ करने के लिए कुछ नहीं</target>
 
-<source>Executing command %x</source>
-<target>कार्यान्वित आदेश %x</target>
+<source>Executing command:</source>
+<target>निष्पादित आदेश:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>इस समस्या को हल करने के लिए आप FreeFileSync के मुख्य विंडो में जा सकते हैं।</target>
@@ -1031,6 +1034,12 @@ The command is triggered if:
 <source>Match case</source>
 <target>केस मिलाएं</target>
 
+<source>Processed:</source>
+<target>संसाधित:</target>
+
+<source>Remaining:</source>
+<target>शेष:</target>
+
 <source>New</source>
 <target>नया</target>
 
@@ -1267,14 +1276,17 @@ The command is triggered if:
 <source>&Don't show this dialog again</source>
 <target>यह संवाद बॉक्स दोबारा न दिखाएं (&D)</target>
 
-<source>Items found:</source>
-<target>आइटम बरामद:</target>
+<source>Bytes:</source>
+<target>बाइट्स:</target>
 
-<source>Time remaining:</source>
-<target>शेष समय:</target>
+<source>Items:</source>
+<target>आइटम्स:</target>
 
-<source>Time elapsed:</source>
-<target>बीता समय:</target>
+<source>Synchronizing...</source>
+<target>सिंक्रनाइज़ हो रहा है...</target>
+
+<source>Minimize to notification area</source>
+<target>सूचना क्षेत्र में मिनिमाइज़ करें</target>
 
 <source>Bytes</source>
 <target>बाइट्स</target>
@@ -1282,12 +1294,6 @@ The command is triggered if:
 <source>Items</source>
 <target>आइटम्स</target>
 
-<source>Synchronizing...</source>
-<target>सिंक्रनाइज़ हो रहा है...</target>
-
-<source>Minimize to notification area</source>
-<target>सूचना क्षेत्र में मिनिमाइज़ करें</target>
-
 <source>When finished:</source>
 <target>समाप्त होने पर:</target>
 
@@ -1363,6 +1369,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete logs after x days:</source>
 <target>x दिनों के बाद लॉग हटाएं (&D):</target>
 
+<source>Notification sounds:</source>
+<target>अधिसूचना ध्वनि:</target>
+
+<source>Synchronization finished:</source>
+<target>सिंक्रनाइज़ेशन समाप्त:</target>
+
 <source>Customize context menu:</source>
 <target>प्रासंगिक मेनू अनुकूलित करें:</target>
 
@@ -1567,12 +1579,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete</source>
 <target>हटाएं (&D)</target>
 
-<source>Include all</source>
-<target>सभी समावेश करें</target>
-
-<source>Exclude all</source>
-<target>सभी अपवर्जित करें</target>
-
 <source>Show icons:</source>
 <target>चिन्ह दिखाएं:</target>
 
@@ -1609,6 +1615,21 @@ This guarantees a consistent state even in case of a serious error.
 <source>Do&n't save</source>
 <target>नहीं सहेजें (&n)</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x का नाम नहीं बदला जा सकता है।</target>
+
+<source>New name:</source>
+<target>नया नाम:</target>
+
+<source>Rename Configuration</source>
+<target>कॉन्फ़िगरेशन का नाम बदलें</target>
+
+<source>Configuration name must not be empty.</source>
+<target>कॉन्फ़िगरेशन का नाम रिक्त नहीं होना चाहिए।</target>
+
+<source>&Rename...</source>
+<target>नाम बदलें (&R)...</target>
+
 <source>Hide configuration</source>
 <target>कॉन्फ़िगरेशन छुपाएं</target>
 
@@ -1720,8 +1741,8 @@ This guarantees a consistent state even in case of a serious error.
 <source>Password:</source>
 <target>पासवर्ड:</target>
 
-<source>Key password:</source>
-<target>कुंजी पासवर्ड:</target>
+<source>Key passphrase:</source>
+<target>कुंजी पासफ्रेज़:</target>
 
 <source>Please enter a file path.</source>
 <target>कृपया कोई फ़ाइल पथ प्रविष्ट करें।</target>
@@ -1885,6 +1906,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>न्यूनतम संस्करण गणना अधिकतम गणना से छोटी होनी चाहिए।</target>
 
+<source>&Restore</source>
+<target>पुनर्स्थापित करें (&R)</target>
+
 <source>Files</source>
 <target>फ़ाइल्स</target>
 
@@ -1951,6 +1975,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>The file is locked by another process:</source>
 <target>फ़ाइल किसी अन्य प्रक्रिया द्वारा अवरोधित है:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>%x फ़ोल्डर के लिए फ़ाइल अनुमति समर्थन निर्धारित करने में विफल।</target>
+
 <source>Cannot read security context of %x.</source>
 <target>%x का सुरक्षा संदर्भ पढ़ नहीं सकते।</target>
 
@@ -2002,12 +2029,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>Cannot change process I/O priorities.</source>
 <target>प्रक्रिया I/O प्राथमिकताओं को बदल नहीं सकते।</target>
 
-<source>Unable to shut down the system.</source>
-<target>सिस्टम को बंद करने में असमर्थ।</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>निर्देशिका %x के लिए रीसायकल बिन की जाँच विफल।</target>
 
+<source>Unable to shut down the system.</source>
+<target>सिस्टम को बंद करने में असमर्थ।</target>
+
 <source>Prepare installation</source>
 <target>स्थापना तैयारी</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/hungarian.lng b/FreeFileSync/Build/Resources/Languages/hungarian.lng
index 5abd63c6..e7223bbc 100755
--- a/FreeFileSync/Build/Resources/Languages/hungarian.lng
+++ b/FreeFileSync/Build/Resources/Languages/hungarian.lng
@@ -7,6 +7,155 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>%x állomány nem olvasható.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Az adatfolyam mérete eltér a várttól
+Várt: %x bájt
+Tényleges: %y bájt
+</target>
+
+<source>Cannot write file %x.</source>
+<target>%x állomány írása sikertelen.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>%x jogosultságait nem lehet felírni.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>A művelet nem támogatott különböző eszközök között.</target>
+
+<source>Cannot delete file %x.</source>
+<target>%x állomány nem törölhető.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>%x szimbolikus hivatkozás nem törölhető.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>%x könyvtár nem törölhető.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>%x állomány nem mozgatható %y-ba.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>%x szimbolikus hivatkozás nem másolható %y-ba.</target>
+
+<source>Error Code %x</source>
+<target>Hibakód %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>%x könyvtár nem olvasható.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>%x módosításának időpontja nem rögzíthető.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>%x állomány attribútumai nem olvashatók.</target>
+
+<source>Cannot create directory %x.</source>
+<target>%x könyvtár nem hozható létre.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>%x számára a végső útvonal nem határozható meg.</target>
+
+<source>Operation not supported by device.</source>
+<target>Az eszköz nem támogatja a műveletet.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>%x szimbolikus hivatkozás nem oldható fel.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>%x nem helyezhető Lomtárba.</target>
+
+<source>Authentication completed.</source>
+<target>Hitelesítés befejezve.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Most bezárhatja ezt az oldalt és folytathatja a FreeFileSync-et.</target>
+
+<source>Authentication failed.</source>
+<target>Hitelesítés sikertelen.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Nem képes %x-hez kapcsolódni.</target>
+
+<source>Cannot find %x.</source>
+<target>%x nem található.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>A(z) %x nevet nem csak egy elem viseli a könyvtárban.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Engedélyezze a hozzáférést a(z) %x felhasználói azonosítóhoz.</target>
+
+<source>Cannot open file %x.</source>
+<target>%x állomány nem nyitható meg.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>%x nevet már más elem használja.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>%x-nek nem határozható meg szabad tárterület.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Nem sikerült leválasztani %x-től.</target>
+
+<source>Unable to access %x.</source>
+<target>%x nem elérhető.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>%x szerverről nem sikerült információt kapni.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>%x könyvtárat nem sikerült monitorozni.</target>
+
+<source>Cannot find device %x.</source>
+<target>%x eszköz nem található.</target>
+
+<source>Cannot open directory %x.</source>
+<target>%x könyvtár nem nyitható meg.</target>
+
+<source>Unsupported item type.</source>
+<target>Nem támogatott elemtípus.</target>
+
+<source>Incorrect command line:</source>
+<target>Hibás parancssor:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>A szerver nem támogatja a(z) %x általi autentikációt.</target>
+
+<source>Required:</source>
+<target>Szükséges:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>A művelet 1 másodperc után időtúllépés miatt leállt.</pluralform>
+<pluralform>A művelet %x másodperc után időtúllépés miatt leállt.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Nem tud 1-nél több kapcsolatra várni egyidejűleg.</pluralform>
+<pluralform>Nem tud több mint %x kapcsolatra várni egyidejűleg.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Aktív kapcsolatok száma: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Hiba a(z) %x számú SFTP csatorna megnyitása során.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Mindkét oldal megváltozott az utolsó szinkronizálás óta.</target>
 
@@ -109,9 +258,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>A telepítő állományok sérültek. Installálja újra a FreeFileSync-et.</target>
 
-<source>Cannot load file %x.</source>
-<target>%x állomány betöltése nem sikerült.</target>
-
 <source>Cannot find the following folders:</source>
 <target>A következő könyvtárak nem találhatóak:</target>
 
@@ -139,6 +285,9 @@
 <pluralform>%x tételt találtam</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Eltelt idő:</target>
+
 <source>File %x has an invalid date.</source>
 <target>%x állomány dátuma érvénytelen.</target>
 
@@ -157,9 +306,6 @@
 <source>Items differ in attributes only</source>
 <target>Az elemek csak attribútumaikban különböznek</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>A(z) %x nevet nem csak egy elem viseli a könyvtárban.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>%x szimbolikus hivatkozás feloldása</target>
 
@@ -220,6 +366,15 @@
 <source>Out of memory.</source>
 <target>Memória túlcsordulás.</target>
 
+<source>Show in Explorer</source>
+<target>Mutassa az Intézőben</target>
+
+<source>Open with default application</source>
+<target>Nyissa meg az alapértelmezett alkalmazással</target>
+
+<source>Browse directory</source>
+<target>Tallózza a könyvtárat</target>
+
 <source>Database file %x is incompatible.</source>
 <target>%x adatbázis-állomány  nem kompatibilis.</target>
 
@@ -232,12 +387,6 @@
 <source>Database file is corrupted:</source>
 <target>A következő adatbázis állomány sérült:</target>
 
-<source>Cannot write file %x.</source>
-<target>%x állomány írása sikertelen.</target>
-
-<source>Cannot read file %x.</source>
-<target>%x állomány nem olvasható.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Az adatbázis állományok nem tartalmaznak információt a legutóbbi szinkronizálásról.</target>
 
@@ -256,9 +405,6 @@
 <source>Cannot get process information.</source>
 <target>Nem sikerült lekérdezni a processz-információkat.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>%x állomány attribútumai nem olvashatók.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Várakozás amíg a könyvtár zárolt:</target>
 
@@ -331,6 +477,27 @@
 <source>Update attributes on right</source>
 <target>Attribútumok frissítése a jobb oldalon</target>
 
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Hiba történt a feldolgozás közben: %x állomány, %y sor, %z oszlop.</target>
+
+<source>Services</source>
+<target>Szervizek</target>
+
+<source>Show All</source>
+<target>Összest Mutassa</target>
+
+<source>Hide Others</source>
+<target>Rejtse a többit</target>
+
+<source>Hide %x</source>
+<target>Rejt %x</target>
+
+<source>Quit %x</source>
+<target>Leállít %x</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>Nem lehet beállítani a könyvtárak lockolását a következő könyvtárakhoz:</target>
+
 <source>Errors:</source>
 <target>Hiba:</target>
 
@@ -355,27 +522,6 @@
 <source>Cleaning up log files:</source>
 <target>A log állományok törlése:</target>
 
-<source>Error parsing file %x, row %y, column %z.</source>
-<target>Hiba történt a feldolgozás közben: %x állomány, %y sor, %z oszlop.</target>
-
-<source>Services</source>
-<target>Szervizek</target>
-
-<source>Show All</source>
-<target>Összest Mutassa</target>
-
-<source>Hide Others</source>
-<target>Rejtse a többit</target>
-
-<source>Hide %x</source>
-<target>Rejt %x</target>
-
-<source>Quit %x</source>
-<target>Leállít %x</target>
-
-<source>Cannot set directory locks for the following folders:</source>
-<target>Nem lehet beállítani a könyvtárak lockolását a következő könyvtárakhoz:</target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
@@ -385,27 +531,12 @@
 <pluralform>%x szál</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>%x könyvtár nem olvasható.</target>
-
 <source>%x/sec</source>
 <target>%x/sec</target>
 
 <source>%x items</source>
 <target>%x elem</target>
 
-<source>Show in Explorer</source>
-<target>Mutassa az Intézőben</target>
-
-<source>Open with default application</source>
-<target>Nyissa meg az alapértelmezett alkalmazással</target>
-
-<source>Browse directory</source>
-<target>Tallózza a könyvtárat</target>
-
-<source>Unable to connect to %x.</source>
-<target>Nem képes %x-hez kapcsolódni.</target>
-
 <source>Completed successfully</source>
 <target>Sikeresen végrehajtva</target>
 
@@ -451,9 +582,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>%x állomány attribútumainak írása nem sikerült.</target>
 
-<source>Cannot open file %x.</source>
-<target>%x állomány nem nyitható meg.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x és %y tartalma különböző.</target>
 
@@ -484,29 +612,20 @@
 <source>Source item %x not found</source>
 <target>%x forrás állományt nem találom</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>%x állomány nem mozgatható %y-ba.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>%x szülő könyvtár nem létezik.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>%x nevet már más elem használja.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>%x állomány nem másolható %y-ba.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>%x szimbolikus hivatkozás nem másolható %y-ba.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>%x számára árnyékmásolat-kötetet készítése...</target>
 
 <source>Cannot find folder %x.</source>
 <target>%x könyvtárat nem találom.</target>
 
-<source>Target folder %x already existing.</source>
-<target>%x célkönyvtár már létezik.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>%x célkönyvtár már létezik, de nem volt hozzáférhető a könyvtár-összehasonlítás során.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>A célkönyvtár beviteli mezője nem lehet üres.</target>
@@ -529,17 +648,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Nincs elég szabad lemezterület:</target>
 
-<source>Required:</source>
-<target>Szükséges:</target>
-
 <source>Available:</source>
 <target>Hozzáférhető:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Egyes állományokat több alapkönyvár részeként is szinkronizálni fog.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Az ütközések elkerülése érdekében állítsa be úgy a kizáró szűrőket, hogy minden egyes felülírt állomány csak egy alapkönyvárban szerepeljen.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Az ütközések elkerülése érdekében állítsa be úgy a kizáró szűrőket, hogy minden felülírt állomány csak egy eredeti könyvtárban forduljon elő.</target>
 
 <source>Versioning folder:</source>
 <target>Verzióképző könyvtár:</target>
@@ -565,122 +681,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Nem képes időbélyegzés létrehozására a verzióképzéshez:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Az adatfolyam mérete eltér a várttól
-Várt: %x bájt
-Tényleges: %y bájt
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>%x jogosultságait nem lehet felírni.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>A művelet nem támogatott különböző eszközök között.</target>
-
-<source>Cannot delete file %x.</source>
-<target>%x állomány nem törölhető.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>%x szimbolikus hivatkozás nem törölhető.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>%x könyvtár nem törölhető.</target>
-
-<source>Error Code %x</source>
-<target>Hibakód %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>%x módosításának időpontja nem rögzíthető.</target>
-
-<source>Cannot create directory %x.</source>
-<target>%x könyvtár nem hozható létre.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>%x számára a végső útvonal nem határozható meg.</target>
-
-<source>Operation not supported by device.</source>
-<target>Az eszköz nem támogatja a műveletet.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>%x szimbolikus hivatkozás nem oldható fel.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>%x nem helyezhető Lomtárba.</target>
-
-<source>Authentication completed.</source>
-<target>Hitelesítés befejezve.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Most bezárhatja ezt az oldalt és folytathatja a FreeFileSync-et.</target>
-
-<source>Authentication failed.</source>
-<target>Hitelesítés sikertelen.</target>
-
-<source>Cannot find %x.</source>
-<target>%x nem található.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Engedélyezze a hozzáférést a(z) %x felhasználói azonosítóhoz.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>%x-nek nem határozható meg szabad tárterület.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Nem sikerült leválasztani %x-től.</target>
-
-<source>Unable to access %x.</source>
-<target>%x nem elérhető.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>%x szerverről nem sikerült információt kapni.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>%x könyvtárat nem sikerült monitorozni.</target>
-
-<source>Cannot find device %x.</source>
-<target>%x eszköz nem található.</target>
-
-<source>Cannot open directory %x.</source>
-<target>%x könyvtár nem nyitható meg.</target>
-
-<source>Unsupported item type.</source>
-<target>Nem támogatott elemtípus.</target>
-
-<source>Incorrect command line:</source>
-<target>Hibás parancssor:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>A szerver nem támogatja a(z) %x általi autentikációt.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>A művelet 1 másodperc után időtúllépés miatt leállt.</pluralform>
-<pluralform>A művelet %x másodperc után időtúllépés miatt leállt.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Nem tud 1-nél több kapcsolatra várni egyidejűleg.</pluralform>
-<pluralform>Nem tud több mint %x kapcsolatra várni egyidejűleg.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Aktív kapcsolatok száma: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Hiba a(z) %x számú SFTP csatorna megnyitása során.</target>
-
 <source>Drag && drop</source>
 <target>Húzd && Ejtsd</target>
 
@@ -747,6 +747,9 @@ Tényleges: %y bájt
 <source>Command line:</source>
 <target>Parancssor:</target>
 
+<source>&Hide console window</source>
+<target>&Rejtse a konzol ablakot</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -782,8 +785,8 @@ A parancs végrehajtódik, ha:
 <source>Waiting until directory is available:</source>
 <target>Várakozás, amíg a könyvtár elérhető lesz:</target>
 
-<source>&Restore</source>
-<target>&Visszaállít</target>
+<source>&Configure</source>
+<target>&Konfigurál</target>
 
 <source>&Show error message</source>
 <target>&Mutassa a hibaüzenetet</target>
@@ -818,8 +821,8 @@ A parancs végrehajtódik, ha:
 <source>Scanning...</source>
 <target>Vizsgálat folyamatban...</target>
 
-<source>job name</source>
-<target>feladat neve</target>
+<source>configuration file</source>
+<target>Konfigurációs állomány</target>
 
 <source>System: Sleep</source>
 <target>Rendszer: alvási állapotban</target>
@@ -830,8 +833,8 @@ A parancs végrehajtódik, ha:
 <source>Nothing to synchronize</source>
 <target>Nincs mit szinkronizálni</target>
 
-<source>Executing command %x</source>
-<target>%x parancs végrehajtása</target>
+<source>Executing command:</source>
+<target>Végrehajtott parancs:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>E jelenség megoldásához kapcsoljon át a FreeFileSync fő ablakába.</target>
@@ -1031,6 +1034,12 @@ A parancs végrehajtódik, ha:
 <source>Match case</source>
 <target>Kis-/nagybetű megkülönböztetése</target>
 
+<source>Processed:</source>
+<target>Feldolgozott:</target>
+
+<source>Remaining:</source>
+<target>Hátralevő:</target>
+
 <source>New</source>
 <target>Új</target>
 
@@ -1116,7 +1125,7 @@ A parancs végrehajtódik, ha:
 <target>Teljesítmény növelése:</target>
 
 <source>Parallel file operations:</source>
-<target>Párhuzamos fájl-műveletek:</target>
+<target>Párhuzamos állomány-műveletek:</target>
 
 <source>How to get best performance?</source>
 <target>Hogyan lehet elérni a legjobb teljesítményt?</target>
@@ -1267,14 +1276,17 @@ A parancs végrehajtódik, ha:
 <source>&Don't show this dialog again</source>
 <target>&Ne mutassa ismételten ezt a párbeszédablakot</target>
 
-<source>Items found:</source>
-<target>Talált elemek száma:</target>
+<source>Bytes:</source>
+<target>Bájt:</target>
 
-<source>Time remaining:</source>
-<target>Hátralévő idő:</target>
+<source>Items:</source>
+<target>Tétel:</target>
 
-<source>Time elapsed:</source>
-<target>Eltelt idő:</target>
+<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>Bytes</source>
 <target>Bájt</target>
@@ -1282,12 +1294,6 @@ A parancs végrehajtódik, ha:
 <source>Items</source>
 <target>Elem</target>
 
-<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>When finished:</source>
 <target>Ha befejezte:</target>
 
@@ -1363,6 +1369,12 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is.
 <source>&Delete logs after x days:</source>
 <target>&Törölje a logokat x nap után:</target>
 
+<source>Notification sounds:</source>
+<target>Figyelmeztető hangjelzések:</target>
+
+<source>Synchronization finished:</source>
+<target>Szinkronizálás befejeződött:</target>
+
 <source>Customize context menu:</source>
 <target>Környezeti menü testreszabása:</target>
 
@@ -1513,33 +1525,6 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is.
 <source>&Execute</source>
 <target>Vé&grehajt</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 könyvtárat</pluralform>
-<pluralform>%x könyvtárat</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 állományt</pluralform>
-<pluralform>%x állományt</pluralform>
-</target>
-
-<source>
-<pluralform>Showing %y of 1 row</pluralform>
-<pluralform>Showing %y of %x rows</pluralform>
-</source>
-<target>
-<pluralform>%y sort mutat az 1-ből</pluralform>
-<pluralform>%y sort mutat az %x közül</pluralform>
-</target>
-
 <source>Set direction:</source>
 <target>Állítsa be az irányt:</target>
 
@@ -1567,12 +1552,6 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is.
 <source>&Delete</source>
 <target>&Törölje</target>
 
-<source>Include all</source>
-<target>Csatolja az összest</target>
-
-<source>Exclude all</source>
-<target>Zárja ki az összest</target>
-
 <source>Show icons:</source>
 <target>Mutassa az ikonokat:</target>
 
@@ -1609,6 +1588,21 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is.
 <source>Do&n't save</source>
 <target>&ne mentse</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x nem átnevezhető.</target>
+
+<source>New name:</source>
+<target>Új név:</target>
+
+<source>Rename Configuration</source>
+<target>Konfiguráció Átnevezése</target>
+
+<source>Configuration name must not be empty.</source>
+<target>A konfiguráció neve nem lehet üres.</target>
+
+<source>&Rename...</source>
+<target>Á&tnevezés...</target>
+
 <source>Hide configuration</source>
 <target>Rejtse el a beállítást</target>
 
@@ -1669,6 +1663,33 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is.
 <source>All files are in sync</source>
 <target>Az összes állomány szinkronizált</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 könyvtárat</pluralform>
+<pluralform>%x könyvtárat</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 állományt</pluralform>
+<pluralform>%x állományt</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>%y sort mutat az 1-ből</pluralform>
+<pluralform>%y sort mutat az %x közül</pluralform>
+</target>
+
 <source>Cannot find %x</source>
 <target>Nem található: %x</target>
 
@@ -1720,7 +1741,7 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is.
 <source>Password:</source>
 <target>Jelszó:</target>
 
-<source>Key password:</source>
+<source>Key passphrase:</source>
 <target>Kulcs jelszó:</target>
 
 <source>Please enter a file path.</source>
@@ -1885,6 +1906,9 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>A minimum verziószám kisebb kell legyen a maximális verziószámnál.</target>
 
+<source>&Restore</source>
+<target>&Visszaállít</target>
+
 <source>Files</source>
 <target>Állományok</target>
 
@@ -1951,6 +1975,9 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is.
 <source>The file is locked by another process:</source>
 <target>Az állományt egy másik folyamat zárolta:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>%x könyvtár állomány jogosultságkezelés-támogatását nem sikerült megállapítani.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>%x biztonsági környezete nem olvasható.</target>
 
@@ -2002,12 +2029,12 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is.
 <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 shut down the system.</source>
-<target>Nem képes leállítani a rendszert.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>%x könyvtár vonatkozásában a lomtár ellenőrzése meghiúsult.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Nem képes leállítani a rendszert.</target>
+
 <source>Prepare installation</source>
 <target>Telepítés előkészítése</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/italian.lng b/FreeFileSync/Build/Resources/Languages/italian.lng
index 397a24e4..444a4486 100755
--- a/FreeFileSync/Build/Resources/Languages/italian.lng
+++ b/FreeFileSync/Build/Resources/Languages/italian.lng
@@ -7,6 +7,155 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>Impossibile leggere il file %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Dimensioni impreviste del flusso di dati.
+Previsto: %x byte
+Attuale: %y byte
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Impossibile scrivere il file %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Impossibile scrivere i permessi di %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Operazione non supportata tra diversi dispositivi.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Impossibile eliminare il file %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Impossibile eliminare collegamento %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Impossibile eliminare la directory %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Impossibile spostare il file %x in %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Impossibile copiare collegamento %x per %y.</target>
+
+<source>Error Code %x</source>
+<target>Codice di errore %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>Impossibile leggere la directory %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Impossibile scrivere data e ora di modifica di %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Impossibile leggere gli attributi del file %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Impossibile creare la cartella %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Impossibile determinare il percorso finale per %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Operazione non supportata dal dispositivo.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Impossibile risolvere collegamento %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Impossibile spostare %x nel cestino.</target>
+
+<source>Authentication completed.</source>
+<target>Autenticazione completata.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Puoi chiudere questa pagina ora e continuare con FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Autenticazione fallita.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Impossibile connettersi a %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Impossibile trovare %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>Il nome %x è utilizzato da più di un elemento nella cartella.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Autorizza l'accesso all'account utente %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Impossibile aprire il file %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>Il nome %x è già utilizzato da un altro elemento.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Impossibile determinare lo spazio libero su disco per %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Impossibile disconnettersi da %x.</target>
+
+<source>Unable to access %x.</source>
+<target>Impossibile accedere %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Impossibile ottenere informazioni sul server %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Impossibile monitorare la directory %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Impossibile trovare dispositivo %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Impossibile aprire la cartella %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Tipo di articolo non supportato.</target>
+
+<source>Incorrect command line:</source>
+<target>Linea di comando non corretta:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>Il server non supporta l'autenticazione tramite %x.</target>
+
+<source>Required:</source>
+<target>Richiesto:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Funzionamento dopo 1 secondo.</pluralform>
+<pluralform>Funzionamento dopo %x secondi.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Aspettare per non più di 1 connessione alla volta.</pluralform>
+<pluralform>Aspettare per non più di %x connessioni alla volta.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Connessioni attive: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Impossibile aprire canale SFTP numero %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Entrambi i lati sono cambiati dall'ultima sincronizzazione.</target>
 
@@ -109,9 +258,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>I file di installazione sono danneggiati. Si prega di reinstallare FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Impossibile caricare il file %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Impossibile trovare le seguenti cartelle:</target>
 
@@ -139,6 +285,9 @@
 <pluralform>%x elementi trovati</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Tempo trascorso:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Il file %x ha una data non valida.</target>
 
@@ -157,9 +306,6 @@
 <source>Items differ in attributes only</source>
 <target>Gli oggetti differiscono solo negli attributi</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>Il nome %x è utilizzato da più di un elemento nella cartella.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Risoluzione collegamento %x</target>
 
@@ -220,6 +366,15 @@
 <source>Out of memory.</source>
 <target>Memoria insufficiente.</target>
 
+<source>Show in Explorer</source>
+<target>Mostra in Esplora Risorse</target>
+
+<source>Open with default application</source>
+<target>Apri con applicazione predefinita</target>
+
+<source>Browse directory</source>
+<target>Sfoglia cartelle</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Il file del database %x non è compatibile.</target>
 
@@ -232,12 +387,6 @@
 <source>Database file is corrupted:</source>
 <target>Il file del database è danneggiato:</target>
 
-<source>Cannot write file %x.</source>
-<target>Impossibile scrivere il file %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Impossibile leggere il file %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>I file del database non contengono ancora informazioni sull'ultima sincronizzazione.</target>
 
@@ -256,9 +405,6 @@
 <source>Cannot get process information.</source>
 <target>Impossibile ottenere informazioni sul processo.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Impossibile leggere gli attributi del file %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>In attesa mentre la cartella è bloccata:</target>
 
@@ -385,27 +531,12 @@
 <pluralform>%x thread</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Impossibile leggere la directory %x.</target>
-
 <source>%x/sec</source>
 <target>%x/ sec</target>
 
 <source>%x items</source>
 <target>%x articoli</target>
 
-<source>Show in Explorer</source>
-<target>Mostra in Esplora Risorse</target>
-
-<source>Open with default application</source>
-<target>Apri con applicazione predefinita</target>
-
-<source>Browse directory</source>
-<target>Sfoglia cartelle</target>
-
-<source>Unable to connect to %x.</source>
-<target>Impossibile connettersi a %x.</target>
-
 <source>Completed successfully</source>
 <target>Completato con successo</target>
 
@@ -451,9 +582,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Impossibile scrivere gli attributi del file %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Impossibile aprire il file %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x e %y hanno un contenuto diverso.</target>
 
@@ -484,29 +612,20 @@
 <source>Source item %x not found</source>
 <target>Elemento di origine %x non trovato</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Impossibile spostare il file %x in %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>La cartella principale %x non esiste.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>Il nome %x è già utilizzato da un altro elemento.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Impossibile copiare il file %x in %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Impossibile copiare collegamento %x per %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Creazione di un Volume Shadow Copy per %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Impossibile trovare la cartella %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>La cartella di destinazione %x è già esistente.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target></target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Il campo per la cartella di destinazione non può essere vuoto.</target>
@@ -529,17 +648,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Spazio libero su disco insufficiente in:</target>
 
-<source>Required:</source>
-<target>Richiesto:</target>
-
 <source>Available:</source>
 <target>Disponibile:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Alcuni file saranno sincronizzati come parte di più cartelle base.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Per evitare conflitti, il set up esclude i filtri in modo che ciascun file aggiornato è considerato da una sola cartella base.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target></target>
 
 <source>Versioning folder:</source>
 <target>Cartella versione:</target>
@@ -565,122 +681,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Impossibile creare l'impronta per il controllo delle versioni:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Dimensioni impreviste del flusso di dati.
-Previsto: %x byte
-Attuale: %y byte
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Impossibile scrivere i permessi di %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Operazione non supportata tra diversi dispositivi.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Impossibile eliminare il file %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Impossibile eliminare collegamento %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Impossibile eliminare la directory %x.</target>
-
-<source>Error Code %x</source>
-<target>Codice di errore %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Impossibile scrivere data e ora di modifica di %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Impossibile creare la cartella %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Impossibile determinare il percorso finale per %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Operazione non supportata dal dispositivo.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Impossibile risolvere collegamento %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Impossibile spostare %x nel cestino.</target>
-
-<source>Authentication completed.</source>
-<target>Autenticazione completata.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Puoi chiudere questa pagina ora e continuare con FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Autenticazione fallita.</target>
-
-<source>Cannot find %x.</source>
-<target>Impossibile trovare %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Autorizza l'accesso all'account utente %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Impossibile determinare lo spazio libero su disco per %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Impossibile disconnettersi da %x.</target>
-
-<source>Unable to access %x.</source>
-<target>Impossibile accedere %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Impossibile ottenere informazioni sul server %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Impossibile monitorare la directory %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Impossibile trovare dispositivo %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Impossibile aprire la cartella %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Tipo di articolo non supportato.</target>
-
-<source>Incorrect command line:</source>
-<target>Linea di comando non corretta:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>Il server non supporta l'autenticazione tramite %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Funzionamento dopo 1 secondo.</pluralform>
-<pluralform>Funzionamento dopo %x secondi.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Aspettare per non più di 1 connessione alla volta.</pluralform>
-<pluralform>Aspettare per non più di %x connessioni alla volta.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Connessioni attive: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Impossibile aprire canale SFTP numero %x.</target>
-
 <source>Drag && drop</source>
 <target>Trascina e rilascia</target>
 
@@ -747,6 +747,9 @@ Attuale: %y byte
 <source>Command line:</source>
 <target>Riga di comando:</target>
 
+<source>&Hide console window</source>
+<target></target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -782,8 +785,8 @@ Il comando è attivato se:
 <source>Waiting until directory is available:</source>
 <target>In attesa che la directory sia disponibile:</target>
 
-<source>&Restore</source>
-<target>&Ripristina</target>
+<source>&Configure</source>
+<target></target>
 
 <source>&Show error message</source>
 <target>&Mostra messaggio di errore</target>
@@ -818,8 +821,8 @@ Il comando è attivato se:
 <source>Scanning...</source>
 <target>Scansione...</target>
 
-<source>job name</source>
-<target>nome del lavoro</target>
+<source>configuration file</source>
+<target></target>
 
 <source>System: Sleep</source>
 <target>Sistema: In Sonno</target>
@@ -830,8 +833,8 @@ Il comando è attivato se:
 <source>Nothing to synchronize</source>
 <target>Non c'è nulla da sincronizzare</target>
 
-<source>Executing command %x</source>
-<target>Esecuzione del comando %x</target>
+<source>Executing command:</source>
+<target></target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>È possibile passare alla finestra principale di FreeFileSync per risolvere questo problema.</target>
@@ -1031,6 +1034,12 @@ Il comando è attivato se:
 <source>Match case</source>
 <target>Corrispondenza</target>
 
+<source>Processed:</source>
+<target></target>
+
+<source>Remaining:</source>
+<target></target>
+
 <source>New</source>
 <target>Nuovo</target>
 
@@ -1267,14 +1276,17 @@ Il comando è attivato se:
 <source>&Don't show this dialog again</source>
 <target>&Non mostrare più questo avviso</target>
 
-<source>Items found:</source>
-<target>Oggetti trovati:</target>
+<source>Bytes:</source>
+<target></target>
 
-<source>Time remaining:</source>
-<target>Tempo rimanente:</target>
+<source>Items:</source>
+<target></target>
 
-<source>Time elapsed:</source>
-<target>Tempo trascorso:</target>
+<source>Synchronizing...</source>
+<target>Sincronizzazione...</target>
+
+<source>Minimize to notification area</source>
+<target>Ridurre al minimo l'area di notifica</target>
 
 <source>Bytes</source>
 <target>Byte</target>
@@ -1282,12 +1294,6 @@ Il comando è attivato se:
 <source>Items</source>
 <target>Elementi</target>
 
-<source>Synchronizing...</source>
-<target>Sincronizzazione...</target>
-
-<source>Minimize to notification area</source>
-<target>Ridurre al minimo l'area di notifica</target>
-
 <source>When finished:</source>
 <target>Al termine:</target>
 
@@ -1363,6 +1369,12 @@ Questo garantisce uno stato consistente anche in caso di errore grave.
 <source>&Delete logs after x days:</source>
 <target>&Elimina i log dopo x giorni:</target>
 
+<source>Notification sounds:</source>
+<target></target>
+
+<source>Synchronization finished:</source>
+<target></target>
+
 <source>Customize context menu:</source>
 <target>Personalizzare menu contestuale:</target>
 
@@ -1567,12 +1579,6 @@ Questo garantisce uno stato consistente anche in caso di errore grave.
 <source>&Delete</source>
 <target>&Cancellare</target>
 
-<source>Include all</source>
-<target>Includi tutto</target>
-
-<source>Exclude all</source>
-<target>Escludi tutto</target>
-
 <source>Show icons:</source>
 <target>Mostra icone:</target>
 
@@ -1609,6 +1615,21 @@ Questo garantisce uno stato consistente anche in caso di errore grave.
 <source>Do&n't save</source>
 <target>No&n salvare</target>
 
+<source>%x cannot be renamed.</source>
+<target></target>
+
+<source>New name:</source>
+<target></target>
+
+<source>Rename Configuration</source>
+<target></target>
+
+<source>Configuration name must not be empty.</source>
+<target></target>
+
+<source>&Rename...</source>
+<target></target>
+
 <source>Hide configuration</source>
 <target>Nascondi configurazione</target>
 
@@ -1720,8 +1741,8 @@ Questo garantisce uno stato consistente anche in caso di errore grave.
 <source>Password:</source>
 <target>Password:</target>
 
-<source>Key password:</source>
-<target>Chiave password:</target>
+<source>Key passphrase:</source>
+<target></target>
 
 <source>Please enter a file path.</source>
 <target>Si prega di inserire un percorso di file.</target>
@@ -1885,6 +1906,9 @@ Questo garantisce uno stato consistente anche in caso di errore grave.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Il numero minimo della versione deve essere inferiore al conteggio massimo.</target>
 
+<source>&Restore</source>
+<target>&Ripristina</target>
+
 <source>Files</source>
 <target>File</target>
 
@@ -1951,6 +1975,9 @@ Questo garantisce uno stato consistente anche in caso di errore grave.
 <source>The file is locked by another process:</source>
 <target>Il file è bloccato da un altro processo:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target></target>
+
 <source>Cannot read security context of %x.</source>
 <target>Impossibile leggere il contesto di protezione di %x.</target>
 
@@ -2002,12 +2029,12 @@ Questo garantisce uno stato consistente anche in caso di errore grave.
 <source>Cannot change process I/O priorities.</source>
 <target>Impossibile modificare le priorità I/O del processo.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Impossibile chiudere il sistema.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Controllo cestino non riuscito per la cartella %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Impossibile chiudere il sistema.</target>
+
 <source>Prepare installation</source>
 <target>Preparare l'installazione</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/japanese.lng b/FreeFileSync/Build/Resources/Languages/japanese.lng
index 44a92865..64c078f5 100755
--- a/FreeFileSync/Build/Resources/Languages/japanese.lng
+++ b/FreeFileSync/Build/Resources/Languages/japanese.lng
@@ -7,6 +7,153 @@
 	<plural_definition>0</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>ファイル %x を読み込めません.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+予期しないデータストリームのサイズ.
+予測された値: %x バイト
+実際の値: %y バイト
+</target>
+
+<source>Cannot write file %x.</source>
+<target>ファイル %x に書き込めません.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>%x のﾊﾟｰﾐｯｼｮﾝを書き込めません.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>異なるデバイス間での操作には対応していません.</target>
+
+<source>Cannot delete file %x.</source>
+<target>ファイル %x を削除出来ません.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>シンボリック リンク %x を削除できません.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>ディレクトリ %x を削除できません.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>ファイル %x を %y に移動できません.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>シンボリックリンク %x を %y にコピーできません.</target>
+
+<source>Error Code %x</source>
+<target>エラーコード %x.</target>
+
+<source>Cannot read directory %x.</source>
+<target>ディレクトリ %x を読み取れません.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>%x の更新時刻を書き込めませんでした.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>%x のファイル属性を読み込めません.</target>
+
+<source>Cannot create directory %x.</source>
+<target>ディレクトリ %x を作成できません.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>%x の最終的なパスを決定できません.</target>
+
+<source>Operation not supported by device.</source>
+<target>デバイスで対応していない操作です.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>シンボリックリンク %x を解決できません.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>%x をゴミ箱に移動できません.</target>
+
+<source>Authentication completed.</source>
+<target>認証が完了しました.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>このページを閉じて FreeFileSync. を続行することができます.</target>
+
+<source>Authentication failed.</source>
+<target>認証に失敗しました.</target>
+
+<source>Unable to connect to %x.</source>
+<target>%x に接続できません.</target>
+
+<source>Cannot find %x.</source>
+<target>%x がみつかりません.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>名前 %x は、フォルダ内複数の項目で使用されています.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>アカウント %x へのアクセスを承認してください.</target>
+
+<source>Cannot open file %x.</source>
+<target>ファイル %x を開けません.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>%x という名前は既に別項目で利用されています.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>%x の空きディスク領域を検出できません.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>%x からの接続を切断できません.</target>
+
+<source>Unable to access %x.</source>
+<target>%x にアクセスできません.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>%x サーバからの情報取得に失敗しました.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>ディレクトリ %x を監視できません.</target>
+
+<source>Cannot find device %x.</source>
+<target>デバイス %x がみつかりません.</target>
+
+<source>Cannot open directory %x.</source>
+<target>ディレクトリ %x を開けません.</target>
+
+<source>Unsupported item type.</source>
+<target>対応していない項目形式.</target>
+
+<source>Incorrect command line:</source>
+<target>不正なコマンドライン:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>このサーバは %x による認証に対応していません.</target>
+
+<source>Required:</source>
+<target>必須:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>%x 秒経過で操作をタイムアウト.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>一度に %x 以上の接続を行うことはできません.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>アクティブな接続: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>SFTP チャンネル %x を開けません.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>前回最後の同期処理以降、両側とも変更があります.</target>
 
@@ -109,9 +256,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>インストール ファイルが破損しています、FreeFileSync を再インストールしてください.</target>
 
-<source>Cannot load file %x.</source>
-<target>ファイル %x を読み込めません.</target>
-
 <source>Cannot find the following folders:</source>
 <target>次のフォルダがみつかりません:</target>
 
@@ -138,6 +282,9 @@
 <pluralform>%x 項目を検出</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>経過時間:</target>
+
 <source>File %x has an invalid date.</source>
 <target>ファイル %x の日付は無効なものです.</target>
 
@@ -156,9 +303,6 @@
 <source>Items differ in attributes only</source>
 <target>属性のみ異なる項目</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>名前 %x は、フォルダ内複数の項目で使用されています.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>シンボリックリンク %x を解決中</target>
 
@@ -219,6 +363,15 @@
 <source>Out of memory.</source>
 <target>メモリが足りません.</target>
 
+<source>Show in Explorer</source>
+<target>エクスプローラで表示</target>
+
+<source>Open with default application</source>
+<target>既定アプリケーションで開く</target>
+
+<source>Browse directory</source>
+<target>ディレクトリを参照</target>
+
 <source>Database file %x is incompatible.</source>
 <target>データベース %x とは互換性がありません.</target>
 
@@ -231,12 +384,6 @@
 <source>Database file is corrupted:</source>
 <target>データベースが破損しています:</target>
 
-<source>Cannot write file %x.</source>
-<target>ファイル %x に書き込めません.</target>
-
-<source>Cannot read file %x.</source>
-<target>ファイル %x を読み込めません.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>このデータベース ファイルには前回の同期に関する情報がまだ含まれていません.</target>
 
@@ -255,9 +402,6 @@
 <source>Cannot get process information.</source>
 <target>プロセス情報を取得できません.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>%x のファイル属性を読み込めません.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>ディレクトリのロックを待機中:</target>
 
@@ -382,27 +526,12 @@
 <pluralform>%x スレッド</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>ディレクトリ %x を読み取れません.</target>
-
 <source>%x/sec</source>
 <target>%x/秒</target>
 
 <source>%x items</source>
 <target>%x 項目</target>
 
-<source>Show in Explorer</source>
-<target>エクスプローラで表示</target>
-
-<source>Open with default application</source>
-<target>既定アプリケーションで開く</target>
-
-<source>Browse directory</source>
-<target>ディレクトリを参照</target>
-
-<source>Unable to connect to %x.</source>
-<target>%x に接続できません.</target>
-
 <source>Completed successfully</source>
 <target>正常に完了しました</target>
 
@@ -448,9 +577,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>%x のファイル属性を書き込めません.</target>
 
-<source>Cannot open file %x.</source>
-<target>ファイル %x を開けません.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x と %y の内容は異なります.</target>
 
@@ -481,29 +607,20 @@
 <source>Source item %x not found</source>
 <target>ソース項目 %x が見つかりません</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>ファイル %x を %y に移動できません.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>親フォルダ %x　は存在しません.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>%x という名前は既に別項目で利用されています.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>%x から %y にコピーできません.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>シンボリックリンク %x を %y にコピーできません.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>ボリュームシャドウコピーを作成中 %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>%x フォルダがみつかりません.</target>
 
-<source>Target folder %x already existing.</source>
-<target>対象フォルダ %x は既に存在します.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>対象フォルダ  %x は既に存在しますが、フォルダ比較中は使用できませんでした.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>対象フォルダ入力欄が空白になっています.</target>
@@ -526,17 +643,14 @@
 <source>Not enough free disk space available in:</source>
 <target>利用可能なディスク空き容量が足りません:</target>
 
-<source>Required:</source>
-<target>必須:</target>
-
 <source>Available:</source>
 <target>利用可能:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>いくつかのファイルは複数の基準フォルダの一部として同期されます.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>競合を避けたい場合は、各ファイルがひとつの基準フォルダで更新されるように除外フィルターをセットします.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>競合回避のために、更新された各ファイルがひとつの基本フォルダのみに含まれるように除外設定をします.</target>
 
 <source>Versioning folder:</source>
 <target>バージョン管理フォルダ:</target>
@@ -562,120 +676,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>バージョン管理のタイムスタンプを作成できません:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-予期しないデータストリームのサイズ.
-予測された値: %x バイト
-実際の値: %y バイト
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>%x のﾊﾟｰﾐｯｼｮﾝを書き込めません.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>異なるデバイス間での操作には対応していません.</target>
-
-<source>Cannot delete file %x.</source>
-<target>ファイル %x を削除出来ません.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>シンボリック リンク %x を削除できません.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>ディレクトリ %x を削除できません.</target>
-
-<source>Error Code %x</source>
-<target>エラーコード %x.</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>%x の更新時刻を書き込めませんでした.</target>
-
-<source>Cannot create directory %x.</source>
-<target>ディレクトリ %x を作成できません.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>%x の最終的なパスを決定できません.</target>
-
-<source>Operation not supported by device.</source>
-<target>デバイスで対応していない操作です.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>シンボリックリンク %x を解決できません.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>%x をゴミ箱に移動できません.</target>
-
-<source>Authentication completed.</source>
-<target>認証が完了しました.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>このページを閉じて FreeFileSync. を続行することができます.</target>
-
-<source>Authentication failed.</source>
-<target>認証に失敗しました.</target>
-
-<source>Cannot find %x.</source>
-<target>%x がみつかりません.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>アカウント %x へのアクセスを承認してください.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>%x の空きディスク領域を検出できません.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>%x からの接続を切断できません.</target>
-
-<source>Unable to access %x.</source>
-<target>%x にアクセスできません.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>%x サーバからの情報取得に失敗しました.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>ディレクトリ %x を監視できません.</target>
-
-<source>Cannot find device %x.</source>
-<target>デバイス %x がみつかりません.</target>
-
-<source>Cannot open directory %x.</source>
-<target>ディレクトリ %x を開けません.</target>
-
-<source>Unsupported item type.</source>
-<target>対応していない項目形式.</target>
-
-<source>Incorrect command line:</source>
-<target>不正なコマンドライン:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>このサーバは %x による認証に対応していません.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>%x 秒経過で操作をタイムアウト.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>一度に %x 以上の接続を行うことはできません.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>アクティブな接続: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>SFTP チャンネル %x を開けません.</target>
-
 <source>Drag && drop</source>
 <target>ドラッグ && ドロップ</target>
 
@@ -742,6 +742,9 @@ Actual: %y bytes
 <source>Command line:</source>
 <target>コマンドライン:</target>
 
+<source>&Hide console window</source>
+<target>コンソール画面を隠す(&H)</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -777,8 +780,8 @@ The command is triggered if:
 <source>Waiting until directory is available:</source>
 <target>ディレクトリが利用可能になるまで待機:</target>
 
-<source>&Restore</source>
-<target>修復(&R)</target>
+<source>&Configure</source>
+<target>構成設定(&C)</target>
 
 <source>&Show error message</source>
 <target>エラーメッセージを表示(&S)</target>
@@ -812,8 +815,8 @@ The command is triggered if:
 <source>Scanning...</source>
 <target>スキャン中...</target>
 
-<source>job name</source>
-<target>ジョブ名</target>
+<source>configuration file</source>
+<target>構成設定ファイル</target>
 
 <source>System: Sleep</source>
 <target>システム: スリープ</target>
@@ -824,8 +827,8 @@ The command is triggered if:
 <source>Nothing to synchronize</source>
 <target>同期対象がありません</target>
 
-<source>Executing command %x</source>
-<target>コマンド %x を実行中</target>
+<source>Executing command:</source>
+<target>実行中のコマンド:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>FreeFileSync のメインウィンドウを切り替えることでこの問題を解決.</target>
@@ -1024,6 +1027,12 @@ The command is triggered if:
 <source>Match case</source>
 <target>文字種を区別</target>
 
+<source>Processed:</source>
+<target>処理しています:</target>
+
+<source>Remaining:</source>
+<target>残り:</target>
+
 <source>New</source>
 <target>新規</target>
 
@@ -1260,14 +1269,17 @@ The command is triggered if:
 <source>&Don't show this dialog again</source>
 <target>次回以降から表示しない(&D)</target>
 
-<source>Items found:</source>
-<target>見つかった要素:</target>
+<source>Bytes:</source>
+<target>バイト:</target>
 
-<source>Time remaining:</source>
-<target>残り時間:</target>
+<source>Items:</source>
+<target>項目:</target>
 
-<source>Time elapsed:</source>
-<target>経過時間:</target>
+<source>Synchronizing...</source>
+<target>同期処理中...</target>
+
+<source>Minimize to notification area</source>
+<target>通知領域に最小化</target>
 
 <source>Bytes</source>
 <target>バイト</target>
@@ -1275,12 +1287,6 @@ The command is triggered if:
 <source>Items</source>
 <target>項目</target>
 
-<source>Synchronizing...</source>
-<target>同期処理中...</target>
-
-<source>Minimize to notification area</source>
-<target>通知領域に最小化</target>
-
 <source>When finished:</source>
 <target>完了後:</target>
 
@@ -1356,6 +1362,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete logs after x days:</source>
 <target>x 日経過後にログを削除(&D):</target>
 
+<source>Notification sounds:</source>
+<target>通知音:</target>
+
+<source>Synchronization finished:</source>
+<target>同期処理の完了:</target>
+
 <source>Customize context menu:</source>
 <target>コンテキストメニューのカスタマイズ:</target>
 
@@ -1556,12 +1568,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete</source>
 <target>削除(&D)</target>
 
-<source>Include all</source>
-<target>すべて含める</target>
-
-<source>Exclude all</source>
-<target>すべて除外</target>
-
 <source>Show icons:</source>
 <target>アイコン表示:</target>
 
@@ -1598,6 +1604,21 @@ This guarantees a consistent state even in case of a serious error.
 <source>Do&n't save</source>
 <target>保存しない(&N)</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x の名前は変更できません.</target>
+
+<source>New name:</source>
+<target>新たな名前:</target>
+
+<source>Rename Configuration</source>
+<target>構成設定のリネーム</target>
+
+<source>Configuration name must not be empty.</source>
+<target>構成設定名に空白は使用できません.</target>
+
+<source>&Rename...</source>
+<target>リネーム(&R)...</target>
+
 <source>Hide configuration</source>
 <target>構成を隠す</target>
 
@@ -1709,8 +1730,8 @@ This guarantees a consistent state even in case of a serious error.
 <source>Password:</source>
 <target>パスワード:</target>
 
-<source>Key password:</source>
-<target>キーパスワード:</target>
+<source>Key passphrase:</source>
+<target>キーパスフレーズ:</target>
 
 <source>Please enter a file path.</source>
 <target>ファイルパスを入力.</target>
@@ -1871,6 +1892,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>最小バージョン数は最大値より小さくする必要があります.</target>
 
+<source>&Restore</source>
+<target>修復(&R)</target>
+
 <source>Files</source>
 <target>ファイル</target>
 
@@ -1937,6 +1961,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>The file is locked by another process:</source>
 <target>次のファイルは別のプロセスで使用中です:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>フォルダ %x のファイルアクセス許可の設定に失敗しました.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>%x のｾｷｭﾘﾃｨｺﾝﾃｷｽﾄを読み込めません.</target>
 
@@ -1986,12 +2013,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>Cannot change process I/O priorities.</source>
 <target>プロセスの I/O 優先度を変更できません.</target>
 
-<source>Unable to shut down the system.</source>
-<target>システムをシャットダウンできません.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>フォルダ %x のゴミ箱のチェックに失敗.</target>
 
+<source>Unable to shut down the system.</source>
+<target>システムをシャットダウンできません.</target>
+
 <source>Prepare installation</source>
 <target>インストールの準備</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/korean.lng b/FreeFileSync/Build/Resources/Languages/korean.lng
index d147b426..f8efe8d4 100755
--- a/FreeFileSync/Build/Resources/Languages/korean.lng
+++ b/FreeFileSync/Build/Resources/Languages/korean.lng
@@ -7,6 +7,153 @@
 	<plural_definition>0</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>파일 %x을(를) 읽을 수 없습니다.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+예상치 못한 데이터 스트림 크기
+예상 크기: %x 바이트
+실제 크기: %y 바이트
+</target>
+
+<source>Cannot write file %x.</source>
+<target>파일 %x을(를) 쓸 수 없습니다.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>%x의 권한을 쓸 수 없습니다.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>다른 장치 간에는 지원되지 않는 작업입니다.</target>
+
+<source>Cannot delete file %x.</source>
+<target>파일 %x을(를) 삭제할 수 없습니다.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>심볼릭 링크 %x을(를) 삭제할 수 없습니다.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>디렉터리 %x을(를) 삭제할 수 없습니다.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>파일 %x을(를) %y(으)로 이동할 수 없습니다.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>심볼릭 링크 %x을(를) %y(으)로 복사할 수 없습니다.</target>
+
+<source>Error Code %x</source>
+<target>오류 코드 %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>디렉터리 %x을(를) 읽을 수 없습니다.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>%x의 수정 시간을 쓸 수 없습니다.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>%x의 파일 속성을 읽을 수 없습니다.</target>
+
+<source>Cannot create directory %x.</source>
+<target>디렉터리 %x을(를) 생성할 수 없습니다.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>%x에 대한 최종 경로를 결정할 수 없습니다.</target>
+
+<source>Operation not supported by device.</source>
+<target>장치에서는 지원되지 않는 작업입니다.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>심볼릭 링크 %x을(를) 해결할 수 없습니다.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>휴지통으로 %x을(를) 이동할 수 없습니다.</target>
+
+<source>Authentication completed.</source>
+<target>인증 완료.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>지금 이 페이지를 닫고 FreeFileSync를 계속 진행할 수 있습니다.</target>
+
+<source>Authentication failed.</source>
+<target>인증 실패.</target>
+
+<source>Unable to connect to %x.</source>
+<target>%x에 연결할 수 없습니다.</target>
+
+<source>Cannot find %x.</source>
+<target>%x을(를) 찾을 수 없습니다.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>이름 %x이(가) 같은 폴더 내 한 개 이상의 항목에서 사용되고 있습니다.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>사용자 계정 %x에 대한 액세스 권한을 부여하십시오.</target>
+
+<source>Cannot open file %x.</source>
+<target>파일 %x을(를) 열 수 없습니다.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>이름 %x은(는) 이미 다른 항목에서 사용되고 있습니다.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>%x에 대한 사용 가능한 디스크 공간을 확인할 수 없습니다.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>%x에서 연결 해제가 안 됩니다.</target>
+
+<source>Unable to access %x.</source>
+<target>%x에 접근할 수 없습니다.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>서버 %x에 대한 정보를 가져 오는데 실패했습니다.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>디렉터리 %x을(를) 모니터링 할 수 없습니다.</target>
+
+<source>Cannot find device %x.</source>
+<target>장치 %x을(를) 찾을 수 없습니다.</target>
+
+<source>Cannot open directory %x.</source>
+<target>디렉터리 %x을(를) 열 수 없습니다.</target>
+
+<source>Unsupported item type.</source>
+<target>지원되지 않는 항목 형식.</target>
+
+<source>Incorrect command line:</source>
+<target>부정확한 명령줄:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>서버가 %x을(를) 통한 인증을 지원하지 않습니다.</target>
+
+<source>Required:</source>
+<target>필요 공간(크기):</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>%x초 이후 작업시간 초과됨.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>한꺼번에 %x개 이상의 연결에 대기할 수 없습니다.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>활성화된 연결: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>SFTP 채널번호 %x을(를) 열지 못 했습니다.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>마지막 동기화 작업 이후, 양측 모두 변경 되었습니다.</target>
 
@@ -109,9 +256,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>설치 파일이 손상되었습니다. FreeFileSync를 다시 설치하십시오.</target>
 
-<source>Cannot load file %x.</source>
-<target>파일 %x을(를) 로드할 수 없습니다.</target>
-
 <source>Cannot find the following folders:</source>
 <target>다음 폴더를 찾을 수 없습니다:</target>
 
@@ -138,6 +282,9 @@
 <pluralform>%x개 항목 발견</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>경과 시간:</target>
+
 <source>File %x has an invalid date.</source>
 <target>파일 %x의 날짜가 유효하지 않습니다.</target>
 
@@ -156,9 +303,6 @@
 <source>Items differ in attributes only</source>
 <target>항목들이 속성에서만 차이가 있습니다.</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>이름 %x이(가) 같은 폴더 내 한 개 이상의 항목에서 사용되고 있습니다.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>심볼릭 링크 %x 해결</target>
 
@@ -219,6 +363,15 @@
 <source>Out of memory.</source>
 <target>메모리 부족.</target>
 
+<source>Show in Explorer</source>
+<target>탐색기에 표시</target>
+
+<source>Open with default application</source>
+<target>기본값 응용 프로그램으로 열기</target>
+
+<source>Browse directory</source>
+<target>디렉터리 찾아보기</target>
+
 <source>Database file %x is incompatible.</source>
 <target>데이터베이스 파일 %x 은(는) 호환 불가능합니다.</target>
 
@@ -231,12 +384,6 @@
 <source>Database file is corrupted:</source>
 <target>데이터베이스 파일 손상:</target>
 
-<source>Cannot write file %x.</source>
-<target>파일 %x을(를) 쓸 수 없습니다.</target>
-
-<source>Cannot read file %x.</source>
-<target>파일 %x을(를) 읽을 수 없습니다.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>데이터베이스 파일에 아직 마지막 동기화에 대한 정보가 없습니다.</target>
 
@@ -255,9 +402,6 @@
 <source>Cannot get process information.</source>
 <target>프로세스 정보를 얻을 수 없습니다.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>%x의 파일 속성을 읽을 수 없습니다.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>디렉터리 잠금 대기 중:</target>
 
@@ -329,6 +473,27 @@
 <source>Update attributes on right</source>
 <target>우측 속성 업데이트</target>
 
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>분석 오류 - 파일: %x; 행: %y; 열: %z.</target>
+
+<source>Services</source>
+<target>서비스</target>
+
+<source>Show All</source>
+<target>모두 보이기</target>
+
+<source>Hide Others</source>
+<target>기타 다른 항목 숨기기</target>
+
+<source>Hide %x</source>
+<target>%x 숨기기</target>
+
+<source>Quit %x</source>
+<target>%x 끝내기</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>다음 폴더의 디렉터리 잠금을 설정할 수 없습니다:</target>
+
 <source>Errors:</source>
 <target>오류:</target>
 
@@ -353,27 +518,6 @@
 <source>Cleaning up log files:</source>
 <target>로그 파일 정리 중:</target>
 
-<source>Error parsing file %x, row %y, column %z.</source>
-<target>분석 오류 - 파일: %x; 행: %y; 열: %z.</target>
-
-<source>Services</source>
-<target>서비스</target>
-
-<source>Show All</source>
-<target>모두 보이기</target>
-
-<source>Hide Others</source>
-<target>기타 다른 항목 숨기기</target>
-
-<source>Hide %x</source>
-<target>%x 숨기기</target>
-
-<source>Quit %x</source>
-<target>%x 끝내기</target>
-
-<source>Cannot set directory locks for the following folders:</source>
-<target>다음 폴더의 디렉터리 잠금을 설정할 수 없습니다:</target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
@@ -382,27 +526,12 @@
 <pluralform>%x 스레드</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>디렉터리 %x을(를) 읽을 수 없습니다.</target>
-
 <source>%x/sec</source>
 <target>%x/초</target>
 
 <source>%x items</source>
 <target>%x 항목</target>
 
-<source>Show in Explorer</source>
-<target>탐색기에 표시</target>
-
-<source>Open with default application</source>
-<target>기본값 응용 프로그램으로 열기</target>
-
-<source>Browse directory</source>
-<target>디렉터리 찾아보기</target>
-
-<source>Unable to connect to %x.</source>
-<target>%x에 연결할 수 없습니다.</target>
-
 <source>Completed successfully</source>
 <target>성공적으로 완료됨</target>
 
@@ -448,9 +577,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>%x의 파일 속성을 쓸 수 없습니다.</target>
 
-<source>Cannot open file %x.</source>
-<target>파일 %x을(를) 열 수 없습니다.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x와(과) %y의 콘텐츠가 다릅니다.</target>
 
@@ -481,29 +607,20 @@
 <source>Source item %x not found</source>
 <target>원본 항목 %x을(를) 찾을 수 없음</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>파일 %x을(를) %y(으)로 이동할 수 없습니다.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>상위 폴더 %x이(가) 존재하지 않습니다.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>이름 %x은(는) 이미 다른 항목에서 사용되고 있습니다.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>파일 %x을(를) %y(으)로 복사할 수 없습니다.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>심볼릭 링크 %x을(를) %y(으)로 복사할 수 없습니다.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>%x을(를) 위한 Volume Shadow Copy 생성 중...</target>
 
 <source>Cannot find folder %x.</source>
 <target>%x 폴더를 찾을 수 없습니다.</target>
 
-<source>Target folder %x already existing.</source>
-<target>대상 폴더 %x이(가) 이미 존재함.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>대상 폴더 %x이(가) 이미 존재하지만, 폴더 비교시 사용할 수 없었습니다.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>대상 폴더 입력 필드가 비어 있어서는 안 됩니다.</target>
@@ -526,17 +643,14 @@
 <source>Not enough free disk space available in:</source>
 <target>사용 가능한 디스크 여유 공간이 부족합니다:</target>
 
-<source>Required:</source>
-<target>필요 공간(크기):</target>
-
 <source>Available:</source>
 <target>여유 공간(크기):</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>일부 파일들은 여러 기본 폴더의 일부로써 동기화됩니다.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>충돌 방지를 위해 제외 필터를 설정하여 업데이트 된 각 파일이 하나의 기본 폴더만으로 간주되도록 하십시오.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>충돌을 피하려면 업데이트 된 각 파일이 하나의 기본 폴더에만 포함되도록 제외 필터를 설정하시기 바랍니다.</target>
 
 <source>Versioning folder:</source>
 <target>버전 관리 폴더:</target>
@@ -562,120 +676,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>버전 관리를 위한 타임 스탬프 생성 불가:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-예상치 못한 데이터 스트림 크기
-예상 크기: %x 바이트
-실제 크기: %y 바이트
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>%x의 권한을 쓸 수 없습니다.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>다른 장치 간에는 지원되지 않는 작업입니다.</target>
-
-<source>Cannot delete file %x.</source>
-<target>파일 %x을(를) 삭제할 수 없습니다.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>심볼릭 링크 %x을(를) 삭제할 수 없습니다.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>디렉터리 %x을(를) 삭제할 수 없습니다.</target>
-
-<source>Error Code %x</source>
-<target>오류 코드 %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>%x의 수정 시간을 쓸 수 없습니다.</target>
-
-<source>Cannot create directory %x.</source>
-<target>디렉터리 %x을(를) 생성할 수 없습니다.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>%x에 대한 최종 경로를 결정할 수 없습니다.</target>
-
-<source>Operation not supported by device.</source>
-<target>장치에서는 지원되지 않는 작업입니다.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>심볼릭 링크 %x을(를) 해결할 수 없습니다.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>휴지통으로 %x을(를) 이동할 수 없습니다.</target>
-
-<source>Authentication completed.</source>
-<target>인증 완료.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>지금 이 페이지를 닫고 FreeFileSync를 계속 진행할 수 있습니다.</target>
-
-<source>Authentication failed.</source>
-<target>인증 실패.</target>
-
-<source>Cannot find %x.</source>
-<target>%x을(를) 찾을 수 없습니다.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>사용자 계정 %x에 대한 액세스 권한을 부여하십시오.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>%x에 대한 사용 가능한 디스크 공간을 확인할 수 없습니다.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>%x에서 연결 해제가 안 됩니다.</target>
-
-<source>Unable to access %x.</source>
-<target>%x에 접근할 수 없습니다.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>서버 %x에 대한 정보를 가져 오는데 실패했습니다.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>디렉터리 %x을(를) 모니터링 할 수 없습니다.</target>
-
-<source>Cannot find device %x.</source>
-<target>장치 %x을(를) 찾을 수 없습니다.</target>
-
-<source>Cannot open directory %x.</source>
-<target>디렉터리 %x을(를) 열 수 없습니다.</target>
-
-<source>Unsupported item type.</source>
-<target>지원되지 않는 항목 형식.</target>
-
-<source>Incorrect command line:</source>
-<target>부정확한 명령줄:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>서버가 %x을(를) 통한 인증을 지원하지 않습니다.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>%x초 이후 작업시간 초과됨.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>한꺼번에 %x개 이상의 연결에 대기할 수 없습니다.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>활성화된 연결: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>SFTP 채널번호 %x을(를) 열지 못 했습니다.</target>
-
 <source>Drag && drop</source>
 <target>끌어서 놓기(&&) [드래그-앤-드랍]</target>
 
@@ -742,6 +742,9 @@ Actual: %y bytes
 <source>Command line:</source>
 <target>명령줄(커맨드라인):</target>
 
+<source>&Hide console window</source>
+<target>콘솔 창 숨기기(&H)</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -777,8 +780,8 @@ The command is triggered if:
 <source>Waiting until directory is available:</source>
 <target>디렉토리를 사용할 수 있을 때까지 대기 중:</target>
 
-<source>&Restore</source>
-<target>복원(&R)</target>
+<source>&Configure</source>
+<target>구성(&C)</target>
 
 <source>&Show error message</source>
 <target>오류 메세지 표시(&S)</target>
@@ -812,8 +815,8 @@ The command is triggered if:
 <source>Scanning...</source>
 <target>스캔 중...</target>
 
-<source>job name</source>
-<target>작업 이름</target>
+<source>configuration file</source>
+<target>구성 파일</target>
 
 <source>System: Sleep</source>
 <target>시스템: 절전</target>
@@ -824,8 +827,8 @@ The command is triggered if:
 <source>Nothing to synchronize</source>
 <target>동기화 할 항목이 없습니다</target>
 
-<source>Executing command %x</source>
-<target>%x 명령 실행 중</target>
+<source>Executing command:</source>
+<target>명령 실행 중:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>이 문제는 FreeFileSync 기본 창으로 전환해서 해결 가능합니다.</target>
@@ -1024,6 +1027,12 @@ The command is triggered if:
 <source>Match case</source>
 <target>대문자/소문자 구분</target>
 
+<source>Processed:</source>
+<target>처리됨:</target>
+
+<source>Remaining:</source>
+<target>남음:</target>
+
 <source>New</source>
 <target>새로 만들기</target>
 
@@ -1260,14 +1269,17 @@ The command is triggered if:
 <source>&Don't show this dialog again</source>
 <target>이 대화 상자를 다시 표시 안 함(&D)</target>
 
-<source>Items found:</source>
-<target>발견된 항목:</target>
+<source>Bytes:</source>
+<target>바이트:</target>
 
-<source>Time remaining:</source>
-<target>남은 시간:</target>
+<source>Items:</source>
+<target>항목:</target>
 
-<source>Time elapsed:</source>
-<target>경과 시간:</target>
+<source>Synchronizing...</source>
+<target>동기화 작업 중...</target>
+
+<source>Minimize to notification area</source>
+<target>알림 영역으로 최소화</target>
 
 <source>Bytes</source>
 <target>바이트</target>
@@ -1275,12 +1287,6 @@ The command is triggered if:
 <source>Items</source>
 <target>항목</target>
 
-<source>Synchronizing...</source>
-<target>동기화 작업 중...</target>
-
-<source>Minimize to notification area</source>
-<target>알림 영역으로 최소화</target>
-
 <source>When finished:</source>
 <target>완료 시:</target>
 
@@ -1356,6 +1362,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete logs after x days:</source>
 <target>x일 후에 로그 삭제(&D):</target>
 
+<source>Notification sounds:</source>
+<target>알림 소리:</target>
+
+<source>Synchronization finished:</source>
+<target>동기화 완료:</target>
+
 <source>Customize context menu:</source>
 <target>컨텍스트 메뉴 커스터마이즈 (사용자 정의):</target>
 
@@ -1505,30 +1517,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Execute</source>
 <target>실행(&E)</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x개 디렉터리</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x개 파일</pluralform>
-</target>
-
-<source>
-<pluralform>Showing %y of 1 row</pluralform>
-<pluralform>Showing %y of %x rows</pluralform>
-</source>
-<target>
-<pluralform>%x 행의 %y 표시</pluralform>
-</target>
-
 <source>Set direction:</source>
 <target>방향 설정:</target>
 
@@ -1556,12 +1544,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete</source>
 <target>삭제(&D)</target>
 
-<source>Include all</source>
-<target>모두 포함</target>
-
-<source>Exclude all</source>
-<target>모두 제외</target>
-
 <source>Show icons:</source>
 <target>아이콘 표시:</target>
 
@@ -1598,6 +1580,21 @@ This guarantees a consistent state even in case of a serious error.
 <source>Do&n't save</source>
 <target>저장 안 함(&n)</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x의 이름을 바꿀 수 없습니다.</target>
+
+<source>New name:</source>
+<target>새 이름:</target>
+
+<source>Rename Configuration</source>
+<target>구성 이름 바꾸기</target>
+
+<source>Configuration name must not be empty.</source>
+<target>구성 이름은 비워 둘 수 없습니다.</target>
+
+<source>&Rename...</source>
+<target>이름 바꾸기(&R)...</target>
+
 <source>Hide configuration</source>
 <target>구성 숨기기</target>
 
@@ -1658,6 +1655,30 @@ This guarantees a consistent state even in case of a serious error.
 <source>All files are in sync</source>
 <target>모든 파일이 동기화 되었음.</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x개 디렉터리</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x개 파일</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>%x 행의 %y 표시</pluralform>
+</target>
+
 <source>Cannot find %x</source>
 <target>%x을(를) 찾을 수 없습니다.</target>
 
@@ -1709,8 +1730,8 @@ This guarantees a consistent state even in case of a serious error.
 <source>Password:</source>
 <target>비밀번호:</target>
 
-<source>Key password:</source>
-<target>키 비밀번호:</target>
+<source>Key passphrase:</source>
+<target>키 암호:</target>
 
 <source>Please enter a file path.</source>
 <target>파일 경로를 입력하세요.</target>
@@ -1871,6 +1892,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>최소 버전 카운트는 최대 카운트보다 더 작아야 합니다.</target>
 
+<source>&Restore</source>
+<target>복원(&R)</target>
+
 <source>Files</source>
 <target>파일</target>
 
@@ -1937,6 +1961,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>The file is locked by another process:</source>
 <target>파일이 다른 프로세스에 의해 잠겨 있습니다:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>%x 폴더에 대한 파일 권한 지원 정의에 실패하였습니다.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>%x의 보안 컨텍스트를 읽을 수 없습니다.</target>
 
@@ -1986,12 +2013,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>Cannot change process I/O priorities.</source>
 <target>프로세스 I/O 우선순위 변경을 할 수 없습니다.</target>
 
-<source>Unable to shut down the system.</source>
-<target>시스템을 종료할 수 없습니다.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>폴더 %x에 관한 휴지통 실패 확인 중.</target>
 
+<source>Unable to shut down the system.</source>
+<target>시스템을 종료할 수 없습니다.</target>
+
 <source>Prepare installation</source>
 <target>설치 준비</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/lithuanian.lng b/FreeFileSync/Build/Resources/Languages/lithuanian.lng
index dc48f448..c2e84a42 100755
--- a/FreeFileSync/Build/Resources/Languages/lithuanian.lng
+++ b/FreeFileSync/Build/Resources/Languages/lithuanian.lng
@@ -7,6 +7,157 @@
 	<plural_definition>n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>Nepavyksta nuskaityti failo %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Nenumatytas duomenų srautas.
+Numatytas: %x baitai
+Esamas: %y baitai
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Nepavyksta įrašyti failo %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Nepavyksta įrašyti leidimų %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Veiksmas yra nesuderinamas tarp atskitų įrenginių.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Nepavyksta ištrinti failo %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Negalima ištrinti virtualios nuorodos %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Nepavyksta ištrinti katalogo %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Nepavyksta perkelti failo %x į %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Nepavyko nukopijuoti simbolinės nuorodos %x į %y.</target>
+
+<source>Error Code %x</source>
+<target>Klaidos kodas %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>Negalima nuskaityti katalogo %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Nepavyksta šrašyti pakeitimo datos %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Nepavyko perskaityti failo %x atributų.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Nepavyksta sukurti katalogo %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Galutinio %x kelio rasti nepavyko.</target>
+
+<source>Operation not supported by device.</source>
+<target>Šis įrenginys nepalaiko šio veiksmo.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Nepavyko rasti simbolinės nuorodos %x reikšmės.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>%x į šiukšliadėžę perkelti nepavyko.</target>
+
+<source>Authentication completed.</source>
+<target>Autentifikavimas baigtas.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Jūs dabar galite uždaryti šį langą ir testi FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Nepavyko autentifikuoti.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Nepavyko prisijungti prie %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Negalima surasti %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>Šis pavadinimas %x yra naudojamas daugiau nei vieną kartą.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Prašome suteikti prieigą šiam vartotojui %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>%x failo nepavyko atidaryti.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>Šis %x vardas jau yra naudoamas.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Negalima nustatyti laisvos disko dalies %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Nepavyko atsijungti nuo %x.</target>
+
+<source>Unable to access %x.</source>
+<target>Nepavyko prisijungti %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Nepavyko gauti informaciją apie serverį %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Nepavyko stebėti katalogo %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Negalima surasti įrenginio %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Nepavyksta atversti direktorijos %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Nepalaikomas elemento tipas.</target>
+
+<source>Incorrect command line:</source>
+<target>Netaisyklinga Komandinė eilutė:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>Serveris nepalaiko %x autentifikavimo.</target>
+
+<source>Required:</source>
+<target>Reikia:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Operacijai skirtas laikas baigsis po %x sekundės.</pluralform>
+<pluralform>Operacijai skirtas laikas baigsis po %x sekundės.</pluralform>
+<pluralform>Operacijai skirtas laikas baigsis po %x sekundžių.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Vienu metu negalima laukti daugiau nei %x prisijungimas.</pluralform>
+<pluralform>Vienu metu negalima laukti daugiau nei %x prisijungimai.</pluralform>
+<pluralform>Vienu metu negalima laukti daugiau nei %x prisijungimų.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Aktyvūs susijungimai: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Nepavyko atidaryti SFTP kanalo %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Abi pusės buvo pakeistos nuo paskutinio suvienodinimo.</target>
 
@@ -109,9 +260,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Įdiegimo failai yra pažeisti. Prašome įdiegti iš naujo FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Nepavyksta įkelti failo %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Nepavyksta rasti šių aplankų:</target>
 
@@ -140,6 +288,9 @@
 <pluralform>%x elementų surasta</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Praėjęs laikas:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Failas %x turi netinkamą datą.</target>
 
@@ -158,9 +309,6 @@
 <source>Items differ in attributes only</source>
 <target>Elementai skiriasi tik atributais</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>Šis pavadinimas %x yra naudojamas daugiau nei vieną kartą.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Ieškoma simbolinės nuorodos %x</target>
 
@@ -221,6 +369,15 @@
 <source>Out of memory.</source>
 <target>Trūksta atminties.</target>
 
+<source>Show in Explorer</source>
+<target>Rodyti naršyklėje</target>
+
+<source>Open with default application</source>
+<target>Atversti su numatyta programa</target>
+
+<source>Browse directory</source>
+<target>Naršyti katalogą</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Duomenų bazė %x yra netinkama.</target>
 
@@ -233,12 +390,6 @@
 <source>Database file is corrupted:</source>
 <target>Duomenų bazės failas yra sugadintas:</target>
 
-<source>Cannot write file %x.</source>
-<target>Nepavyksta įrašyti failo %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Nepavyksta nuskaityti failo %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Duomenų bazės failas dar neturi informacijos apie paskutinį suvienodinimą.</target>
 
@@ -257,9 +408,6 @@
 <source>Cannot get process information.</source>
 <target>Nepavyksta gauti eigos informacijos.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Nepavyko perskaityti failo %x atributų.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Laukiama kol katalogas yra užrakintas:</target>
 
@@ -333,6 +481,27 @@
 <source>Update attributes on right</source>
 <target>Atnaujinti atributus dešinėje</target>
 
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Klaida trinant failą %x, eilė %y, stulpelis %z.</target>
+
+<source>Services</source>
+<target>Paslaugos</target>
+
+<source>Show All</source>
+<target>Rodyti Visus</target>
+
+<source>Hide Others</source>
+<target>Slėpti Kitus</target>
+
+<source>Hide %x</source>
+<target>Slėpti %x</target>
+
+<source>Quit %x</source>
+<target>Išeiti %x</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>Negalima užrakinti šiuos aplankus kataloge:</target>
+
 <source>Errors:</source>
 <target>Klaidos:</target>
 
@@ -357,27 +526,6 @@
 <source>Cleaning up log files:</source>
 <target>Žurnalinių failų valymas:</target>
 
-<source>Error parsing file %x, row %y, column %z.</source>
-<target>Klaida trinant failą %x, eilė %y, stulpelis %z.</target>
-
-<source>Services</source>
-<target>Paslaugos</target>
-
-<source>Show All</source>
-<target>Rodyti Visus</target>
-
-<source>Hide Others</source>
-<target>Slėpti Kitus</target>
-
-<source>Hide %x</source>
-<target>Slėpti %x</target>
-
-<source>Quit %x</source>
-<target>Išeiti %x</target>
-
-<source>Cannot set directory locks for the following folders:</source>
-<target>Negalima užrakinti šiuos aplankus kataloge:</target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
@@ -388,27 +536,12 @@
 <pluralform>%x srautų</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Negalima nuskaityti katalogo %x.</target>
-
 <source>%x/sec</source>
 <target>%x/sek</target>
 
 <source>%x items</source>
 <target>%x elementų</target>
 
-<source>Show in Explorer</source>
-<target>Rodyti naršyklėje</target>
-
-<source>Open with default application</source>
-<target>Atversti su numatyta programa</target>
-
-<source>Browse directory</source>
-<target>Naršyti katalogą</target>
-
-<source>Unable to connect to %x.</source>
-<target>Nepavyko prisijungti prie %x.</target>
-
 <source>Completed successfully</source>
 <target>Sėkmingai užbaigtas</target>
 
@@ -454,9 +587,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Nepavyksta įrašyti atributų failui %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>%x failo nepavyko atidaryti.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x ir %y turi skirtingą turinį.</target>
 
@@ -487,29 +617,20 @@
 <source>Source item %x not found</source>
 <target>Šaltinio elementas %x nerastas:</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Nepavyksta perkelti failo %x į %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Pirminis aplankas %x neegzistuoa.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>Šis %x vardas jau yra naudoamas.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Nepavyksta nukopijuoti failų %x į %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Nepavyko nukopijuoti simbolinės nuorodos %x į %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>%x kuriamas Duomenų Šešėlinė Kopija...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Negalima rasti aplanko %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Tikslo aplankas %x jau yra.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Jau egzistoja tikslinis aplankas %x, nors neegzistavo palyginimo metu.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Tikslo aplanko įvesties laukas negali būti tuščias.</target>
@@ -532,17 +653,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Nepakanka laisvos disko vietos:</target>
 
-<source>Required:</source>
-<target>Reikia:</target>
-
 <source>Available:</source>
 <target>Pasiekiama:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Kai kurie failai bus suvienodinti, keliuse pagrindiniuose aplankuose.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Norint išvengti konflikto, reiktų sukurti išskyrimo filtrus, kad kiekvienas atnaujintas failas, būtų priskiriamas tik vienam pagrindiniam aplankui.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Norint išvengti konfliktų, nustatykite išskyrimo filtrus, taip, kad kiekvienas atnaujintas failas būtų tik viename pagrindiniame aplanke.</target>
 
 <source>Versioning folder:</source>
 <target>Versijų valdymo aplankas:</target>
@@ -568,124 +686,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Nepavyko sukurti versijos laiko žymą:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Nenumatytas duomenų srautas.
-Numatytas: %x baitai
-Esamas: %y baitai
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Nepavyksta įrašyti leidimų %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Veiksmas yra nesuderinamas tarp atskitų įrenginių.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Nepavyksta ištrinti failo %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Negalima ištrinti virtualios nuorodos %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Nepavyksta ištrinti katalogo %x.</target>
-
-<source>Error Code %x</source>
-<target>Klaidos kodas %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Nepavyksta šrašyti pakeitimo datos %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Nepavyksta sukurti katalogo %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Galutinio %x kelio rasti nepavyko.</target>
-
-<source>Operation not supported by device.</source>
-<target>Šis įrenginys nepalaiko šio veiksmo.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Nepavyko rasti simbolinės nuorodos %x reikšmės.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>%x į šiukšliadėžę perkelti nepavyko.</target>
-
-<source>Authentication completed.</source>
-<target>Autentifikavimas baigtas.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Jūs dabar galite uždaryti šį langą ir testi FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Nepavyko autentifikuoti.</target>
-
-<source>Cannot find %x.</source>
-<target>Negalima surasti %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Prašome suteikti prieigą šiam vartotojui %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Negalima nustatyti laisvos disko dalies %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Nepavyko atsijungti nuo %x.</target>
-
-<source>Unable to access %x.</source>
-<target>Nepavyko prisijungti %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Nepavyko gauti informaciją apie serverį %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Nepavyko stebėti katalogo %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Negalima surasti įrenginio %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Nepavyksta atversti direktorijos %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Nepalaikomas elemento tipas.</target>
-
-<source>Incorrect command line:</source>
-<target>Netaisyklinga Komandinė eilutė:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>Serveris nepalaiko %x autentifikavimo.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Operacijai skirtas laikas baigsis po %x sekundės.</pluralform>
-<pluralform>Operacijai skirtas laikas baigsis po %x sekundės.</pluralform>
-<pluralform>Operacijai skirtas laikas baigsis po %x sekundžių.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Vienu metu negalima laukti daugiau nei %x prisijungimas.</pluralform>
-<pluralform>Vienu metu negalima laukti daugiau nei %x prisijungimai.</pluralform>
-<pluralform>Vienu metu negalima laukti daugiau nei %x prisijungimų.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Aktyvūs susijungimai: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Nepavyko atidaryti SFTP kanalo %x.</target>
-
 <source>Drag && drop</source>
 <target>Vilkti && Numesti</target>
 
@@ -752,6 +752,9 @@ Esamas: %y baitai
 <source>Command line:</source>
 <target>Komandinė eilutė:</target>
 
+<source>&Hide console window</source>
+<target>&Paslėpti konsolės langą</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -787,8 +790,8 @@ Komanda inicijuojama jei:
 <source>Waiting until directory is available:</source>
 <target>Laukiama kol katalogas bus prieinamas:</target>
 
-<source>&Restore</source>
-<target>&Atstatyti</target>
+<source>&Configure</source>
+<target>&Konfiguruoti</target>
 
 <source>&Show error message</source>
 <target>&Rodyti kaidą</target>
@@ -824,8 +827,8 @@ Komanda inicijuojama jei:
 <source>Scanning...</source>
 <target>Tikrinama...</target>
 
-<source>job name</source>
-<target>Užduoties pavadinimas</target>
+<source>configuration file</source>
+<target>nustatymų failas</target>
 
 <source>System: Sleep</source>
 <target>Sistema: Miegoti</target>
@@ -836,8 +839,8 @@ Komanda inicijuojama jei:
 <source>Nothing to synchronize</source>
 <target>Nėra ko suvienodinti</target>
 
-<source>Executing command %x</source>
-<target>Vykdyti komandą %x</target>
+<source>Executing command:</source>
+<target>Vykdoma komanda:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Sprendžiant šią problemą, galite persijungti i FreeFileSync pagrindinį langą.</target>
@@ -1038,6 +1041,12 @@ Komanda inicijuojama jei:
 <source>Match case</source>
 <target>Atitikti atveją</target>
 
+<source>Processed:</source>
+<target>Atlikta:</target>
+
+<source>Remaining:</source>
+<target>Likę:</target>
+
 <source>New</source>
 <target>Naujas</target>
 
@@ -1274,14 +1283,17 @@ Komanda inicijuojama jei:
 <source>&Don't show this dialog again</source>
 <target>&Nerodyti pakartotinai šio dialogo lango</target>
 
-<source>Items found:</source>
-<target>Rasta elementų:</target>
+<source>Bytes:</source>
+<target>Baitai:</target>
 
-<source>Time remaining:</source>
-<target>Likęs laikas:</target>
+<source>Items:</source>
+<target>Elementai:</target>
 
-<source>Time elapsed:</source>
-<target>Praėjęs laikas:</target>
+<source>Synchronizing...</source>
+<target>Suvienodinama...</target>
+
+<source>Minimize to notification area</source>
+<target>Nuleisti į apačią dešinėje</target>
 
 <source>Bytes</source>
 <target>Baitai</target>
@@ -1289,12 +1301,6 @@ Komanda inicijuojama jei:
 <source>Items</source>
 <target>Elementai</target>
 
-<source>Synchronizing...</source>
-<target>Suvienodinama...</target>
-
-<source>Minimize to notification area</source>
-<target>Nuleisti į apačią dešinėje</target>
-
 <source>When finished:</source>
 <target>Kai pabaigta:</target>
 
@@ -1370,6 +1376,12 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai.
 <source>&Delete logs after x days:</source>
 <target>&Ištrinti žurnalo įrašus po x dienų:</target>
 
+<source>Notification sounds:</source>
+<target>Pranešimo garsas:</target>
+
+<source>Synchronization finished:</source>
+<target>Suvienodinimas pabaigtas:</target>
+
 <source>Customize context menu:</source>
 <target>Pagrindinio meniu pasirinkimai:</target>
 
@@ -1521,36 +1533,6 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai.
 <source>&Execute</source>
 <target>&Vykdyti</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x katalogas</pluralform>
-<pluralform>%x katalogai</pluralform>
-<pluralform>%x katalogų</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x failas</pluralform>
-<pluralform>%x failai</pluralform>
-<pluralform>%x failų</pluralform>
-</target>
-
-<source>
-<pluralform>Showing %y of 1 row</pluralform>
-<pluralform>Showing %y of %x rows</pluralform>
-</source>
-<target>
-<pluralform>Rodoma %y iš %x eilutės</pluralform>
-<pluralform>Rodoma %y iš %x eilučių</pluralform>
-<pluralform>Rodoma %y iš %x eilučių</pluralform>
-</target>
-
 <source>Set direction:</source>
 <target>Nustatyti kryptį:</target>
 
@@ -1578,12 +1560,6 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai.
 <source>&Delete</source>
 <target>&Ištrinti</target>
 
-<source>Include all</source>
-<target>Įtraukti visus</target>
-
-<source>Exclude all</source>
-<target>Neįtraukti visų</target>
-
 <source>Show icons:</source>
 <target>Rodyti ženkliukus:</target>
 
@@ -1620,6 +1596,21 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai.
 <source>Do&n't save</source>
 <target>&Nesaugoti</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x negali būti pervardintas.</target>
+
+<source>New name:</source>
+<target>Naujas pavadinimas:</target>
+
+<source>Rename Configuration</source>
+<target>Pervardinti Pasirinkimą</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Pasirinkimo pavadinimas negali būti tuščias.</target>
+
+<source>&Rename...</source>
+<target>&Pervardinti...</target>
+
 <source>Hide configuration</source>
 <target>Paslėpti nustatymus</target>
 
@@ -1680,6 +1671,36 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai.
 <source>All files are in sync</source>
 <target>Visi failai suvienodinti</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x katalogas</pluralform>
+<pluralform>%x katalogai</pluralform>
+<pluralform>%x katalogų</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x failas</pluralform>
+<pluralform>%x failai</pluralform>
+<pluralform>%x failų</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>Rodoma %y iš %x eilutės</pluralform>
+<pluralform>Rodoma %y iš %x eilučių</pluralform>
+<pluralform>Rodoma %y iš %x eilučių</pluralform>
+</target>
+
 <source>Cannot find %x</source>
 <target>Nepavyksta rasti %x</target>
 
@@ -1731,8 +1752,8 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai.
 <source>Password:</source>
 <target>Slaptažodis:</target>
 
-<source>Key password:</source>
-<target>Rakto slaptažodis:</target>
+<source>Key passphrase:</source>
+<target>Rakto slaptafrazė:</target>
 
 <source>Please enter a file path.</source>
 <target>Prašome įvesti failo kelią.</target>
@@ -1899,6 +1920,9 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Minimalus versijų skaičius turi būti mažesnis, nei maksimalus skaičius.</target>
 
+<source>&Restore</source>
+<target>&Atstatyti</target>
+
 <source>Files</source>
 <target>Failai</target>
 
@@ -1965,6 +1989,9 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai.
 <source>The file is locked by another process:</source>
 <target>Failas yra užrakintas kito procceso:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Nepavyko nustatyti aplanko %x, kuriame yra failas, leidimų palaikymą.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Nepavyksta perskaityti %x saugumo konteksto.</target>
 
@@ -2018,12 +2045,12 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai.
 <source>Cannot change process I/O priorities.</source>
 <target>Nepavyksta pakeisti proceso I/O prioritetų.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Nepavyko išjungti sistemos.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Tikrinama šiukšliadėžė. Failas %x nerastas.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Nepavyko išjungti sistemos.</target>
+
 <source>Prepare installation</source>
 <target>Ruošiamasi įdiegimui</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/norwegian.lng b/FreeFileSync/Build/Resources/Languages/norwegian.lng
index 6a5146a9..6817a571 100755
--- a/FreeFileSync/Build/Resources/Languages/norwegian.lng
+++ b/FreeFileSync/Build/Resources/Languages/norwegian.lng
@@ -7,6 +7,155 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>Kan ikke lese filen %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Uventet størrelse på datastrømmen.
+Forventet: %x bytes
+Faktisk: %y bytes
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Kan ikke opprette filen %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Kan ikke skrive tillatelsene til %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Operasjonen støttes ikke mellom ulike enheter.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Kan ikke slette filen %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Kan ikke slette symbolsk lenke %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Kan ikke slette katalog %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Kan ikke flytte filen %x til %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Kan ikke kopiere symbolsk forbindelse %x til %y.</target>
+
+<source>Error Code %x</source>
+<target>Feilkode %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>Kan ikke lese katalogen %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Kan ikke oppdatere tidsendring på %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Kan ikke lese filattributterne på %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Kan ikke lage katalog %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Kan ikke bestemme endelig sti for %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Operasjonen støttes ikke av enheten.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Kan ikke løse den symbolske forbindelsen %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Kunne ikke flytte %x til papirkurven.</target>
+
+<source>Authentication completed.</source>
+<target>Autentisering er ferdig.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Du kan lukke denne siden nå og fortsette med FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Autentisering mislyktes.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Kan ikke koble til %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Kan ikke finne %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>Navnet %x brukes av mer enn ett element i mappen.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Vennligst godta tilgang til brukerkonto %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Kan ikke åpne filen %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>Navnet %x brukes allerede av et annet element.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Kan ikke fastslå ledig diskplass for %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Kan ikke koble fra %x.</target>
+
+<source>Unable to access %x.</source>
+<target>Får ikke tilgang til %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Kunne ikke få informasjon om server %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Kan ikke overvåke katalog %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Kan ikke finne enhet %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Kan ikke åpne katalog %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Ikke-støttet varetype.</target>
+
+<source>Incorrect command line:</source>
+<target>Ugyldig kommando:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>Tjeneren støtter ikke autentisering via %x.</target>
+
+<source>Required:</source>
+<target>Krav:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Operasjonen timet ut etter 1 sekund.</pluralform>
+<pluralform>Operasjonen timet ut etter %x sekunder.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Kan ikke vente på mer enn 1 tilkobling om gangen.</pluralform>
+<pluralform>Kan ikke vente på mer enn %x tilkoblinger på en gang.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Aktive tilkoblinger: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Kunne ikke åpne SFTP kanalnummer %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Begge sider er endret siden siste synkronisering.</target>
 
@@ -109,9 +258,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Installasjonsfilene er ødelagte. Installer FreeFileSync på nytt.</target>
 
-<source>Cannot load file %x.</source>
-<target>Kan ikke lese filen %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Kan ikke finne følgende mapper:</target>
 
@@ -139,6 +285,9 @@
 <pluralform>%x punkter funnet</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Brukt tid:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Filen %x har en ugyldig dato.</target>
 
@@ -157,9 +306,6 @@
 <source>Items differ in attributes only</source>
 <target>Elementene har kun forskjellige attributter</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>Navnet %x brukes av mer enn ett element i mappen.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Løser symbolsk forbindelse %x</target>
 
@@ -220,6 +366,15 @@
 <source>Out of memory.</source>
 <target>Ikke nok minne.</target>
 
+<source>Show in Explorer</source>
+<target>Vis i Explorer</target>
+
+<source>Open with default application</source>
+<target>Åpne med standardprogrammet</target>
+
+<source>Browse directory</source>
+<target>Bla i katalogen</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Databasefilen %x er inkompatibel.</target>
 
@@ -232,12 +387,6 @@
 <source>Database file is corrupted:</source>
 <target>Databasefilen er skadet:</target>
 
-<source>Cannot write file %x.</source>
-<target>Kan ikke opprette filen %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Kan ikke lese filen %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Databasefilene inneholder ennå ikke informasjon om siste synkronisering.</target>
 
@@ -256,9 +405,6 @@
 <source>Cannot get process information.</source>
 <target>Kan ikke hente bearbeidings-informasjon.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Kan ikke lese filattributterne på %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Venter mens katalogen låses:</target>
 
@@ -331,6 +477,27 @@
 <source>Update attributes on right</source>
 <target>Oppdater attributter til høyre</target>
 
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Behandlingsfeil i filen %x, rad %y, kolonne %z.</target>
+
+<source>Services</source>
+<target>Tjenester</target>
+
+<source>Show All</source>
+<target>Vis alt</target>
+
+<source>Hide Others</source>
+<target>Skjul andre</target>
+
+<source>Hide %x</source>
+<target>Skjul %x</target>
+
+<source>Quit %x</source>
+<target>Avslutt %x</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>Kan ikke angi kataloglås for følgende mapper:</target>
+
 <source>Errors:</source>
 <target>Feil:</target>
 
@@ -355,27 +522,6 @@
 <source>Cleaning up log files:</source>
 <target>Sletter loggfiler:</target>
 
-<source>Error parsing file %x, row %y, column %z.</source>
-<target>Behandlingsfeil i filen %x, rad %y, kolonne %z.</target>
-
-<source>Services</source>
-<target>Tjenester</target>
-
-<source>Show All</source>
-<target>Vis alt</target>
-
-<source>Hide Others</source>
-<target>Skjul andre</target>
-
-<source>Hide %x</source>
-<target>Skjul %x</target>
-
-<source>Quit %x</source>
-<target>Avslutt %x</target>
-
-<source>Cannot set directory locks for the following folders:</source>
-<target>Kan ikke angi kataloglås for følgende mapper:</target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
@@ -385,27 +531,12 @@
 <pluralform>%x tråder</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Kan ikke lese katalogen %x.</target>
-
 <source>%x/sec</source>
 <target>%x/sek</target>
 
 <source>%x items</source>
 <target>%x elementer</target>
 
-<source>Show in Explorer</source>
-<target>Vis i Explorer</target>
-
-<source>Open with default application</source>
-<target>Åpne med standardprogrammet</target>
-
-<source>Browse directory</source>
-<target>Bla i katalogen</target>
-
-<source>Unable to connect to %x.</source>
-<target>Kan ikke koble til %x.</target>
-
 <source>Completed successfully</source>
 <target>Fullførte feilfritt</target>
 
@@ -451,9 +582,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Kan ikke skrive filattributter til %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Kan ikke åpne filen %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x og %y har forskjellig innhold.</target>
 
@@ -484,29 +612,20 @@
 <source>Source item %x not found</source>
 <target>Kildeelementet %x ikke funnet</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Kan ikke flytte filen %x til %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Overordnet mappe %x finnes ikke.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>Navnet %x brukes allerede av et annet element.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Kan ikke kopiere filen %x til %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Kan ikke kopiere symbolsk forbindelse %x til %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Oppretter en Volume Shadow-kopi for %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Finner ikke mappen %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Målmappen %x finnes allerede.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Målmappe %x er allerede eksisterende, men var ikke tilgjengelig under mappesammenligning.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Målmappens datafelt må ikke være tomt.</target>
@@ -529,17 +648,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Ikke nok ledig diskplass på:</target>
 
-<source>Required:</source>
-<target>Krav:</target>
-
 <source>Available:</source>
 <target>Tilgjengelig:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Noen filer vil bli synkronisert som en del av flere basemapper.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>For å unngå konflikter, sett opp utelukkelsesfiltre, slik at hver oppdaterte fil regnes av bare én basemappe.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>For å unngå konflikter, sett opp ekskluder filtre slik at hver oppdaterte fil bare er inkludert i en basemappe.</target>
 
 <source>Versioning folder:</source>
 <target>Versjonsmappe:</target>
@@ -565,122 +681,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Kan ikke opprette tidsstempel til versjonen:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Uventet størrelse på datastrømmen.
-Forventet: %x bytes
-Faktisk: %y bytes
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Kan ikke skrive tillatelsene til %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Operasjonen støttes ikke mellom ulike enheter.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Kan ikke slette filen %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Kan ikke slette symbolsk lenke %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Kan ikke slette katalog %x.</target>
-
-<source>Error Code %x</source>
-<target>Feilkode %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Kan ikke oppdatere tidsendring på %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Kan ikke lage katalog %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Kan ikke bestemme endelig sti for %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Operasjonen støttes ikke av enheten.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Kan ikke løse den symbolske forbindelsen %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Kunne ikke flytte %x til papirkurven.</target>
-
-<source>Authentication completed.</source>
-<target>Autentisering er ferdig.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Du kan lukke denne siden nå og fortsette med FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Autentisering mislyktes.</target>
-
-<source>Cannot find %x.</source>
-<target>Kan ikke finne %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Vennligst godta tilgang til brukerkonto %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Kan ikke fastslå ledig diskplass for %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Kan ikke koble fra %x.</target>
-
-<source>Unable to access %x.</source>
-<target>Får ikke tilgang til %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Kunne ikke få informasjon om server %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Kan ikke overvåke katalog %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Kan ikke finne enhet %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Kan ikke åpne katalog %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Ikke-støttet varetype.</target>
-
-<source>Incorrect command line:</source>
-<target>Ugyldig kommando:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>Tjeneren støtter ikke autentisering via %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Operasjonen timet ut etter 1 sekund.</pluralform>
-<pluralform>Operasjonen timet ut etter %x sekunder.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Kan ikke vente på mer enn 1 tilkobling om gangen.</pluralform>
-<pluralform>Kan ikke vente på mer enn %x tilkoblinger på en gang.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Aktive tilkoblinger: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Kunne ikke åpne SFTP kanalnummer %x.</target>
-
 <source>Drag && drop</source>
 <target>Dra && slipp</target>
 
@@ -747,6 +747,9 @@ Faktisk: %y bytes
 <source>Command line:</source>
 <target>Kommandolinje:</target>
 
+<source>&Hide console window</source>
+<target>&Skjul konsollvindu</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -782,8 +785,8 @@ Kommandoen utføres hvis:
 <source>Waiting until directory is available:</source>
 <target>Venter til katalogen er tilgjengelig:</target>
 
-<source>&Restore</source>
-<target>&Gjenopprett</target>
+<source>&Configure</source>
+<target>&Konfigurer</target>
 
 <source>&Show error message</source>
 <target>&Vis feilmelding</target>
@@ -818,8 +821,8 @@ Kommandoen utføres hvis:
 <source>Scanning...</source>
 <target>Skanner...</target>
 
-<source>job name</source>
-<target>jobbnavn</target>
+<source>configuration file</source>
+<target>konfigurasjonsfil</target>
 
 <source>System: Sleep</source>
 <target>System: Sov</target>
@@ -830,8 +833,8 @@ Kommandoen utføres hvis:
 <source>Nothing to synchronize</source>
 <target>Alt er synkronisert</target>
 
-<source>Executing command %x</source>
-<target>Utfør kommandoen %x</target>
+<source>Executing command:</source>
+<target>Utfører kommando:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Du kan skifte til FreeFileSync's hovedvindu for at løse dette problemet.</target>
@@ -1031,6 +1034,12 @@ Kommandoen utføres hvis:
 <source>Match case</source>
 <target>Treff-følsomhet (a/A)</target>
 
+<source>Processed:</source>
+<target>Bearbeidet:</target>
+
+<source>Remaining:</source>
+<target>Gjenstående:</target>
+
 <source>New</source>
 <target>Ny</target>
 
@@ -1267,14 +1276,17 @@ Kommandoen utføres hvis:
 <source>&Don't show this dialog again</source>
 <target>&Ikke vis denne dialogen igjen</target>
 
-<source>Items found:</source>
-<target>Elementer funnet:</target>
+<source>Bytes:</source>
+<target>Bytes:</target>
 
-<source>Time remaining:</source>
-<target>Resterende tid:</target>
+<source>Items:</source>
+<target>Elementer:</target>
 
-<source>Time elapsed:</source>
-<target>Brukt tid:</target>
+<source>Synchronizing...</source>
+<target>Synkroniserer...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimér til status-feltet</target>
 
 <source>Bytes</source>
 <target>Bytes</target>
@@ -1282,12 +1294,6 @@ Kommandoen utføres hvis:
 <source>Items</source>
 <target>Elementer</target>
 
-<source>Synchronizing...</source>
-<target>Synkroniserer...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimér til status-feltet</target>
-
 <source>When finished:</source>
 <target>Når ferdig:</target>
 
@@ -1363,6 +1369,12 @@ Sikrer prosessen ved alvorlige feil.
 <source>&Delete logs after x days:</source>
 <target>&Slett logger etter x dager:</target>
 
+<source>Notification sounds:</source>
+<target>Varslingslyder:</target>
+
+<source>Synchronization finished:</source>
+<target>Synkroniseringen er ferdig:</target>
+
 <source>Customize context menu:</source>
 <target>Tilpass kontekst-meny:</target>
 
@@ -1513,33 +1525,6 @@ Sikrer prosessen ved alvorlige feil.
 <source>&Execute</source>
 <target>&Utfør</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 katalog</pluralform>
-<pluralform>%x kataloger</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 fil</pluralform>
-<pluralform>%x filer</pluralform>
-</target>
-
-<source>
-<pluralform>Showing %y of 1 row</pluralform>
-<pluralform>Showing %y of %x rows</pluralform>
-</source>
-<target>
-<pluralform>Viser %y av 1 rad</pluralform>
-<pluralform>Viser %y av %x rader</pluralform>
-</target>
-
 <source>Set direction:</source>
 <target>Sett retning:</target>
 
@@ -1567,12 +1552,6 @@ Sikrer prosessen ved alvorlige feil.
 <source>&Delete</source>
 <target>&Slett</target>
 
-<source>Include all</source>
-<target>Velg alle</target>
-
-<source>Exclude all</source>
-<target>Ekskludér alle</target>
-
 <source>Show icons:</source>
 <target>Vis ikoner:</target>
 
@@ -1609,6 +1588,21 @@ Sikrer prosessen ved alvorlige feil.
 <source>Do&n't save</source>
 <target>&Ikke lagre</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x kan ikke gi nytt navn.</target>
+
+<source>New name:</source>
+<target>Nytt navn:</target>
+
+<source>Rename Configuration</source>
+<target>Gi nytt navn til konfigurasjonen</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Konfigurasjonsnavnet må ikke være tomt.</target>
+
+<source>&Rename...</source>
+<target>&Gi nytt navn...</target>
+
 <source>Hide configuration</source>
 <target>Skjul konfigurasjoner</target>
 
@@ -1669,6 +1663,33 @@ Sikrer prosessen ved alvorlige feil.
 <source>All files are in sync</source>
 <target>Alle filer er synkroniserte</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 katalog</pluralform>
+<pluralform>%x kataloger</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 fil</pluralform>
+<pluralform>%x filer</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>Viser %y av 1 rad</pluralform>
+<pluralform>Viser %y av %x rader</pluralform>
+</target>
+
 <source>Cannot find %x</source>
 <target>Kan ikke finne %x</target>
 
@@ -1720,8 +1741,8 @@ Sikrer prosessen ved alvorlige feil.
 <source>Password:</source>
 <target>Passord:</target>
 
-<source>Key password:</source>
-<target>Nøkkelpassord:</target>
+<source>Key passphrase:</source>
+<target>Nøkkelord:</target>
 
 <source>Please enter a file path.</source>
 <target>Vennligst skriv inn en filbane.</target>
@@ -1885,6 +1906,9 @@ Sikrer prosessen ved alvorlige feil.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Minimumversjons-tellingen må være mindre enn maksimumstellingen.</target>
 
+<source>&Restore</source>
+<target>&Gjenopprett</target>
+
 <source>Files</source>
 <target>Filer</target>
 
@@ -1951,6 +1975,9 @@ Sikrer prosessen ved alvorlige feil.
 <source>The file is locked by another process:</source>
 <target>Filen er låst av en annen prosess:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Kunne ikke bestemme støtte for filtillatelse for mappe %x.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Kan ikke lese sikkerhetsinnstillinger på %x.</target>
 
@@ -2002,12 +2029,12 @@ Sikrer prosessen ved alvorlige feil.
 <source>Cannot change process I/O priorities.</source>
 <target>Kan ikke endre I/O prioriteter.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Kan ikke slå av systemet.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Det å sjekke papirkurven gikk galt for mappen %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Kan ikke slå av systemet.</target>
+
 <source>Prepare installation</source>
 <target>Forbered installering</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/polish.lng b/FreeFileSync/Build/Resources/Languages/polish.lng
index 1159b893..eb79f424 100755
--- a/FreeFileSync/Build/Resources/Languages/polish.lng
+++ b/FreeFileSync/Build/Resources/Languages/polish.lng
@@ -7,6 +7,157 @@
 	<plural_definition>n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>Nie można odczytać pliku %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Niespodziewany rozmiar strumienia danych.
+Oczekiwany: %x bajtów
+Przesłany: %y bajtów
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Nie można zapisać pliku %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Nie można zapisać uprawnień %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Operacja nie jest obsługiwana między różnymi urządzeniami.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Nie można usunąć pliku %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Nie można usunąć dowiązania symbolicznego %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Nie można usunąć katalogu %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Nie można przenieść pliku %x do %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Nie można skopiować linku symbolicznego %x do %y.</target>
+
+<source>Error Code %x</source>
+<target>Kod błędu %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>Nie można odczytać katalogu %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Nie można zapisać czasu modyfikacji %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Nie można odczytać atrybutów pliku %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Nie można utworzyć katalogu %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Nie można określić ostatecznej ścieżki dla %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Operacja nie jest obsługiwana przez urządzenie.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Nie można określić położenia dowiązania symbolicznego %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Nie można przenieść %x do kosza.</target>
+
+<source>Authentication completed.</source>
+<target>Uwierzytelnianie zakończone.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Możesz teraz zamknąć tę stronę i kontynuować FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Uwierzytelnianie nie powiodło się.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Błąd połączenia do %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Nie można odnaleźć %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>Nazwa %x jest używana przez więcej niż jeden element w folderze.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Proszę autoryzować dostęp do konta użytkownika %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Nie można otworzyć pliku %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>Nazwa %x jest już używana przez inny element.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Nie można określić wolnego miejsca na %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Nie można odłączyć od %x.</target>
+
+<source>Unable to access %x.</source>
+<target>Brak dostępu do %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Nie można uzyskać informacji o serwerze %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Nie można monitorować katalogu %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Nie można odnaleźć urządzenia %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Nie można otworzyć katalogu %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Nieobsługiwany typ elementu.</target>
+
+<source>Incorrect command line:</source>
+<target>Niepoprawne polecenie:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>Serwer nie wspiera uwierzytelniania przez %x.</target>
+
+<source>Required:</source>
+<target>Wymagane:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Przekroczono czas oczekiwania 1 sekundy dla zadania.</pluralform>
+<pluralform>Przekroczono czas oczekiwania %x sekund dla zadania.</pluralform>
+<pluralform>Przekroczono czas oczekiwania %x sekund dla zadania.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Nie można oczekiwać na więcej niż 1 zadanie na raz.</pluralform>
+<pluralform>Nie można oczekiwać na więcej niż %x zadania na raz.</pluralform>
+<pluralform>Nie można oczekiwać na więcej niż %x zadań na raz.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Aktywne połączenia: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Nie można otworzyć kanału SFTP numer %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Obie strony uległy zmianie od ostatniej synchronizacji.</target>
 
@@ -109,9 +260,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Pliki instalacyjne są uszkodzone. Przeinstaluj program FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Nie można wczytać pliku %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Nie można znaleźć następujących katalogów:</target>
 
@@ -140,6 +288,9 @@
 <pluralform>Znaleziono %x elementów</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Upłynęło:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Plik %x ma nieprawidłową datę.</target>
 
@@ -158,9 +309,6 @@
 <source>Items differ in attributes only</source>
 <target>Elementy różnią się wyłącznie atrybutami</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>Nazwa %x jest używana przez więcej niż jeden element w folderze.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Rozwiązywanie dowiązania symbolicznego %x</target>
 
@@ -221,6 +369,15 @@
 <source>Out of memory.</source>
 <target>Brak wolnej pamięci.</target>
 
+<source>Show in Explorer</source>
+<target>Wyświetl w Eksploratorze</target>
+
+<source>Open with default application</source>
+<target>Otwórz za pomocą domyślnej aplikacji</target>
+
+<source>Browse directory</source>
+<target>Przeglądaj katalog</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Plik bazy danych %x nie jest kompatybilny.</target>
 
@@ -233,12 +390,6 @@
 <source>Database file is corrupted:</source>
 <target>Plik bazy danych jest uszkodzony:</target>
 
-<source>Cannot write file %x.</source>
-<target>Nie można zapisać pliku %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Nie można odczytać pliku %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Pliki bazy danych nie posiadają żadnych informacji o ostatniej synchronizacji.</target>
 
@@ -257,9 +408,6 @@
 <source>Cannot get process information.</source>
 <target>Nie można uzyskać informacji dla procesu.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Nie można odczytać atrybutów pliku %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Oczekiwanie przez blokadę katalogu:</target>
 
@@ -333,6 +481,27 @@
 <source>Update attributes on right</source>
 <target>Aktualizuj atrybuty po prawej stronie</target>
 
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Błąd podczas parsowania pliku %x, rząd %y, kolumna %z.</target>
+
+<source>Services</source>
+<target>Usługi</target>
+
+<source>Show All</source>
+<target>Pokaż Wszystko</target>
+
+<source>Hide Others</source>
+<target>Ukryj Inne</target>
+
+<source>Hide %x</source>
+<target>Ukryj %x</target>
+
+<source>Quit %x</source>
+<target>Zamknij %x</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>Nie można zablokować katalogów dla poniższych folderów:</target>
+
 <source>Errors:</source>
 <target>Błędy:</target>
 
@@ -357,27 +526,6 @@
 <source>Cleaning up log files:</source>
 <target>Czyszczenie plików logów:</target>
 
-<source>Error parsing file %x, row %y, column %z.</source>
-<target>Błąd podczas parsowania pliku %x, rząd %y, kolumna %z.</target>
-
-<source>Services</source>
-<target>Usługi</target>
-
-<source>Show All</source>
-<target>Pokaż Wszystko</target>
-
-<source>Hide Others</source>
-<target>Ukryj Inne</target>
-
-<source>Hide %x</source>
-<target>Ukryj %x</target>
-
-<source>Quit %x</source>
-<target>Zamknij %x</target>
-
-<source>Cannot set directory locks for the following folders:</source>
-<target>Nie można zablokować katalogów dla poniższych folderów:</target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
@@ -388,27 +536,12 @@
 <pluralform>%x wątków</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Nie można odczytać katalogu %x.</target>
-
 <source>%x/sec</source>
 <target>%x/sek</target>
 
 <source>%x items</source>
 <target>%x elementów</target>
 
-<source>Show in Explorer</source>
-<target>Wyświetl w Eksploratorze</target>
-
-<source>Open with default application</source>
-<target>Otwórz za pomocą domyślnej aplikacji</target>
-
-<source>Browse directory</source>
-<target>Przeglądaj katalog</target>
-
-<source>Unable to connect to %x.</source>
-<target>Błąd połączenia do %x.</target>
-
 <source>Completed successfully</source>
 <target>Zakończono bez błędów</target>
 
@@ -454,9 +587,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Nie można zapisać atrybutów %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Nie można otworzyć pliku %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x i %y mają różną zawartość.</target>
 
@@ -487,29 +617,20 @@
 <source>Source item %x not found</source>
 <target>Nie znaleziono elementu źródłowego %x</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Nie można przenieść pliku %x do %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Nadrzędny folder %x nie istnieje.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>Nazwa %x jest już używana przez inny element.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Nie można skopiować pliku %x do %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Nie można skopiować linku symbolicznego %x do %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Tworzenie Volume Shadow Copy dla %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Nie można znaleźć katalogu %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Katalog docelowy %x już istnieje.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Folder docelowy %x już istnieje, ale nie był dostępny podczas porównywania folderów.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Pole katalogu docelowego nie może być puste.</target>
@@ -532,17 +653,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Brak wystarczającej przestrzeni dyskowej na:</target>
 
-<source>Required:</source>
-<target>Wymagane:</target>
-
 <source>Available:</source>
 <target>Dostępne:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Niektóre pliki będą zsynchronizowane jako część kilku katalogów źródłowych.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Aby uniknąć konfliktów ustaw filtry tak aby wykluczyć przynależność pliku do wielu katalogów źródłowych.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Aby uniknąć konfliktów, skonfiguruj filtry wykluczania tak, aby każdy zaktualizowany plik był zawarty tylko w jednym folderze bazowym.</target>
 
 <source>Versioning folder:</source>
 <target>Wersjonowanie katalogów:</target>
@@ -568,124 +686,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Nie można utworzyć znacznika czasu dla wersjonowania:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Niespodziewany rozmiar strumienia danych.
-Oczekiwany: %x bajtów
-Przesłany: %y bajtów
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Nie można zapisać uprawnień %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Operacja nie jest obsługiwana między różnymi urządzeniami.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Nie można usunąć pliku %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Nie można usunąć dowiązania symbolicznego %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Nie można usunąć katalogu %x.</target>
-
-<source>Error Code %x</source>
-<target>Kod błędu %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Nie można zapisać czasu modyfikacji %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Nie można utworzyć katalogu %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Nie można określić ostatecznej ścieżki dla %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Operacja nie jest obsługiwana przez urządzenie.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Nie można określić położenia dowiązania symbolicznego %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Nie można przenieść %x do kosza.</target>
-
-<source>Authentication completed.</source>
-<target>Uwierzytelnianie zakończone.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Możesz teraz zamknąć tę stronę i kontynuować FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Uwierzytelnianie nie powiodło się.</target>
-
-<source>Cannot find %x.</source>
-<target>Nie można odnaleźć %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Proszę autoryzować dostęp do konta użytkownika %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Nie można określić wolnego miejsca na %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Nie można odłączyć od %x.</target>
-
-<source>Unable to access %x.</source>
-<target>Brak dostępu do %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Nie można uzyskać informacji o serwerze %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Nie można monitorować katalogu %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Nie można odnaleźć urządzenia %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Nie można otworzyć katalogu %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Nieobsługiwany typ elementu.</target>
-
-<source>Incorrect command line:</source>
-<target>Niepoprawne polecenie:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>Serwer nie wspiera uwierzytelniania przez %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Przekroczono czas oczekiwania 1 sekundy dla zadania.</pluralform>
-<pluralform>Przekroczono czas oczekiwania %x sekund dla zadania.</pluralform>
-<pluralform>Przekroczono czas oczekiwania %x sekund dla zadania.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Nie można oczekiwać na więcej niż 1 zadanie na raz.</pluralform>
-<pluralform>Nie można oczekiwać na więcej niż %x zadania na raz.</pluralform>
-<pluralform>Nie można oczekiwać na więcej niż %x zadań na raz.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Aktywne połączenia: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Nie można otworzyć kanału SFTP numer %x.</target>
-
 <source>Drag && drop</source>
 <target>Drag && Drop</target>
 
@@ -752,6 +752,9 @@ Przesłany: %y bajtów
 <source>Command line:</source>
 <target>Polecenie:</target>
 
+<source>&Hide console window</source>
+<target>&Ukryj okno konsoli</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -787,8 +790,8 @@ Komenda jest wykonywana gdy:
 <source>Waiting until directory is available:</source>
 <target>Oczekiwanie, aż katalog będzie dostępny:</target>
 
-<source>&Restore</source>
-<target>&Przywróć</target>
+<source>&Configure</source>
+<target>&Konfiguruj</target>
 
 <source>&Show error message</source>
 <target>&Pokaż komunikat o błędzie</target>
@@ -824,8 +827,8 @@ Komenda jest wykonywana gdy:
 <source>Scanning...</source>
 <target>Skanowanie...</target>
 
-<source>job name</source>
-<target>nazwa zadania</target>
+<source>configuration file</source>
+<target>plik konfiguracyjny</target>
 
 <source>System: Sleep</source>
 <target>System: Uśpienie</target>
@@ -836,8 +839,8 @@ Komenda jest wykonywana gdy:
 <source>Nothing to synchronize</source>
 <target>Brak plików do synchronizacji</target>
 
-<source>Executing command %x</source>
-<target>Wykonywanie polecenia %x</target>
+<source>Executing command:</source>
+<target>Wykonanie polecenia:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Możesz przejść do głównego okna FreeFileSync abe rozwiązać ten problem.</target>
@@ -1038,6 +1041,12 @@ Komenda jest wykonywana gdy:
 <source>Match case</source>
 <target>Uwzględnij wielkość liter</target>
 
+<source>Processed:</source>
+<target>Przetworzone:</target>
+
+<source>Remaining:</source>
+<target>Pozostało:</target>
+
 <source>New</source>
 <target>Nowy</target>
 
@@ -1274,14 +1283,17 @@ Komenda jest wykonywana gdy:
 <source>&Don't show this dialog again</source>
 <target>&Nie pokazuj więcej tego okna</target>
 
-<source>Items found:</source>
-<target>Znalezione elementy:</target>
+<source>Bytes:</source>
+<target>Bajty:</target>
 
-<source>Time remaining:</source>
-<target>Do ukończenia:</target>
+<source>Items:</source>
+<target>Elementy:</target>
 
-<source>Time elapsed:</source>
-<target>Upłynęło:</target>
+<source>Synchronizing...</source>
+<target>Synchronizuję...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimalizuj do obszaru powiadomień</target>
 
 <source>Bytes</source>
 <target>Bajty</target>
@@ -1289,12 +1301,6 @@ Komenda jest wykonywana gdy:
 <source>Items</source>
 <target>Elementy</target>
 
-<source>Synchronizing...</source>
-<target>Synchronizuję...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimalizuj do obszaru powiadomień</target>
-
 <source>When finished:</source>
 <target>Gdy zakończono:</target>
 
@@ -1359,7 +1365,7 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp
 <target>wymaga uprawnień administratora</target>
 
 <source>Transfer file and folder permissions.</source>
-<target>kopiuj uprawnienia plików i katalogów.</target>
+<target>Kopiuj uprawnienia plików i katalogów.</target>
 
 <source>Show all permanently hidden dialogs and warning messages again</source>
 <target>Przywróć wszystkie, stale ukryte dialogi i powiadomienia</target>
@@ -1370,6 +1376,12 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp
 <source>&Delete logs after x days:</source>
 <target>&Skasuj logi po x dniach:</target>
 
+<source>Notification sounds:</source>
+<target>Dźwięki powiadomień:</target>
+
+<source>Synchronization finished:</source>
+<target>Synchronizacja zakończona:</target>
+
 <source>Customize context menu:</source>
 <target>Dostosuj menu kontekstowe:</target>
 
@@ -1521,36 +1533,6 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp
 <source>&Execute</source>
 <target>&Wykonaj</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 katalog</pluralform>
-<pluralform>%x katalogi</pluralform>
-<pluralform>%x katalogów</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 plik</pluralform>
-<pluralform>%x pliki</pluralform>
-<pluralform>%x plików</pluralform>
-</target>
-
-<source>
-<pluralform>Showing %y of 1 row</pluralform>
-<pluralform>Showing %y of %x rows</pluralform>
-</source>
-<target>
-<pluralform>Widok %y z 1 wiersza</pluralform>
-<pluralform>Widok %y z %x wierszy</pluralform>
-<pluralform>Widok %y z %x wierszy</pluralform>
-</target>
-
 <source>Set direction:</source>
 <target>Kierunek  synchronizacji:</target>
 
@@ -1578,12 +1560,6 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp
 <source>&Delete</source>
 <target>&Usuń</target>
 
-<source>Include all</source>
-<target>Zaznacz wszystko</target>
-
-<source>Exclude all</source>
-<target>Odznacz wszystko</target>
-
 <source>Show icons:</source>
 <target>Pokaż ikony:</target>
 
@@ -1620,6 +1596,21 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp
 <source>Do&n't save</source>
 <target>&Nie zapisuj</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x nie można zmienić nazwy.</target>
+
+<source>New name:</source>
+<target>Nowa nazwa:</target>
+
+<source>Rename Configuration</source>
+<target>Zmień nazwę Konfiguracji</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Nazwa konfiguracji nie może być pusta.</target>
+
+<source>&Rename...</source>
+<target>&Zmień nazwę...</target>
+
 <source>Hide configuration</source>
 <target>Ukryj konfiguracje</target>
 
@@ -1680,6 +1671,36 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp
 <source>All files are in sync</source>
 <target>Pliki zsynchronizowane</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 katalog</pluralform>
+<pluralform>%x katalogi</pluralform>
+<pluralform>%x katalogów</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 plik</pluralform>
+<pluralform>%x pliki</pluralform>
+<pluralform>%x plików</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>Widok %y z 1 wiersza</pluralform>
+<pluralform>Widok %y z %x wierszy</pluralform>
+<pluralform>Widok %y z %x wierszy</pluralform>
+</target>
+
 <source>Cannot find %x</source>
 <target>Nie można znaleźć %x</target>
 
@@ -1731,8 +1752,8 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp
 <source>Password:</source>
 <target>Hasło:</target>
 
-<source>Key password:</source>
-<target>Hasło klucza:</target>
+<source>Key passphrase:</source>
+<target>Hasło kluczowe:</target>
 
 <source>Please enter a file path.</source>
 <target>Wprowadź ścieżkę do pliku.</target>
@@ -1899,6 +1920,9 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Minimalna liczba wersji musi być mniejsza od maksymalnej.</target>
 
+<source>&Restore</source>
+<target>&Przywróć</target>
+
 <source>Files</source>
 <target>Pliki</target>
 
@@ -1965,6 +1989,9 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp
 <source>The file is locked by another process:</source>
 <target>Plik jest zablokowany przez inny proces:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Nie można określić uprawnień do plików dla folderu %x.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Nie można odczytać ustawień bezpieczeństwa %x.</target>
 
@@ -2018,12 +2045,12 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp
 <source>Cannot change process I/O priorities.</source>
 <target>Nie można zmienić priorytetu I/O procesu.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Nie można wyłączyć systemu.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Sprawdzanie kosza systemowego dla katalogu %x zakończone niepowodzeniem.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Nie można wyłączyć systemu.</target>
+
 <source>Prepare installation</source>
 <target>Przygotuj instalację</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/portuguese.lng b/FreeFileSync/Build/Resources/Languages/portuguese.lng
index 06aab803..afd9ab8d 100755
--- a/FreeFileSync/Build/Resources/Languages/portuguese.lng
+++ b/FreeFileSync/Build/Resources/Languages/portuguese.lng
@@ -7,6 +7,155 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>Não é possível ler o ficheiro %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Tamanho inesperado do fluxo de dados.
+Esperado: %x bytes
+Actual: %y bytes
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Não é possível escrever o ficheiro %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Não é possível escrever as permissões de %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Operação não suportada entre dispositivos diferentes.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Não é possível eliminar o ficheiro %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Não é possível remover o link simbólico %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Não é possível eliminar o directório %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Não é possível mover o ficheiro %x para %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Não é possível criar o link simbólico de %x para %y.</target>
+
+<source>Error Code %x</source>
+<target>Código de Erro %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>Não é possível ler o directório %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Não é possível alterar a data de modificação a %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Não é possível ler os atributos do ficheiro %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Não é possível criar o directório %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Não é possível determinar o caminho final de %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Operação não suportada pelo dispositivo.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Não é possível resolver o link simbólico %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Não é possível mover %x para a reciclagem.</target>
+
+<source>Authentication completed.</source>
+<target>Autenticação completada.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Você pode cerrar esta página agora e continuar com o FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Falha na autenticação.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Não é possível conectar-se em %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Não é possível encontrar %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>O nome %x é usado por mais de um item na pasta.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Por favor, autorize o acesso à conta de usuário %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Não é possível abrir o ficheiro %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>O nome %x já está em uso por outro item.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Não é possível determinar o espaço livre no disco %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Incapaz de se desconectar de %x.</target>
+
+<source>Unable to access %x.</source>
+<target>Incapaz de aceder %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Falha ao obter informações do servidor %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Não é possível monitorizar o directório %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Não é possível encontrar o dispositivo %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Não é possível abrir o directório %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Tipo de item não suportado.</target>
+
+<source>Incorrect command line:</source>
+<target>Linha de comandos incorrecta:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>O servidor não suporta autenticação via %x.</target>
+
+<source>Required:</source>
+<target>Requirido:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>O tempo limite da operação esgotou após 1 segundo.</pluralform>
+<pluralform>O tempo limite da operação esgotou após %x segundos.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Não é possível aguardar em mais do que 1 conexão ao mesmo tempo.</pluralform>
+<pluralform>Não é possível aguardar em mais do que %x conexões ao mesmo tempo.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Conexões activas: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Falha ao abrir canal SFTP número %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Ambos os lados tiveram alterações desde a última sincronização.</target>
 
@@ -109,9 +258,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Os ficheiros de instalação estão corrompidos. Por favor, reinstale o FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Não é possível carregar o ficheiro %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Não é possível encontrar as seguintes pastas:</target>
 
@@ -139,6 +285,9 @@
 <pluralform>%x itens encontrados</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Tempo decorrido:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Ficheiro %x tem data inválida.</target>
 
@@ -157,9 +306,6 @@
 <source>Items differ in attributes only</source>
 <target>Itens diferem apenas nos atributos</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>O nome %x é usado por mais de um item na pasta.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Resolver link simbólico %x</target>
 
@@ -220,6 +366,15 @@
 <source>Out of memory.</source>
 <target>Sem memória disponível.</target>
 
+<source>Show in Explorer</source>
+<target>Mostrar no Explorer</target>
+
+<source>Open with default application</source>
+<target>Abrir com a aplicação associada</target>
+
+<source>Browse directory</source>
+<target>Procurar directório</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Base de dados %x não é compatível.</target>
 
@@ -232,12 +387,6 @@
 <source>Database file is corrupted:</source>
 <target>O ficheiro da base de dados está corrompido:</target>
 
-<source>Cannot write file %x.</source>
-<target>Não é possível escrever o ficheiro %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Não é possível ler o ficheiro %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Os ficheiros da base de dados ainda não contém informações sobre a última sincronização.</target>
 
@@ -256,9 +405,6 @@
 <source>Cannot get process information.</source>
 <target>Não é possível obter informação sobre o processo.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Não é possível ler os atributos do ficheiro %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>À espera do bloqueio do directório:</target>
 
@@ -385,27 +531,12 @@
 <pluralform>%x threads</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Não é possível ler o directório %x.</target>
-
 <source>%x/sec</source>
 <target>%x/seg.</target>
 
 <source>%x items</source>
 <target>%x itens</target>
 
-<source>Show in Explorer</source>
-<target>Mostrar no Explorer</target>
-
-<source>Open with default application</source>
-<target>Abrir com a aplicação associada</target>
-
-<source>Browse directory</source>
-<target>Procurar directório</target>
-
-<source>Unable to connect to %x.</source>
-<target>Não é possível conectar-se em %x.</target>
-
 <source>Completed successfully</source>
 <target>Concluído com sucesso</target>
 
@@ -451,9 +582,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Não é possível escrever os atributos de %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Não é possível abrir o ficheiro %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x e %y tem conteúdos distintos.</target>
 
@@ -484,29 +612,20 @@
 <source>Source item %x not found</source>
 <target>Item de origem %x não encontrado</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Não é possível mover o ficheiro %x para %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>A pasta pai %x não existe.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>O nome %x já está em uso por outro item.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Não é possível copiar o ficheiro %x para %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Não é possível criar o link simbólico de %x para %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>A criar Volume Shadow Copy para %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Não é possível encontrar a pasta %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Directório de destino %x já existe.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>A pasta %x já existe, mas não está disponível durante a comparação de pastas.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Campo de directório de destino não deve estar vazio.</target>
@@ -529,17 +648,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Não há espaço livre suficiente em:</target>
 
-<source>Required:</source>
-<target>Requirido:</target>
-
 <source>Available:</source>
 <target>Disponível:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Alguns ficheiros serão sincronizados como parte de múltiplas pastas base.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>A fim de evitar conflitos, configure os filtros de exclusão para que cada ficheiro actualizado seja considerado por somente uma pasta base.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Para evitar conflitos, defina os filtros de exclusão para que cada ficheiro actualizado seja incluído por somente uma pasta base.</target>
 
 <source>Versioning folder:</source>
 <target>Pasta de versão:</target>
@@ -565,122 +681,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Não é possível criar data/hora para controlo de versões:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Tamanho inesperado do fluxo de dados.
-Esperado: %x bytes
-Actual: %y bytes
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Não é possível escrever as permissões de %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Operação não suportada entre dispositivos diferentes.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Não é possível eliminar o ficheiro %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Não é possível remover o link simbólico %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Não é possível eliminar o directório %x.</target>
-
-<source>Error Code %x</source>
-<target>Código de Erro %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Não é possível alterar a data de modificação a %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Não é possível criar o directório %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Não é possível determinar o caminho final de %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Operação não suportada pelo dispositivo.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Não é possível resolver o link simbólico %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Não é possível mover %x para a reciclagem.</target>
-
-<source>Authentication completed.</source>
-<target>Autenticação completada.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Você pode cerrar esta página agora e continuar com o FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Falha na autenticação.</target>
-
-<source>Cannot find %x.</source>
-<target>Não é possível encontrar %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Por favor, autorize o acesso à conta de usuário %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Não é possível determinar o espaço livre no disco %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Incapaz de se desconectar de %x.</target>
-
-<source>Unable to access %x.</source>
-<target>Incapaz de aceder %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Falha ao obter informações do servidor %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Não é possível monitorizar o directório %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Não é possível encontrar o dispositivo %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Não é possível abrir o directório %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Tipo de item não suportado.</target>
-
-<source>Incorrect command line:</source>
-<target>Linha de comandos incorrecta:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>O servidor não suporta autenticação via %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>O tempo limite da operação esgotou após 1 segundo.</pluralform>
-<pluralform>O tempo limite da operação esgotou após %x segundos.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Não é possível aguardar em mais do que 1 conexão ao mesmo tempo.</pluralform>
-<pluralform>Não é possível aguardar em mais do que %x conexões ao mesmo tempo.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Conexões activas: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Falha ao abrir canal SFTP número %x.</target>
-
 <source>Drag && drop</source>
 <target>Arrastar && Largar</target>
 
@@ -747,6 +747,9 @@ Actual: %y bytes
 <source>Command line:</source>
 <target>Linha de comandos:</target>
 
+<source>&Hide console window</source>
+<target>&Ocultar janela de console</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -782,8 +785,8 @@ O comando é executado se:
 <source>Waiting until directory is available:</source>
 <target>A aguardar até o directório ficar disponível:</target>
 
-<source>&Restore</source>
-<target>&Restaurar</target>
+<source>&Configure</source>
+<target>&Configurar</target>
 
 <source>&Show error message</source>
 <target>Mo&strar mensagens de erro</target>
@@ -818,8 +821,8 @@ O comando é executado se:
 <source>Scanning...</source>
 <target>A pesquisar...</target>
 
-<source>job name</source>
-<target>nome da tarefa</target>
+<source>configuration file</source>
+<target>arquivo de configurações</target>
 
 <source>System: Sleep</source>
 <target>Suspender</target>
@@ -830,8 +833,8 @@ O comando é executado se:
 <source>Nothing to synchronize</source>
 <target>Nada a sincronizar</target>
 
-<source>Executing command %x</source>
-<target>A executar comando %x</target>
+<source>Executing command:</source>
+<target>A executar comando:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Pode mudar para a janela principal do FreeFileSync para resolver este problema.</target>
@@ -1031,6 +1034,12 @@ O comando é executado se:
 <source>Match case</source>
 <target>Correspondência</target>
 
+<source>Processed:</source>
+<target>Processado:</target>
+
+<source>Remaining:</source>
+<target>Restando:</target>
+
 <source>New</source>
 <target>Novo</target>
 
@@ -1267,14 +1276,17 @@ O comando é executado se:
 <source>&Don't show this dialog again</source>
 <target>&Não mostrar este diálogo novamente</target>
 
-<source>Items found:</source>
-<target>Elementos encontrados:</target>
+<source>Bytes:</source>
+<target>Bytes:</target>
 
-<source>Time remaining:</source>
-<target>Tempo restante:</target>
+<source>Items:</source>
+<target>Itens:</target>
 
-<source>Time elapsed:</source>
-<target>Tempo decorrido:</target>
+<source>Synchronizing...</source>
+<target>A sincronizar...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimizar para a área de notificação</target>
 
 <source>Bytes</source>
 <target>Bytes</target>
@@ -1282,12 +1294,6 @@ O comando é executado se:
 <source>Items</source>
 <target>Itens</target>
 
-<source>Synchronizing...</source>
-<target>A sincronizar...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimizar para a área de notificação</target>
-
 <source>When finished:</source>
 <target>Quando concluído:</target>
 
@@ -1363,6 +1369,12 @@ Isto garante um estado consistente mesmo em caso de falha grave.
 <source>&Delete logs after x days:</source>
 <target>&Eliminar registos após X dias:</target>
 
+<source>Notification sounds:</source>
+<target>Sons de notificação:</target>
+
+<source>Synchronization finished:</source>
+<target>Sincronização concluída:</target>
+
 <source>Customize context menu:</source>
 <target>Personalizar menu de contexto:</target>
 
@@ -1567,12 +1579,6 @@ Isto garante um estado consistente mesmo em caso de falha grave.
 <source>&Delete</source>
 <target>&Apagar</target>
 
-<source>Include all</source>
-<target>Incluir tudo</target>
-
-<source>Exclude all</source>
-<target>Excluir tudo</target>
-
 <source>Show icons:</source>
 <target>Mostrar ícones:</target>
 
@@ -1609,6 +1615,21 @@ Isto garante um estado consistente mesmo em caso de falha grave.
 <source>Do&n't save</source>
 <target>Não g&uardar</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x não pode ser renomeado.</target>
+
+<source>New name:</source>
+<target>Novo nome:</target>
+
+<source>Rename Configuration</source>
+<target>Renomear Configuração</target>
+
+<source>Configuration name must not be empty.</source>
+<target>O nome da configuração não pode estar vazio.</target>
+
+<source>&Rename...</source>
+<target>&Renomear...</target>
+
 <source>Hide configuration</source>
 <target>Ocultar configuração</target>
 
@@ -1720,8 +1741,8 @@ Isto garante um estado consistente mesmo em caso de falha grave.
 <source>Password:</source>
 <target>Palavra passe:</target>
 
-<source>Key password:</source>
-<target>Palavra passe da chave:</target>
+<source>Key passphrase:</source>
+<target>Frase de acesso da chave:</target>
 
 <source>Please enter a file path.</source>
 <target>Por favor, entre o caminho do ficheiro.</target>
@@ -1885,6 +1906,9 @@ Isto garante um estado consistente mesmo em caso de falha grave.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>A contagem da versão mínima deve ser menor que a contagem máxima.</target>
 
+<source>&Restore</source>
+<target>&Restaurar</target>
+
 <source>Files</source>
 <target>Ficheiros</target>
 
@@ -1951,6 +1975,9 @@ Isto garante um estado consistente mesmo em caso de falha grave.
 <source>The file is locked by another process:</source>
 <target>O ficheiro está bloqueado por outro processo:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Falha ao determinar suporte de permissão de ficheiro para a pasta %x.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Não é possível ler o contexto de segurança %x.</target>
 
@@ -2002,12 +2029,12 @@ Isto garante um estado consistente mesmo em caso de falha grave.
 <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 shut down the system.</source>
-<target>Incapaz de desligar o sistema.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Verificar a reciclagem falhou no directório %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Incapaz de desligar o sistema.</target>
+
 <source>Prepare installation</source>
 <target>A preparar a instalação</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/portuguese_br.lng b/FreeFileSync/Build/Resources/Languages/portuguese_br.lng
index 51b1097e..d95d04d9 100755
--- a/FreeFileSync/Build/Resources/Languages/portuguese_br.lng
+++ b/FreeFileSync/Build/Resources/Languages/portuguese_br.lng
@@ -7,6 +7,155 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>Não é possível ler o arquivo %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Tamanho inesperado do fluxo de dados.
+Esperado: %x bytes
+Atual: %y bytes
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Não é possível escrever o arquivo %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Não é possível escrever as permissões de %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Operação não suportada entre dispositivos diferentes.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Não é possível excluir o arquivo %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Não é possível excluir o link simbólico %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Não é possível excluir o diretório %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Não é possível mover o arquivo %x para %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Não é possível copiar o link simbólico %x para %y.</target>
+
+<source>Error Code %x</source>
+<target>Código do Erro %x.</target>
+
+<source>Cannot read directory %x.</source>
+<target>Não é possível ler o diretório %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Não é possível escrever a data de modificação de %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Não é possível ler os atributos do arquivo %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Não é possível criar o diretório %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Não é possível determinar o caminho final para %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Operação não suportada pelo dispositivo.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Não é possível resolver o link simbólico %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Não é possível mover %x para a Lixeira.</target>
+
+<source>Authentication completed.</source>
+<target>Autenticação concluída.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Você pode fechar esta página agora e continuar com o FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Autenticação falhou.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Não foi possível conectar a %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Não é possível encontrar %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>O nome %x é usado por mais de um item na pasta.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Por favor, autorize o acesso para a conta de usuário %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Não é possível abrir o arquivo %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>O nome %x já é usado por outro item.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Não é possível determinar o espaço livre em disco para %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Não foi possível desconectar de %x.</target>
+
+<source>Unable to access %x.</source>
+<target>Não foi possível acessar %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Falha na obteção da informação sobre o servidor %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Não é possível monitorar o diretório %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Não é possível encontrar o dispositivo %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Não é possível abrir o diretório %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Tipo de item não suportado.</target>
+
+<source>Incorrect command line:</source>
+<target>Linha de comando incorreta:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>O servidor não suporta autenticação via %x.</target>
+
+<source>Required:</source>
+<target>Necessário:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>A operação expirou após 1 segundo.</pluralform>
+<pluralform>A operação expirou após %x segundos.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Não é possível esperar mais do que 1 conexão por vez.</pluralform>
+<pluralform>Não é possível esperar mais do que %x conexões por vez.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Conexões ativas: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Falha ao abrir o canal SFTP número %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Ambos os lados foram alterados desde a última sincronização.</target>
 
@@ -109,9 +258,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Os arquivos de instalação estão corrompidos. Por favor, reinstale o FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Não é possível carregar o aquivo %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Não é possível localizar as seguintes pastas:</target>
 
@@ -128,7 +274,7 @@
 <target>Pesquisando:</target>
 
 <source>Comparison finished:</source>
-<target>Comparação finalizada:</target>
+<target>Comparação concluída:</target>
 
 <source>
 <pluralform>1 item found</pluralform>
@@ -139,6 +285,9 @@
 <pluralform>%x itens encontrados</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Tempo decorrido:</target>
+
 <source>File %x has an invalid date.</source>
 <target>O arquivo %x tem uma data inválida.</target>
 
@@ -157,9 +306,6 @@
 <source>Items differ in attributes only</source>
 <target>Os itens diferem apenas nos atributos</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>O nome %x é usado por mais de um item na pasta.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Resolvendo link simbólico %x</target>
 
@@ -220,6 +366,15 @@
 <source>Out of memory.</source>
 <target>Memória insuficiente.</target>
 
+<source>Show in Explorer</source>
+<target>Mostrar no Explorer</target>
+
+<source>Open with default application</source>
+<target>Abrir com aplicativo padrão</target>
+
+<source>Browse directory</source>
+<target>Procurar diretório</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Arquivo de banco de dados %x incompatível.</target>
 
@@ -232,12 +387,6 @@
 <source>Database file is corrupted:</source>
 <target>O arquivo de banco de dados está corrompido:</target>
 
-<source>Cannot write file %x.</source>
-<target>Não é possível escrever o arquivo %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Não é possível ler o arquivo %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Os arquivos de banco de dados ainda não contêm informação sobre a última sincronização.</target>
 
@@ -256,9 +405,6 @@
 <source>Cannot get process information.</source>
 <target>Não é possível obter as informações do processo.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Não é possível ler os atributos do arquivo %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Aguardando enquanto o diretório é bloqueado:</target>
 
@@ -331,6 +477,27 @@
 <source>Update attributes on right</source>
 <target>Atualizar atributos à direita</target>
 
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Erro analisando o arquivo %x, linha %y, coluna %z.</target>
+
+<source>Services</source>
+<target>Serviços</target>
+
+<source>Show All</source>
+<target>Mostrar Todos</target>
+
+<source>Hide Others</source>
+<target>Ocultar Outros</target>
+
+<source>Hide %x</source>
+<target>Ocultar %x</target>
+
+<source>Quit %x</source>
+<target>Sair %x</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>Não é possível definir bloqueios de diretório para as seguintes pastas:</target>
+
 <source>Errors:</source>
 <target>Erros:</target>
 
@@ -355,27 +522,6 @@
 <source>Cleaning up log files:</source>
 <target>Limpando arquivos de log:</target>
 
-<source>Error parsing file %x, row %y, column %z.</source>
-<target>Erro analisando o arquivo %x, linha %y, coluna %z.</target>
-
-<source>Services</source>
-<target>Serviços</target>
-
-<source>Show All</source>
-<target>Mostrar Todos</target>
-
-<source>Hide Others</source>
-<target>Ocultar Outros</target>
-
-<source>Hide %x</source>
-<target>Ocultar %x</target>
-
-<source>Quit %x</source>
-<target>Sair %x</target>
-
-<source>Cannot set directory locks for the following folders:</source>
-<target>Não é possível definir bloqueios de diretório para as seguintes pastas:</target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
@@ -385,27 +531,12 @@
 <pluralform>%x threads</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Não é possível ler o diretório %x.</target>
-
 <source>%x/sec</source>
 <target>%x/s</target>
 
 <source>%x items</source>
 <target>%x itens</target>
 
-<source>Show in Explorer</source>
-<target>Mostrar no Explorer</target>
-
-<source>Open with default application</source>
-<target>Abrir com aplicativo padrão</target>
-
-<source>Browse directory</source>
-<target>Procurar diretório</target>
-
-<source>Unable to connect to %x.</source>
-<target>Não foi possível conectar a %x.</target>
-
 <source>Completed successfully</source>
 <target>Concluído com sucesso</target>
 
@@ -451,9 +582,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Não é possível escrever os atributos de arquivo de %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Não é possível abrir o arquivo %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x e %y têm conteúdos diferentes.</target>
 
@@ -484,29 +612,20 @@
 <source>Source item %x not found</source>
 <target>Item de origem %x não encontrado</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Não é possível mover o arquivo %x para %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Pasta pai %x não existe.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>O nome %x já é usado por outro item.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Não é possível copiar o arquivo %x para %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Não é possível copiar o link simbólico %x para %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Criando uma Cópia de Sombra de Volume para %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Não é possível encontrar a pasta %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Pasta de destino %x já existe.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>A pasta de destino %x já existe, mas não estava disponível durante a comparação de pastas.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Campo de entrada da pasta de destino não pode ficar vazio.</target>
@@ -529,17 +648,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Espaço em disco insuficiente em:</target>
 
-<source>Required:</source>
-<target>Necessário:</target>
-
 <source>Available:</source>
 <target>Disponível:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Alguns arquivos serão sincronizados como parte de várias pastas base.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Para evitar conflitos, configure filtros de exclusão para que cada arquivo atualizado seja considerado por apenas uma pasta base.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Para evitar conflitos, configure filtros de exclusão para que cada arquivo atualizado seja incluído por apenas uma pasta base.</target>
 
 <source>Versioning folder:</source>
 <target>Pasta de controle de versão:</target>
@@ -565,122 +681,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Não é possível criar a estampa de tempo para o controle de versões:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Tamanho inesperado do fluxo de dados.
-Esperado: %x bytes
-Atual: %y bytes
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Não é possível escrever as permissões de %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Operação não suportada entre dispositivos diferentes.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Não é possível excluir o arquivo %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Não é possível excluir o link simbólico %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Não é possível excluir o diretório %x.</target>
-
-<source>Error Code %x</source>
-<target>Código do Erro %x.</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Não é possível escrever a data de modificação de %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Não é possível criar o diretório %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Não é possível determinar o caminho final para %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Operação não suportada pelo dispositivo.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Não é possível resolver o link simbólico %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Não é possível mover %x para a Lixeira.</target>
-
-<source>Authentication completed.</source>
-<target>Autenticação concluída.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Você pode fechar esta página agora e continuar com o FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Autenticação falhou.</target>
-
-<source>Cannot find %x.</source>
-<target>Não é possível encontrar %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Por favor, autorize o acesso para a conta de usuário %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Não é possível determinar o espaço livre em disco para %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Não foi possível desconectar de %x.</target>
-
-<source>Unable to access %x.</source>
-<target>Não foi possível acessar %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Falha na obteção da informação sobre o servidor %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Não é possível monitorar o diretório %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Não é possível encontrar o dispositivo %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Não é possível abrir o diretório %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Tipo de item não suportado.</target>
-
-<source>Incorrect command line:</source>
-<target>Linha de comando incorreta:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>O servidor não suporta autenticação via %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>A operação expirou após 1 segundo.</pluralform>
-<pluralform>A operação expirou após %x segundos.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Não é possível esperar mais do que 1 conexão por vez.</pluralform>
-<pluralform>Não é possível esperar mais do que %x conexões por vez.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Conexões ativas: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Falha ao abrir o canal SFTP número %x.</target>
-
 <source>Drag && drop</source>
 <target>Arrastar && Soltar</target>
 
@@ -747,6 +747,9 @@ Atual: %y bytes
 <source>Command line:</source>
 <target>Linha de comando:</target>
 
+<source>&Hide console window</source>
+<target>&Ocultar janela de console</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -782,8 +785,8 @@ O comando é disparado se:
 <source>Waiting until directory is available:</source>
 <target>Aguardando até o diretório ficar disponível:</target>
 
-<source>&Restore</source>
-<target>&Restaurar</target>
+<source>&Configure</source>
+<target>&Configurar</target>
 
 <source>&Show error message</source>
 <target>&Mostrar mensagem de erro</target>
@@ -818,8 +821,8 @@ O comando é disparado se:
 <source>Scanning...</source>
 <target>Examinando...</target>
 
-<source>job name</source>
-<target>nome da tarefa</target>
+<source>configuration file</source>
+<target>arquivo de configuração</target>
 
 <source>System: Sleep</source>
 <target>Sistema: Suspender</target>
@@ -830,8 +833,8 @@ O comando é disparado se:
 <source>Nothing to synchronize</source>
 <target>Nada para sincronizar</target>
 
-<source>Executing command %x</source>
-<target>Executando comando %x</target>
+<source>Executing command:</source>
+<target>Executando comando:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Você pode alternar para a janela principal do FreeFileSync para resolver este problema.</target>
@@ -1031,6 +1034,12 @@ O comando é disparado se:
 <source>Match case</source>
 <target>Diferenciar maiúsculas e minúsculas</target>
 
+<source>Processed:</source>
+<target>Processado:</target>
+
+<source>Remaining:</source>
+<target>Restante:</target>
+
 <source>New</source>
 <target>Novo</target>
 
@@ -1238,7 +1247,7 @@ O comando é disparado se:
 <target>&SSH-agent</target>
 
 <source>User name:</source>
-<target>Nome do usuário:</target>
+<target>Nome de usuário:</target>
 
 <source>Private key file:</source>
 <target>Arquivo de chave particular:</target>
@@ -1267,14 +1276,17 @@ O comando é disparado se:
 <source>&Don't show this dialog again</source>
 <target>&Não mostrar esta caixa de diálogo novamente</target>
 
-<source>Items found:</source>
-<target>Itens encontrados:</target>
+<source>Bytes:</source>
+<target>Bytes:</target>
 
-<source>Time remaining:</source>
-<target>Tempo restante:</target>
+<source>Items:</source>
+<target>Itens:</target>
 
-<source>Time elapsed:</source>
-<target>Tempo decorrido:</target>
+<source>Synchronizing...</source>
+<target>Sincronizando...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimizar para a área de notificação</target>
 
 <source>Bytes</source>
 <target>Bytes</target>
@@ -1282,12 +1294,6 @@ O comando é disparado se:
 <source>Items</source>
 <target>Itens</target>
 
-<source>Synchronizing...</source>
-<target>Sincronizando...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimizar para a área de notificação</target>
-
 <source>When finished:</source>
 <target>Quando concluído:</target>
 
@@ -1363,6 +1369,12 @@ Isto garante um estado consistente mesmo em caso de erro grave.
 <source>&Delete logs after x days:</source>
 <target>&Excluir logs após x days:</target>
 
+<source>Notification sounds:</source>
+<target>Sons de notificação:</target>
+
+<source>Synchronization finished:</source>
+<target>Sincronização concluída:</target>
+
 <source>Customize context menu:</source>
 <target>Personalizar menu de contexto:</target>
 
@@ -1513,33 +1525,6 @@ Isto garante um estado consistente mesmo em caso de erro grave.
 <source>&Execute</source>
 <target>&Executar</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 diretório</pluralform>
-<pluralform>%x diretórios</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 arquivo</pluralform>
-<pluralform>%x arquivos</pluralform>
-</target>
-
-<source>
-<pluralform>Showing %y of 1 row</pluralform>
-<pluralform>Showing %y of %x rows</pluralform>
-</source>
-<target>
-<pluralform>Mostrando %y de 1 coluna</pluralform>
-<pluralform>Mostrando %y de %x colunas</pluralform>
-</target>
-
 <source>Set direction:</source>
 <target>Configurar direção:</target>
 
@@ -1567,12 +1552,6 @@ Isto garante um estado consistente mesmo em caso de erro grave.
 <source>&Delete</source>
 <target>&Apagar</target>
 
-<source>Include all</source>
-<target>Incluir todos</target>
-
-<source>Exclude all</source>
-<target>Excluir todos</target>
-
 <source>Show icons:</source>
 <target>Mostrar ícones:</target>
 
@@ -1609,6 +1588,21 @@ Isto garante um estado consistente mesmo em caso de erro grave.
 <source>Do&n't save</source>
 <target>&Não salvar</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x não pode ser renomeado.</target>
+
+<source>New name:</source>
+<target>Novo nome:</target>
+
+<source>Rename Configuration</source>
+<target>Renomear Configuração</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Nome da configuração não pode ser vazio.</target>
+
+<source>&Rename...</source>
+<target>&Renomear...</target>
+
 <source>Hide configuration</source>
 <target>Ocultar configuração</target>
 
@@ -1669,6 +1663,33 @@ Isto garante um estado consistente mesmo em caso de erro grave.
 <source>All files are in sync</source>
 <target>Todos os arquivos estão sincronizados</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 diretório</pluralform>
+<pluralform>%x diretórios</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 arquivo</pluralform>
+<pluralform>%x arquivos</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>Mostrando %y de 1 coluna</pluralform>
+<pluralform>Mostrando %y de %x colunas</pluralform>
+</target>
+
 <source>Cannot find %x</source>
 <target>Não é possível localizar %x</target>
 
@@ -1720,8 +1741,8 @@ Isto garante um estado consistente mesmo em caso de erro grave.
 <source>Password:</source>
 <target>Senha:</target>
 
-<source>Key password:</source>
-<target>Senha da chave:</target>
+<source>Key passphrase:</source>
+<target>Frase-senha da chave:</target>
 
 <source>Please enter a file path.</source>
 <target>Por favor, insira um caminho de arquivo.</target>
@@ -1885,6 +1906,9 @@ Isto garante um estado consistente mesmo em caso de erro grave.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>A contagem mínima de versões deve ser menor do que a contagem máxima.</target>
 
+<source>&Restore</source>
+<target>&Restaurar</target>
+
 <source>Files</source>
 <target>Arquivos</target>
 
@@ -1951,6 +1975,9 @@ Isto garante um estado consistente mesmo em caso de erro grave.
 <source>The file is locked by another process:</source>
 <target>O arquivo está bloqueado por outro processo:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Falha ao determinar o suporte de permissão de arquivo para a pasta %x.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Não é possível ler o contexto de segurança de %x.</target>
 
@@ -2002,12 +2029,12 @@ Isto garante um estado consistente mesmo em caso de erro grave.
 <source>Cannot change process I/O priorities.</source>
 <target>Não é possível alterar a prioridade de E/S do processo.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Não foi possível desligar o sistema.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Verificando falha na Lixeira para pasta %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Não foi possível desligar o sistema.</target>
+
 <source>Prepare installation</source>
 <target>Preparando a instalação</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/romanian.lng b/FreeFileSync/Build/Resources/Languages/romanian.lng
index db5f3093..fe270fee 100755
--- a/FreeFileSync/Build/Resources/Languages/romanian.lng
+++ b/FreeFileSync/Build/Resources/Languages/romanian.lng
@@ -7,6 +7,157 @@
 	<plural_definition>n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>Nu pot citi fila %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Mărime neașteptată a fluxului de date.
+Așteptată: %x baiți
+Actuală: %y baiți
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Nu pot scrie fila %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Nu pot scrie permisiunile lui %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Operația nu-i suportată între dispozitive de stocare diferite.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Nu pot șterge fila %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Nu pot șterge legătura simbolică %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Nu pot șterge dosarul %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Nu pot muta fila %x în %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Nu pot copia legătura simbolică %x în %y.</target>
+
+<source>Error Code %x</source>
+<target>Cod de Eroare %x.</target>
+
+<source>Cannot read directory %x.</source>
+<target>Nu pot citi dosarul %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Nu pot scrie modificarea timpului pentru %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Nu pot citi atributele filei %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Nu pot crea dosarul %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Nu pot determina calea finală pentru %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Operația nu-i suportată de dispozitivul de stocare.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Nu pot rezolva legătura simbolică %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Nu pot muta %x în Reciclator.</target>
+
+<source>Authentication completed.</source>
+<target>Autentificare realizată.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Poți închide pagina asta acum și continua cu FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Autentificare eșuată.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Nu mă pot conecta la %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Nu pot găsi %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>Numele %x e folosit de mai multe elemente din dosar.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Autorizează accesul la contul de utilizator %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Nu pot deschide fila %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>Numele %x este deja utilizat de alt element.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Nu pot determina spațiul liber de stocare pentru %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Nu pot face deconectarea de la %x.</target>
+
+<source>Unable to access %x.</source>
+<target>Nu pot accesa %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>N-am putut obține informații despre serverul %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Nu pot monitoriza dosarul %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Nu pot găsi dispozitivul %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Nu pot deschide dosarul %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Tip de element nesuportat.</target>
+
+<source>Incorrect command line:</source>
+<target>Linie de comandă incorectă:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>Serverul nu suportă autentificarea prin %x.</target>
+
+<source>Required:</source>
+<target>Necesar:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Operație expirată după 1 secundă.</pluralform>
+<pluralform>Operație expirată după %x secunde.</pluralform>
+<pluralform>Operație expirată după %x de secunde.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Nu pot aștepta după mai mult de 1 conexiune simultan.</pluralform>
+<pluralform>Nu pot aștepta după mai mult de %x conexiuni simultan.</pluralform>
+<pluralform>Nu pot aștepta după mai mult de %x de conexiuni simultan.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Conexiuni Active: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>N-am putut deschide canalul SFTP cu numărul %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Ambele părți s-au modificat de la ultima sincronizare.</target>
 
@@ -109,9 +260,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Filele de instalare sînt stricate (corupte). Reinstalează FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Nu pot deschide fila %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Nu pot găsi dosarele următoare:</target>
 
@@ -140,6 +288,9 @@
 <pluralform>%x de elemente găsite</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Timp Scurs:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Fila %x are o dată nevalidă.</target>
 
@@ -158,9 +309,6 @@
 <source>Items differ in attributes only</source>
 <target>Elementele diferă doar prin atributele lor</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>Numele %x e folosit de mai multe elemente din dosar.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Rezolv legătura simbolică %x</target>
 
@@ -221,6 +369,15 @@
 <source>Out of memory.</source>
 <target>Memorie epuizată.</target>
 
+<source>Show in Explorer</source>
+<target>Arată în Exploratorul de File</target>
+
+<source>Open with default application</source>
+<target>Deschide cu Aplicația Implicită</target>
+
+<source>Browse directory</source>
+<target>Explorează Dosarul</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Fila cu baza de date %x este incompatibilă.</target>
 
@@ -233,12 +390,6 @@
 <source>Database file is corrupted:</source>
 <target>Fila bazei de date este stricată (coruptă):</target>
 
-<source>Cannot write file %x.</source>
-<target>Nu pot scrie fila %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Nu pot citi fila %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Filele cu baze de date nu conțin încă informații despre ultima sincornizare.</target>
 
@@ -257,9 +408,6 @@
 <source>Cannot get process information.</source>
 <target>Nu pot obține informații despre proces.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Nu pot citi atributele filei %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Aștept ca dosarul să fie zăvorît [locked]:</target>
 
@@ -333,6 +481,27 @@
 <source>Update attributes on right</source>
 <target>Actualizează atributele în partea dreaptă</target>
 
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Eroare la parsarea filei %x, rîndul %y, coloana %z.</target>
+
+<source>Services</source>
+<target>Servicii</target>
+
+<source>Show All</source>
+<target>Arată Tot</target>
+
+<source>Hide Others</source>
+<target>Ascunde Restul</target>
+
+<source>Hide %x</source>
+<target>Ascunde %x</target>
+
+<source>Quit %x</source>
+<target>Închide %x</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>Nu pot seta zăvorîrea [lock] pentru dosarele următoare:</target>
+
 <source>Errors:</source>
 <target>Erori:</target>
 
@@ -357,27 +526,6 @@
 <source>Cleaning up log files:</source>
 <target>Curăț filele de jurnalizare:</target>
 
-<source>Error parsing file %x, row %y, column %z.</source>
-<target>Eroare la parsarea filei %x, rîndul %y, coloana %z.</target>
-
-<source>Services</source>
-<target>Servicii</target>
-
-<source>Show All</source>
-<target>Arată Tot</target>
-
-<source>Hide Others</source>
-<target>Ascunde Restul</target>
-
-<source>Hide %x</source>
-<target>Ascunde %x</target>
-
-<source>Quit %x</source>
-<target>Închide %x</target>
-
-<source>Cannot set directory locks for the following folders:</source>
-<target>Nu pot seta zăvorîrea [lock] pentru dosarele următoare:</target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
@@ -388,27 +536,12 @@
 <pluralform>%x de fire</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Nu pot citi dosarul %x.</target>
-
 <source>%x/sec</source>
 <target>%x/sec</target>
 
 <source>%x items</source>
 <target>%x elemente</target>
 
-<source>Show in Explorer</source>
-<target>Arată în Exploratorul de File</target>
-
-<source>Open with default application</source>
-<target>Deschide cu Aplicația Implicită</target>
-
-<source>Browse directory</source>
-<target>Explorează Dosarul</target>
-
-<source>Unable to connect to %x.</source>
-<target>Nu mă pot conecta la %x.</target>
-
 <source>Completed successfully</source>
 <target>Realizată cu succes</target>
 
@@ -454,9 +587,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Nu pot scrie atributele de filă ale lui %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Nu pot deschide fila %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x și %y au conținut diferit.</target>
 
@@ -487,29 +617,20 @@
 <source>Source item %x not found</source>
 <target>Elementul sursă %x n-a fost găsit</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Nu pot muta fila %x în %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Dosarul părinte %x nu există.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>Numele %x este deja utilizat de alt element.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Nu pot copia fila %x în %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Nu pot copia legătura simbolică %x în %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Creez o Conservare a Volumului [Volume Shadow Copy] pentru %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Nu pot găsi dosarul %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Dosarul țintă %x există deja.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Dosarul țintă %x există deja, dar n-a fost disponibil în timpul comparării dosarelor.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Cîmpul de introducere a dosarului țintă nu trebuie să fie gol.</target>
@@ -532,17 +653,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Spațiu de stocare insuficient pe:</target>
 
-<source>Required:</source>
-<target>Necesar:</target>
-
 <source>Available:</source>
 <target>Disponibil:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Anumite file vor fi sincronizate ca parte din dosare de bază multiple.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Pentru a evita conflictele, setează filtrele de excludere astfel ca fiecare filă actualizată e considerată ca aparținînd unui singur dosar de bază.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Pentru a evita conflictele, setează filtrele de excludere astfel ca fiecare filă actualizată să fie inclusă doar într-un singur dosar de bază.</target>
 
 <source>Versioning folder:</source>
 <target>Dosar de Versionare:</target>
@@ -568,124 +686,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Nu pot crea marcajul de timp pentru versionare:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Mărime neașteptată a fluxului de date.
-Așteptată: %x baiți
-Actuală: %y baiți
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Nu pot scrie permisiunile lui %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Operația nu-i suportată între dispozitive de stocare diferite.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Nu pot șterge fila %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Nu pot șterge legătura simbolică %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Nu pot șterge dosarul %x.</target>
-
-<source>Error Code %x</source>
-<target>Cod de Eroare %x.</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Nu pot scrie modificarea timpului pentru %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Nu pot crea dosarul %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Nu pot determina calea finală pentru %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Operația nu-i suportată de dispozitivul de stocare.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Nu pot rezolva legătura simbolică %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Nu pot muta %x în Reciclator.</target>
-
-<source>Authentication completed.</source>
-<target>Autentificare realizată.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Poți închide pagina asta acum și continua cu FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Autentificare eșuată.</target>
-
-<source>Cannot find %x.</source>
-<target>Nu pot găsi %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Autorizează accesul la contul de utilizator %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Nu pot determina spațiul liber de stocare pentru %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Nu pot face deconectarea de la %x.</target>
-
-<source>Unable to access %x.</source>
-<target>Nu pot accesa %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>N-am putut obține informații despre serverul %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Nu pot monitoriza dosarul %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Nu pot găsi dispozitivul %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Nu pot deschide dosarul %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Tip de element nesuportat.</target>
-
-<source>Incorrect command line:</source>
-<target>Linie de comandă incorectă:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>Serverul nu suportă autentificarea prin %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Operație expirată după 1 secundă.</pluralform>
-<pluralform>Operație expirată după %x secunde.</pluralform>
-<pluralform>Operație expirată după %x de secunde.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Nu pot aștepta după mai mult de 1 conexiune simultan.</pluralform>
-<pluralform>Nu pot aștepta după mai mult de %x conexiuni simultan.</pluralform>
-<pluralform>Nu pot aștepta după mai mult de %x de conexiuni simultan.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Conexiuni Active: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>N-am putut deschide canalul SFTP cu numărul %x.</target>
-
 <source>Drag && drop</source>
 <target>Trage și pune un dosar mai jos sau explorează către el</target>
 
@@ -752,6 +752,9 @@ Actuală: %y baiți
 <source>Command line:</source>
 <target>Linie de comandă:</target>
 
+<source>&Hide console window</source>
+<target>Ascun&de fereastra consolei</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -787,8 +790,8 @@ Comanda este declanșată dacă:
 <source>Waiting until directory is available:</source>
 <target>Aștept pînă cînd dosarul va fi disponibil:</target>
 
-<source>&Restore</source>
-<target>&Restaurează</target>
+<source>&Configure</source>
+<target>&Configurează</target>
 
 <source>&Show error message</source>
 <target>A&rată mesajele de eroare</target>
@@ -824,8 +827,8 @@ Comanda este declanșată dacă:
 <source>Scanning...</source>
 <target>Scanez...</target>
 
-<source>job name</source>
-<target>numele sarcinii</target>
+<source>configuration file</source>
+<target>filă de configurare</target>
 
 <source>System: Sleep</source>
 <target>Sistem: Pune în Repaus [Sleep]</target>
@@ -836,8 +839,8 @@ Comanda este declanșată dacă:
 <source>Nothing to synchronize</source>
 <target>Nu e nimic de sincronizat</target>
 
-<source>Executing command %x</source>
-<target>Execut comanda %x</target>
+<source>Executing command:</source>
+<target>Execut comanda:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Poți comuta la fereastra principală FreeFileSync pentru a rezolva această problemă.</target>
@@ -1038,6 +1041,12 @@ Comanda este declanșată dacă:
 <source>Match case</source>
 <target>Potrivește cu caseta literelor (MAJ/min)</target>
 
+<source>Processed:</source>
+<target>Procesat:</target>
+
+<source>Remaining:</source>
+<target>Rămas:</target>
+
 <source>New</source>
 <target>Nouă</target>
 
@@ -1274,14 +1283,17 @@ Comanda este declanșată dacă:
 <source>&Don't show this dialog again</source>
 <target>Nu arăta acest &dialog din nou</target>
 
-<source>Items found:</source>
-<target>Elemente Găsite:</target>
+<source>Bytes:</source>
+<target>Baiți:</target>
 
-<source>Time remaining:</source>
-<target>Timp Rămas:</target>
+<source>Items:</source>
+<target>Elemente:</target>
 
-<source>Time elapsed:</source>
-<target>Timp Scurs:</target>
+<source>Synchronizing...</source>
+<target>Sincronizare Aflată în Curs...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimizează în aria de notificare (sertar)</target>
 
 <source>Bytes</source>
 <target>Baiți</target>
@@ -1289,12 +1301,6 @@ Comanda este declanșată dacă:
 <source>Items</source>
 <target>Elemente</target>
 
-<source>Synchronizing...</source>
-<target>Sincronizare Aflată în Curs...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimizează în aria de notificare (sertar)</target>
-
 <source>When finished:</source>
 <target>La terminare:</target>
 
@@ -1370,6 +1376,12 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției
 <source>&Delete logs after x days:</source>
 <target>Șter&ge jurnalul după x zile:</target>
 
+<source>Notification sounds:</source>
+<target>Sunete de notificare:</target>
+
+<source>Synchronization finished:</source>
+<target>Sincronizare terminată:</target>
+
 <source>Customize context menu:</source>
 <target>Personalizează meniul contextual:</target>
 
@@ -1521,36 +1533,6 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției
 <source>&Execute</source>
 <target>&Execută</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 dosar</pluralform>
-<pluralform>%x dosare</pluralform>
-<pluralform>%x de dosare</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 filă</pluralform>
-<pluralform>%x file</pluralform>
-<pluralform>%x de file</pluralform>
-</target>
-
-<source>
-<pluralform>Showing %y of 1 row</pluralform>
-<pluralform>Showing %y of %x rows</pluralform>
-</source>
-<target>
-<pluralform>Afișate: %y din 1 rînd</pluralform>
-<pluralform>Afișate: %y din %x rînduri</pluralform>
-<pluralform>Afișate: %y din %x de rînduri</pluralform>
-</target>
-
 <source>Set direction:</source>
 <target>Setează Acțiunea ca în Icoana Alăturată:</target>
 
@@ -1578,12 +1560,6 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției
 <source>&Delete</source>
 <target>Șter&ge</target>
 
-<source>Include all</source>
-<target>Include Tot</target>
-
-<source>Exclude all</source>
-<target>Exclude Tot</target>
-
 <source>Show icons:</source>
 <target>Arată Icoane:</target>
 
@@ -1620,6 +1596,21 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției
 <source>Do&n't save</source>
 <target>&Nu salva</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x nu poate fi renumit.</target>
+
+<source>New name:</source>
+<target>Nume nou:</target>
+
+<source>Rename Configuration</source>
+<target>Renumește Configurația</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Numele configurației nu poate lipsi.</target>
+
+<source>&Rename...</source>
+<target>&Renumește...</target>
+
 <source>Hide configuration</source>
 <target>Ascunde Configurația</target>
 
@@ -1680,6 +1671,36 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției
 <source>All files are in sync</source>
 <target>Toate filele sînt sincronizate</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 dosar</pluralform>
+<pluralform>%x dosare</pluralform>
+<pluralform>%x de dosare</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 filă</pluralform>
+<pluralform>%x file</pluralform>
+<pluralform>%x de file</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>Afișate: %y din 1 rînd</pluralform>
+<pluralform>Afișate: %y din %x rînduri</pluralform>
+<pluralform>Afișate: %y din %x de rînduri</pluralform>
+</target>
+
 <source>Cannot find %x</source>
 <target>Nu pot găsi %x</target>
 
@@ -1731,8 +1752,8 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției
 <source>Password:</source>
 <target>Parolă:</target>
 
-<source>Key password:</source>
-<target>Parola Cheie:</target>
+<source>Key passphrase:</source>
+<target>Parola cheii:</target>
 
 <source>Please enter a file path.</source>
 <target>Introdu calea filei.</target>
@@ -1899,6 +1920,9 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Numărul minim al versiunii trebuie să fie mai mic decît numărul maxim.</target>
 
+<source>&Restore</source>
+<target>&Restaurează</target>
+
 <source>Files</source>
 <target>File</target>
 
@@ -1965,6 +1989,9 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției
 <source>The file is locked by another process:</source>
 <target>Fila este zăvorîtă [locked] de alt proces:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Eșec al determinării existenței suportului pentru permisiuni la dosarul %x.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Nu pot citi contextul de securitate pentru %x.</target>
 
@@ -2018,12 +2045,12 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției
 <source>Cannot change process I/O priorities.</source>
 <target>Nu pot schimba prioritățile I/O ale procesului.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Nu pot închide sistemul.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Verificarea disponibilității Reciclatorului a eșuat pentru dosarul %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Nu pot închide sistemul.</target>
+
 <source>Prepare installation</source>
 <target>Pregătirea Instalării</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/russian.lng b/FreeFileSync/Build/Resources/Languages/russian.lng
index 7bc51a60..1330bb21 100755
--- a/FreeFileSync/Build/Resources/Languages/russian.lng
+++ b/FreeFileSync/Build/Resources/Languages/russian.lng
@@ -7,6 +7,157 @@
 	<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>Cannot read file %x.</source>
+<target>Невозможно прочитать файл %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Неожиданный размер потока данных.
+Ожидаемый: %x байт
+Фактический: %y байт
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Невозможно записать файл %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Невозможно записать права доступа %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Операция не поддерживается между различными устройствами.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Невозможно удалить файл %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Невозможно удалить символьную ссылку %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Невозможно удалить папку %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Невозможно перенести файл %x в %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Невозможно скопировать символьную ссылку %x в %y.</target>
+
+<source>Error Code %x</source>
+<target>Код ошибки %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>Невозможно прочитать папку %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Невозможно записать время изменения файла %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Невозможно прочитать атрибуты файла %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Невозможно создать папку %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Невозможно определить конечный путь для %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Операция не поддерживается устройством.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Невозможно разрешить символьную ссылку %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Невозможно переместить %x в "Корзину".</target>
+
+<source>Authentication completed.</source>
+<target>Аутентификация завершена.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Вы можете закрыть эту страницу сейчас и продолжить с FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Ошибка аутентификации.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Невозможно соединиться с %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Невозможно найти %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>Имя %x используется более чем одним элементом в папке.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Пожалуйста, авторизуйте доступ к учетной записи пользователя %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Невозможно открыть файл %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>Имя %x уже используется другим элементом.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Невозможно определить свободное место на диске для %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Невозможно отключиться от %x.</target>
+
+<source>Unable to access %x.</source>
+<target>Невозможно получить доступ к %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Не удалось получить информацию о сервере %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Невозможно отследить папку %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Невозможно найти устройство %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Невозможно открыть папку %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Неподдерживаемый тип элемента.</target>
+
+<source>Incorrect command line:</source>
+<target>Неверная командная строка:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>Сервер не поддерживает аутентификацию с помощью %x.</target>
+
+<source>Required:</source>
+<target>Требуется:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Время ожидания соединения истекает через %x сукунду.</pluralform>
+<pluralform>Время ожидания соединения истекает через %x сукунды.</pluralform>
+<pluralform>Время ожидания соединения истекает через %x сукунд.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Невозможно обработать более %x соединения за раз.</pluralform>
+<pluralform>Невозможно обработать более %x соединений за раз.</pluralform>
+<pluralform>Невозможно обработать более %x соединений за раз.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Активные соединения: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Не удалось открыть SFTP канал номер %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Со времени последней синхронизации с обеих сторон произошли изменения.</target>
 
@@ -109,9 +260,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Установочные файлы повреждены. Переустановите FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Невозможно загрузить файл %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Невозможно найти следующие папки:</target>
 
@@ -140,6 +288,9 @@
 <pluralform>%x элементов найдено</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Времени прошло:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Файл %x имеет недействительную дату.</target>
 
@@ -158,9 +309,6 @@
 <source>Items differ in attributes only</source>
 <target>Элементы различаются только атрибутами</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>Имя %x используется более чем одним элементом в папке.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Разрешение символьной ссылки %x</target>
 
@@ -221,6 +369,15 @@
 <source>Out of memory.</source>
 <target>Недостаточно памяти.</target>
 
+<source>Show in Explorer</source>
+<target>Показать в Проводнике</target>
+
+<source>Open with default application</source>
+<target>Открыть с помощью приложения по умолчанию</target>
+
+<source>Browse directory</source>
+<target>Обзор папок</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Файл базы данных %x несовместим.</target>
 
@@ -233,12 +390,6 @@
 <source>Database file is corrupted:</source>
 <target>Файл базы данных поврежден:</target>
 
-<source>Cannot write file %x.</source>
-<target>Невозможно записать файл %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Невозможно прочитать файл %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Файлы базы данных еще не содержат информацию о последней синхронизации.</target>
 
@@ -257,9 +408,6 @@
 <source>Cannot get process information.</source>
 <target>Невозможно получить информацию о процессе.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Невозможно прочитать атрибуты файла %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Ожидание снятия блокировки с папки:</target>
 
@@ -388,27 +536,12 @@
 <pluralform>%x потоков</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Невозможно прочитать папку %x.</target>
-
 <source>%x/sec</source>
 <target>%x/с</target>
 
 <source>%x items</source>
 <target>%x элемент(ов)</target>
 
-<source>Show in Explorer</source>
-<target>Показать в Проводнике</target>
-
-<source>Open with default application</source>
-<target>Открыть с помощью приложения по умолчанию</target>
-
-<source>Browse directory</source>
-<target>Обзор папок</target>
-
-<source>Unable to connect to %x.</source>
-<target>Невозможно соединиться с %x.</target>
-
 <source>Completed successfully</source>
 <target>Выполнено успешно</target>
 
@@ -454,9 +587,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Невозможно записать атрибуты файла %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Невозможно открыть файл %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x и %y имеют разное содержание.</target>
 
@@ -487,29 +617,20 @@
 <source>Source item %x not found</source>
 <target>Исходный элемент %x не найден</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Невозможно перенести файл %x в %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Родительская папка %x не существует.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>Имя %x уже используется другим элементом.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Невозможно скопировать файл %x в %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Невозможно скопировать символьную ссылку %x в %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Создание Тома Теневого Копирования для %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Невозможно найти папку %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Целевая папка %x уже существует.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Целевая папка %x уже существует, но не была доступна во время сравнения папок.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Поле ввода целевой папки не должно быть пустым.</target>
@@ -532,17 +653,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Не достаточно свободного места в:</target>
 
-<source>Required:</source>
-<target>Требуется:</target>
-
 <source>Available:</source>
 <target>Доступно:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Некоторые файлы будут синхронизированы как часть нескольких базовых папок.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Чтобы избежать конфликтов, настройте фильтры исключения так, чтобы каждый обновленный файл учитывался только одной базовой папкой.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Чтобы избежать конфликтов, настройте фильтры исключения, чтобы каждый обновленный файл включался только в одну базовую папку.</target>
 
 <source>Versioning folder:</source>
 <target>Папка для архивирования файлов:</target>
@@ -568,124 +686,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Невозможно создать метку времени для архивирования файлов:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Неожиданный размер потока данных.
-Ожидаемый: %x байт
-Фактический: %y байт
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Невозможно записать права доступа %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Операция не поддерживается между различными устройствами.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Невозможно удалить файл %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Невозможно удалить символьную ссылку %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Невозможно удалить папку %x.</target>
-
-<source>Error Code %x</source>
-<target>Код ошибки %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Невозможно записать время изменения файла %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Невозможно создать папку %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Невозможно определить конечный путь для %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Операция не поддерживается устройством.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Невозможно разрешить символьную ссылку %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Невозможно переместить %x в "Корзину".</target>
-
-<source>Authentication completed.</source>
-<target>Аутентификация завершена.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Вы можете закрыть эту страницу сейчас и продолжить с FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Ошибка аутентификации.</target>
-
-<source>Cannot find %x.</source>
-<target>Невозможно найти %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Пожалуйста, авторизуйте доступ к учетной записи пользователя %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Невозможно определить свободное место на диске для %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Невозможно отключиться от %x.</target>
-
-<source>Unable to access %x.</source>
-<target>Невозможно получить доступ к %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Не удалось получить информацию о сервере %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Невозможно отследить папку %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Невозможно найти устройство %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Невозможно открыть папку %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Неподдерживаемый тип элемента.</target>
-
-<source>Incorrect command line:</source>
-<target>Неверная командная строка:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>Сервер не поддерживает аутентификацию с помощью %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Время ожидания соединения истекает через %x сукунду.</pluralform>
-<pluralform>Время ожидания соединения истекает через %x сукунды.</pluralform>
-<pluralform>Время ожидания соединения истекает через %x сукунд.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Невозможно обработать более %x соединения за раз.</pluralform>
-<pluralform>Невозможно обработать более %x соединений за раз.</pluralform>
-<pluralform>Невозможно обработать более %x соединений за раз.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Активные соединения: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Не удалось открыть SFTP канал номер %x.</target>
-
 <source>Drag && drop</source>
 <target>Drag && drop</target>
 
@@ -752,6 +752,9 @@ Actual: %y bytes
 <source>Command line:</source>
 <target>Командная строка:</target>
 
+<source>&Hide console window</source>
+<target>&Скрыть окно консоли</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -787,8 +790,8 @@ The command is triggered if:
 <source>Waiting until directory is available:</source>
 <target>Ожидание доступа к папке:</target>
 
-<source>&Restore</source>
-<target>&Восстановить</target>
+<source>&Configure</source>
+<target>&Настроить</target>
 
 <source>&Show error message</source>
 <target>&Показать сообщение об ошибке</target>
@@ -824,8 +827,8 @@ The command is triggered if:
 <source>Scanning...</source>
 <target>Сканирование...</target>
 
-<source>job name</source>
-<target>название</target>
+<source>configuration file</source>
+<target>конфигурационный файл</target>
 
 <source>System: Sleep</source>
 <target>Система: Спящий режим</target>
@@ -836,8 +839,8 @@ The command is triggered if:
 <source>Nothing to synchronize</source>
 <target>Ничего нет для синхронизации</target>
 
-<source>Executing command %x</source>
-<target>Выполнение команды %x</target>
+<source>Executing command:</source>
+<target>Выполнение команды:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Вы можете переключиться на главное окно FreeFileSync для решения этой проблемы.</target>
@@ -1038,6 +1041,12 @@ The command is triggered if:
 <source>Match case</source>
 <target>Учитывать регистр</target>
 
+<source>Processed:</source>
+<target>Обработано:</target>
+
+<source>Remaining:</source>
+<target>Осталось:</target>
+
 <source>New</source>
 <target>Новая</target>
 
@@ -1274,14 +1283,17 @@ The command is triggered if:
 <source>&Don't show this dialog again</source>
 <target>Больше &не показывать это окно</target>
 
-<source>Items found:</source>
-<target>Элементов найдено:</target>
+<source>Bytes:</source>
+<target>Байт:</target>
 
-<source>Time remaining:</source>
-<target>Времени осталось:</target>
+<source>Items:</source>
+<target>Элементов:</target>
 
-<source>Time elapsed:</source>
-<target>Времени прошло:</target>
+<source>Synchronizing...</source>
+<target>Синхронизация...</target>
+
+<source>Minimize to notification area</source>
+<target>Свернуть в область уведомлений</target>
 
 <source>Bytes</source>
 <target>Байт</target>
@@ -1289,12 +1301,6 @@ The command is triggered if:
 <source>Items</source>
 <target>Элементов</target>
 
-<source>Synchronizing...</source>
-<target>Синхронизация...</target>
-
-<source>Minimize to notification area</source>
-<target>Свернуть в область уведомлений</target>
-
 <source>When finished:</source>
 <target>По завершении:</target>
 
@@ -1370,6 +1376,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete logs after x days:</source>
 <target>&Удаление журналов через x дней:</target>
 
+<source>Notification sounds:</source>
+<target>Звуки уведомлений:</target>
+
+<source>Synchronization finished:</source>
+<target>Синхронизация окончена:</target>
+
 <source>Customize context menu:</source>
 <target>Кастомизация контекстного меню:</target>
 
@@ -1578,12 +1590,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete</source>
 <target>&Удалить...</target>
 
-<source>Include all</source>
-<target>Включить все</target>
-
-<source>Exclude all</source>
-<target>Исключить все</target>
-
 <source>Show icons:</source>
 <target>Отображать иконки:</target>
 
@@ -1620,6 +1626,21 @@ This guarantees a consistent state even in case of a serious error.
 <source>Do&n't save</source>
 <target>&Не сохранять</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x не может быть переименована.</target>
+
+<source>New name:</source>
+<target>Новое имя:</target>
+
+<source>Rename Configuration</source>
+<target>Переименовать конфигурацию</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Имя конфигурации не должно быть пустым.</target>
+
+<source>&Rename...</source>
+<target>&Переименовать...</target>
+
 <source>Hide configuration</source>
 <target>Удалить конфигурацию из списка</target>
 
@@ -1731,8 +1752,8 @@ This guarantees a consistent state even in case of a serious error.
 <source>Password:</source>
 <target>Пароль:</target>
 
-<source>Key password:</source>
-<target>Пароль:</target>
+<source>Key passphrase:</source>
+<target>Ключ парольной фразы:</target>
 
 <source>Please enter a file path.</source>
 <target>Пожалуйста, укажите путь к файлу.</target>
@@ -1899,6 +1920,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Минимальное количество версий должно быть меньше максимального количества версий.</target>
 
+<source>&Restore</source>
+<target>&Восстановить</target>
+
 <source>Files</source>
 <target>Файлы</target>
 
@@ -1965,6 +1989,9 @@ This guarantees a consistent state even in case of a serious error.
 <source>The file is locked by another process:</source>
 <target>Файл заблокирован другим процессом:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Не удалось определить поддержку разрешения файла для папки %x.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Невозможно прочитать контекст безопасности %x.</target>
 
@@ -2018,12 +2045,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>Cannot change process I/O priorities.</source>
 <target>Невозможно изменить приоритет процесса.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Невозможно завершить работу системы.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Проверка "Корзины" не удалась для папки %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Невозможно завершить работу системы.</target>
+
 <source>Prepare installation</source>
 <target>Подготовка установки</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/slovak.lng b/FreeFileSync/Build/Resources/Languages/slovak.lng
index 1255109c..0d896e51 100755
--- a/FreeFileSync/Build/Resources/Languages/slovak.lng
+++ b/FreeFileSync/Build/Resources/Languages/slovak.lng
@@ -481,6 +481,27 @@ Aktuálne: %y b
 <source>Update attributes on right</source>
 <target>Aktualizovať atribúty napravo</target>
 
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Chyba spracovania súboru %x: na riadku %y v stĺpci %z.</target>
+
+<source>Services</source>
+<target>Služby</target>
+
+<source>Show All</source>
+<target>Zobraziť Všetko</target>
+
+<source>Hide Others</source>
+<target>Skryť Ostatné</target>
+
+<source>Hide %x</source>
+<target>Skryť %x</target>
+
+<source>Quit %x</source>
+<target>Ukončiť %x</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>Nie je možné nastaviť uzamknutie adresárov pre nasledujúce priečinky:</target>
+
 <source>Errors:</source>
 <target>Chyby:</target>
 
@@ -505,27 +526,6 @@ Aktuálne: %y b
 <source>Cleaning up log files:</source>
 <target>Odstránenie log súborov:</target>
 
-<source>Error parsing file %x, row %y, column %z.</source>
-<target>Chyba spracovania súboru %x: na riadku %y v stĺpci %z.</target>
-
-<source>Services</source>
-<target>Služby</target>
-
-<source>Show All</source>
-<target>Zobraziť Všetko</target>
-
-<source>Hide Others</source>
-<target>Skryť Ostatné</target>
-
-<source>Hide %x</source>
-<target>Skryť %x</target>
-
-<source>Quit %x</source>
-<target>Ukončiť %x</target>
-
-<source>Cannot set directory locks for the following folders:</source>
-<target>Nie je možné nastaviť uzamknutie adresárov pre nasledujúce priečinky:</target>
-
 <source>
 <pluralform>1 thread</pluralform>
 <pluralform>%x threads</pluralform>
@@ -629,8 +629,8 @@ Aktuálne: %y b
 <source>Cannot find folder %x.</source>
 <target>Nie je možné nájsť priečinok %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Cieľový priečinok %x už existuje.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Cielová zložka %x už existuje, ale nebola dostupná počas porovnávania súborov.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Cieľový priečinok nesmie byť prázdny.</target>
@@ -659,8 +659,8 @@ Aktuálne: %y b
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Niektoré súbory budú synchronizované ako súčasť viacerých základných priečinkov.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Aby nedošlo ku konfliktom, je potrebné nastaviť filter tak, aby každý aktualiz. súbor mal iba jeden základný priečinok.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Pre zabránenie konfliktu, nastavte filter vylúčenia tak, aby bol každý súbor zahrnutý iba v jednom základnom priečinku.</target>
 
 <source>Versioning folder:</source>
 <target>Priečinok verzovania:</target>
@@ -827,8 +827,8 @@ Príkaz bude spustení ak:
 <source>Scanning...</source>
 <target>Vyhľadávanie...</target>
 
-<source>job name</source>
-<target>názov úlohy</target>
+<source>configuration file</source>
+<target>konfiguračný súbor</target>
 
 <source>System: Sleep</source>
 <target>Systém: Uspať</target>
@@ -1041,6 +1041,12 @@ Príkaz bude spustení ak:
 <source>Match case</source>
 <target>Rozlišovať malé a veľké písmená</target>
 
+<source>Processed:</source>
+<target>Spracované:</target>
+
+<source>Remaining:</source>
+<target>Zostáva:</target>
+
 <source>New</source>
 <target>Nový</target>
 
@@ -1277,17 +1283,11 @@ Príkaz bude spustení ak:
 <source>&Don't show this dialog again</source>
 <target>Tento dialog už &nezobrazovať</target>
 
-<source>Items found:</source>
-<target>Nájdených položiek:</target>
-
-<source>Time remaining:</source>
-<target>Zostávajúci čas:</target>
+<source>Bytes:</source>
+<target>Bajtov:</target>
 
-<source>Bytes</source>
-<target>Bytov</target>
-
-<source>Items</source>
-<target>Položky</target>
+<source>Items:</source>
+<target>Položky:</target>
 
 <source>Synchronizing...</source>
 <target>Synchronizujem...</target>
@@ -1295,6 +1295,12 @@ Príkaz bude spustení ak:
 <source>Minimize to notification area</source>
 <target>Minimalizovať do oznamovacej oblasti</target>
 
+<source>Bytes</source>
+<target>Bytov</target>
+
+<source>Items</source>
+<target>Položky</target>
+
 <source>When finished:</source>
 <target>Po dokončení:</target>
 
@@ -1367,6 +1373,12 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Delete logs after x days:</source>
 <target>&Zmazať log po x dňoch:</target>
 
+<source>Notification sounds:</source>
+<target>Zvuk oznámenia:</target>
+
+<source>Synchronization finished:</source>
+<target>Synchronizácia dokončená:</target>
+
 <source>Customize context menu:</source>
 <target>Prispôsobiť kontextovú ponuku:</target>
 
@@ -1518,36 +1530,6 @@ This guarantees a consistent state even in case of a serious error.
 <source>&Execute</source>
 <target>&Spustiť</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 adresár</pluralform>
-<pluralform>%x adresáre</pluralform>
-<pluralform>%x adresárov</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 súbor</pluralform>
-<pluralform>%x súbory</pluralform>
-<pluralform>%x súborov</pluralform>
-</target>
-
-<source>
-<pluralform>Showing %y of 1 row</pluralform>
-<pluralform>Showing %y of %x rows</pluralform>
-</source>
-<target>
-<pluralform>Zobrazenie %y z 1 riadku</pluralform>
-<pluralform>Zobrazenie %y z %x riadky</pluralform>
-<pluralform>Zobrazenie %y z %x riadkov</pluralform>
-</target>
-
 <source>Set direction:</source>
 <target>Zadať smer:</target>
 
@@ -1611,6 +1593,21 @@ This guarantees a consistent state even in case of a serious error.
 <source>Do&n't save</source>
 <target>&Neukladať</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x nemôže byť premenované.</target>
+
+<source>New name:</source>
+<target>Nový názov:</target>
+
+<source>Rename Configuration</source>
+<target>Premenovať Konfiguráciu</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Názov konfigurácie nemôže zostať prázdny.</target>
+
+<source>&Rename...</source>
+<target>&Premenovať...</target>
+
 <source>Hide configuration</source>
 <target>Skryť konfiguráciu</target>
 
@@ -1671,6 +1668,36 @@ This guarantees a consistent state even in case of a serious error.
 <source>All files are in sync</source>
 <target>Všetky súbory sú synchronizované</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 adresár</pluralform>
+<pluralform>%x adresáre</pluralform>
+<pluralform>%x adresárov</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 súbor</pluralform>
+<pluralform>%x súbory</pluralform>
+<pluralform>%x súborov</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>Zobrazenie %y z 1 riadku</pluralform>
+<pluralform>Zobrazenie %y z %x riadky</pluralform>
+<pluralform>Zobrazenie %y z %x riadkov</pluralform>
+</target>
+
 <source>Cannot find %x</source>
 <target>Nie je možné nájsť %x</target>
 
@@ -1722,8 +1749,8 @@ This guarantees a consistent state even in case of a serious error.
 <source>Password:</source>
 <target>Heslo:</target>
 
-<source>Key password:</source>
-<target>Heslo kľúča:</target>
+<source>Key passphrase:</source>
+<target>Prístupová fráza:</target>
 
 <source>Please enter a file path.</source>
 <target>Prosím zadajte cestu k súboru.</target>
@@ -1959,8 +1986,8 @@ This guarantees a consistent state even in case of a serious error.
 <source>The file is locked by another process:</source>
 <target>Súbor je uzamknutý iným procesom:</target>
 
-<source>Checking file permissions failed for folder %x.</source>
-<target>Kontrola prístupových oprávnení sa nepodarila pre priečinok %x.</target>
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Nepodarilo sa načítať oprávnenia pre zložku %x.</target>
 
 <source>Cannot read security context of %x.</source>
 <target>Nie je možné načítať prístupové práva pre %x.</target>
diff --git a/FreeFileSync/Build/Resources/Languages/slovenian.lng b/FreeFileSync/Build/Resources/Languages/slovenian.lng
index 25bd57e6..6deee301 100755
--- a/FreeFileSync/Build/Resources/Languages/slovenian.lng
+++ b/FreeFileSync/Build/Resources/Languages/slovenian.lng
@@ -7,6 +7,159 @@
 	<plural_definition>n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>Ne morem prebrati datoteke %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Nepričakovana velikost toka podatkov.
+Pričakovano: %x bajtov
+Dejansko: %y bajtov
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Ne morem zapisati datoteke %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Ne morem zapisati dovoljenj za %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Operacija med različnimi napravami ni podprta.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Ne morem izbrisati datoteke %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Ne morem izbrisati simbolične povezave %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Ne morem izbrisati imenika %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Ne morem premakniti datoteko %x v %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Ne morem kopirati simbolične povezave %x v %y.</target>
+
+<source>Error Code %x</source>
+<target>Napačna koda %x.</target>
+
+<source>Cannot read directory %x.</source>
+<target>Ne morem prebrati direktorija %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Ne morem zapisati časa spremembe od %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Ne morem brati datotečnih atributov od %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Ne morem ustvariti imenika %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Ne morem določiti končne poti za %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Operacija z napravo ni podprta.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Ne morem razrešiti simbolične povezave %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Ne morem premakniti %x v koš.</target>
+
+<source>Authentication completed.</source>
+<target>Preverjanje pristnosti končano.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>To stran lahko zdaj zaprete in nadaljujete z FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Preverjanje pristnosti ni uspelo.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Ne morem povezati na %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Ne najdem %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>Ime %x uporablja več kot ena postavka v mapi.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Odobrite dostop do uporabniškega računa %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Ne morem odpreti datoteke %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>Ime %x že uporablja druga postavka.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Ne morem določiti prostega prostora na disku za %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Povezave z %x ni mogoče prekiniti.</target>
+
+<source>Unable to access %x.</source>
+<target>Ne morem dostopati do %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Ne morem pridobiti informacije o strežniku %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Ne morem nadzirati imenika %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>Ne najdem naprave %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Ne morem odpreti imenika %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Nepodprta vrsta postavke.</target>
+
+<source>Incorrect command line:</source>
+<target>Napačna ukazna vrstica:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>Strežnik ne podpira preverjanja pristnosti preko %x.</target>
+
+<source>Required:</source>
+<target>Zahtevano:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Operacija je potekla po %x sekundi.</pluralform>
+<pluralform>Operacija je potekla po %x sekundah.</pluralform>
+<pluralform>Operacija je potekla po %x sekundah.</pluralform>
+<pluralform>Operacija je potekla po %x sekundah.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Ne morem čakati na več kot %x povezavo naenkrat.</pluralform>
+<pluralform>Ne morem čakati na več kot %x povezavi naenkrat.</pluralform>
+<pluralform>Ne morem čakati na več kot %x povezave naenkrat.</pluralform>
+<pluralform>Ne morem čakati na več kot %x povezav naenkrat.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Aktivne povezave: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Ne morem odpreti SFTP kanala številka %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Obe strani sta spremenjeni po zadnji sinhronizaciji.</target>
 
@@ -109,9 +262,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Namestitvena datoteka je poškodovana. Prosim ponovno naložite FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Ne morem naložiti datoteko %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Ne najdem naslednjih map:</target>
 
@@ -141,6 +291,9 @@
 <pluralform>%x najdenih postavk</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Pretečeni čas:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Datoteka %x ima neveljaven datum.</target>
 
@@ -159,9 +312,6 @@
 <source>Items differ in attributes only</source>
 <target>Postavke se razlikujejo samo po atributih</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>Ime %x uporablja več kot ena postavka v mapi.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Razrešujem simbolično povezavo %x</target>
 
@@ -222,6 +372,15 @@
 <source>Out of memory.</source>
 <target>Ni dovolj pomnilnika.</target>
 
+<source>Show in Explorer</source>
+<target>Prikaži v Raziskovalcu</target>
+
+<source>Open with default application</source>
+<target>Odpri s privzeto aplikacijo</target>
+
+<source>Browse directory</source>
+<target>Brskaj po imeniku</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Datoteka podatkovne baze %x je nekompatibilna.</target>
 
@@ -234,12 +393,6 @@
 <source>Database file is corrupted:</source>
 <target>Datoteka v bazi podatkov je poškodovana:</target>
 
-<source>Cannot write file %x.</source>
-<target>Ne morem zapisati datoteke %x.</target>
-
-<source>Cannot read file %x.</source>
-<target>Ne morem prebrati datoteke %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Datoteke v bazi podatkov še ne vsebujejo informacije o zadnji sinhronizaciji.</target>
 
@@ -258,9 +411,6 @@
 <source>Cannot get process information.</source>
 <target>Ne morem pridobiti informacij o procesu.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Ne morem brati datotečnih atributov od %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Čakam dokler je imenik zaklenjen:</target>
 
@@ -391,27 +541,12 @@
 <pluralform>%x niti</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Ne morem prebrati direktorija %x.</target>
-
 <source>%x/sec</source>
 <target>%x/sek</target>
 
 <source>%x items</source>
 <target>%x postavk</target>
 
-<source>Show in Explorer</source>
-<target>Prikaži v Raziskovalcu</target>
-
-<source>Open with default application</source>
-<target>Odpri s privzeto aplikacijo</target>
-
-<source>Browse directory</source>
-<target>Brskaj po imeniku</target>
-
-<source>Unable to connect to %x.</source>
-<target>Ne morem povezati na %x.</target>
-
 <source>Completed successfully</source>
 <target>Uspešno končano</target>
 
@@ -457,9 +592,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Ne morem zapisati datotečnih atributov od %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Ne morem odpreti datoteke %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x in %y imata različno vsebino.</target>
 
@@ -490,29 +622,20 @@
 <source>Source item %x not found</source>
 <target>Izvorna postavka %x ni bila najdena</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Ne morem premakniti datoteko %x v %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Nadrejena mapa %x ne obstaja.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>Ime %x že uporablja druga postavka.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Ne morem kopirati datoteke %x v %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Ne morem kopirati simbolične povezave %x v %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Ustvarjam Volume Shadow Copy za %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Ne najdem mape %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Ciljna mapa %x že obstaja.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Ciljna mapa %x že obstaja, toda med primerjanjem map ni bila na voljo.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Vnosno polje ciljnë mape ne sme biti prazno.</target>
@@ -535,17 +658,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Na voljo ni dovolj prostega prostora na disku v:</target>
 
-<source>Required:</source>
-<target>Zahtevano:</target>
-
 <source>Available:</source>
 <target>Na voljo:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Nekatere datoteke bodo sinhronizirane kot del večih osnovnih map.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Da bi se izognili sporom, nastavite izključno filtre tako, da je vsaka posodobljena datoteka upoštevana samo v eni osnovni mapi.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>V izogib konfliktom, nastavite izključitev filtrov, tako da je vsaka posodobljena datoteka povezana samo z eno osnovno mapo.</target>
 
 <source>Versioning folder:</source>
 <target>Označitev mape:</target>
@@ -571,126 +691,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Časovnega žiga za oznčitev ni bilo mogoče ustvariti:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Nepričakovana velikost toka podatkov.
-Pričakovano: %x bajtov
-Dejansko: %y bajtov
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Ne morem zapisati dovoljenj za %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Operacija med različnimi napravami ni podprta.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Ne morem izbrisati datoteke %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Ne morem izbrisati simbolične povezave %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Ne morem izbrisati imenika %x.</target>
-
-<source>Error Code %x</source>
-<target>Napačna koda %x.</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Ne morem zapisati časa spremembe od %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Ne morem ustvariti imenika %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Ne morem določiti končne poti za %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Operacija z napravo ni podprta.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Ne morem razrešiti simbolične povezave %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Ne morem premakniti %x v koš.</target>
-
-<source>Authentication completed.</source>
-<target>Preverjanje pristnosti končano.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>To stran lahko zdaj zaprete in nadaljujete z FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Preverjanje pristnosti ni uspelo.</target>
-
-<source>Cannot find %x.</source>
-<target>Ne najdem %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Odobrite dostop do uporabniškega računa %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Ne morem določiti prostega prostora na disku za %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Povezave z %x ni mogoče prekiniti.</target>
-
-<source>Unable to access %x.</source>
-<target>Ne morem dostopati do %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Ne morem pridobiti informacije o strežniku %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Ne morem nadzirati imenika %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>Ne najdem naprave %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Ne morem odpreti imenika %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Nepodprta vrsta postavke.</target>
-
-<source>Incorrect command line:</source>
-<target>Napačna ukazna vrstica:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>Strežnik ne podpira preverjanja pristnosti preko %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Operacija je potekla po %x sekundi.</pluralform>
-<pluralform>Operacija je potekla po %x sekundah.</pluralform>
-<pluralform>Operacija je potekla po %x sekundah.</pluralform>
-<pluralform>Operacija je potekla po %x sekundah.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Ne morem čakati na več kot %x povezavo naenkrat.</pluralform>
-<pluralform>Ne morem čakati na več kot %x povezavi naenkrat.</pluralform>
-<pluralform>Ne morem čakati na več kot %x povezave naenkrat.</pluralform>
-<pluralform>Ne morem čakati na več kot %x povezav naenkrat.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Aktivne povezave: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Ne morem odpreti SFTP kanala številka %x.</target>
-
 <source>Drag && drop</source>
 <target>Povleci && spusti</target>
 
@@ -757,6 +757,9 @@ Dejansko: %y bajtov
 <source>Command line:</source>
 <target>Ukazna vrstica:</target>
 
+<source>&Hide console window</source>
+<target>&Skrij okno konzole</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -792,8 +795,8 @@ Ukaz se sproži če:
 <source>Waiting until directory is available:</source>
 <target>Čakanje, da je imenik na voljo:</target>
 
-<source>&Restore</source>
-<target>&Obnovi</target>
+<source>&Configure</source>
+<target>&Konfiguriraj</target>
 
 <source>&Show error message</source>
 <target>&Prikaži sporočilo o napaki</target>
@@ -830,8 +833,8 @@ Ukaz se sproži če:
 <source>Scanning...</source>
 <target>Skeniram...</target>
 
-<source>job name</source>
-<target>naziv opravila</target>
+<source>configuration file</source>
+<target>konfiguracijska datoteka</target>
 
 <source>System: Sleep</source>
 <target>Sistem: Spanje</target>
@@ -842,8 +845,8 @@ Ukaz se sproži če:
 <source>Nothing to synchronize</source>
 <target>Nič za sinhroniziranje</target>
 
-<source>Executing command %x</source>
-<target>Izvedba ukaza %x</target>
+<source>Executing command:</source>
+<target>Izvedi ukaz:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Če želite odpraviti to težavo, lahko preklopite na glavno okno FreeFileSync.</target>
@@ -1045,6 +1048,12 @@ Ukaz se sproži če:
 <source>Match case</source>
 <target>Ujemanje primera</target>
 
+<source>Processed:</source>
+<target>Obdelano:</target>
+
+<source>Remaining:</source>
+<target>Preostalo:</target>
+
 <source>New</source>
 <target>Nova</target>
 
@@ -1281,14 +1290,17 @@ Ukaz se sproži če:
 <source>&Don't show this dialog again</source>
 <target>&Tega pogovornega okna ne prikazuj znova</target>
 
-<source>Items found:</source>
-<target>Najdenih postavk:</target>
+<source>Bytes:</source>
+<target>Bajti:</target>
 
-<source>Time remaining:</source>
-<target>Preostali čas:</target>
+<source>Items:</source>
+<target>Postavke:</target>
 
-<source>Time elapsed:</source>
-<target>Pretečeni čas:</target>
+<source>Synchronizing...</source>
+<target>Sinhroniziram...</target>
+
+<source>Minimize to notification area</source>
+<target>Pomanjšaj v območje obvestil</target>
 
 <source>Bytes</source>
 <target>Bitov</target>
@@ -1296,12 +1308,6 @@ Ukaz se sproži če:
 <source>Items</source>
 <target>Postavk</target>
 
-<source>Synchronizing...</source>
-<target>Sinhroniziram...</target>
-
-<source>Minimize to notification area</source>
-<target>Pomanjšaj v območje obvestil</target>
-
 <source>When finished:</source>
 <target>Po zaključku:</target>
 
@@ -1377,6 +1383,12 @@ To zagotavlja dosledno stanje tudi v primeru resne napake.
 <source>&Delete logs after x days:</source>
 <target>&Izbriši dnevnike po x dneh:</target>
 
+<source>Notification sounds:</source>
+<target>Zvok obvestila:</target>
+
+<source>Synchronization finished:</source>
+<target>Sinhronizacija je zaključena:</target>
+
 <source>Customize context menu:</source>
 <target>Prilagodi kontekstni meni:</target>
 
@@ -1589,12 +1601,6 @@ To zagotavlja dosledno stanje tudi v primeru resne napake.
 <source>&Delete</source>
 <target>&Izbriši</target>
 
-<source>Include all</source>
-<target>Vključi vse</target>
-
-<source>Exclude all</source>
-<target>Izključi vse</target>
-
 <source>Show icons:</source>
 <target>Prikaži ikone:</target>
 
@@ -1631,6 +1637,21 @@ To zagotavlja dosledno stanje tudi v primeru resne napake.
 <source>Do&n't save</source>
 <target>Ne shra&ni</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x ni mogoče preimenovati.</target>
+
+<source>New name:</source>
+<target>Novo ime:</target>
+
+<source>Rename Configuration</source>
+<target>Preimenovanje konfiguracije</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Ime konfiguracije ne sme biti prazno.</target>
+
+<source>&Rename...</source>
+<target>&Preimenovanje...</target>
+
 <source>Hide configuration</source>
 <target>Skrij konfiguracijo</target>
 
@@ -1742,8 +1763,8 @@ To zagotavlja dosledno stanje tudi v primeru resne napake.
 <source>Password:</source>
 <target>Geslo:</target>
 
-<source>Key password:</source>
-<target>Aktivacijski ključ:</target>
+<source>Key passphrase:</source>
+<target>Geslo za ključ:</target>
 
 <source>Please enter a file path.</source>
 <target>Vnesite pot do datoteke.</target>
@@ -1913,6 +1934,9 @@ To zagotavlja dosledno stanje tudi v primeru resne napake.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Najmanjše število različic mora biti manjše od največjega števila.</target>
 
+<source>&Restore</source>
+<target>&Obnovi</target>
+
 <source>Files</source>
 <target>Datoteke</target>
 
@@ -1979,6 +2003,9 @@ To zagotavlja dosledno stanje tudi v primeru resne napake.
 <source>The file is locked by another process:</source>
 <target>Datoteko je zaklenil drug proces:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Preverjanje podpore za dovoljenje datoteke za mapo %x ni uspelo.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Ne morem prebrati varnostni kontekst od %x.</target>
 
@@ -2034,12 +2061,12 @@ To zagotavlja dosledno stanje tudi v primeru resne napake.
 <source>Cannot change process I/O priorities.</source>
 <target>Ne morem spremeniti prioritet procesa I/O.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Sistema ni mogoče zapustiti.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Preverjanje koša za mapo %x ni uspelo.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Sistema ni mogoče zapustiti.</target>
+
 <source>Prepare installation</source>
 <target>Pripravljam namestitev</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/spanish.lng b/FreeFileSync/Build/Resources/Languages/spanish.lng
index cf756088..29d5ee3b 100755
--- a/FreeFileSync/Build/Resources/Languages/spanish.lng
+++ b/FreeFileSync/Build/Resources/Languages/spanish.lng
@@ -7,6 +7,155 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>No se puede leer el archivo %x.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Tamaño no esperado del flujo de datos.
+Esperados: %x bytes
+Reales: %y bytes
+</target>
+
+<source>Cannot write file %x.</source>
+<target>No se puede escribir el archivo %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>No se pueden escribir los permisos de %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>No se admite esta operación entre dispositivos diferentes.</target>
+
+<source>Cannot delete file %x.</source>
+<target>No se puede eliminar el archivo %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>No se puede eliminar el vínculo simbólico %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>No se puede eliminar el directorio %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>No se puede mover el archivo %x a %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>No se puede copiar el vínculo simbólico %x a %y.</target>
+
+<source>Error Code %x</source>
+<target>Código de error %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>No se puede leer el directorio %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>No se puede escribir el tiempo de modificación de %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>No se puede leer archivo de atributos de %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>No se puede crear el directorio %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>No se puede determinar la ruta final de %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>El dispositivo no admite esta operación.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>No se puede resolver el vínculo simbólico %x.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>No es posible mover %x a la papelera de reciclaje.</target>
+
+<source>Authentication completed.</source>
+<target>Autenticación completada.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Puede cerrar esta página y continuar con FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Fallo de autenticación.</target>
+
+<source>Unable to connect to %x.</source>
+<target>No se puede conectar a %x.</target>
+
+<source>Cannot find %x.</source>
+<target>No se encuentra %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>El nombre %x es utilizado por más de un elemento en la carpeta.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Autorice el acceso a la cuenta de usuario %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>No se puede abrir el archivo %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>El nombre %x es utilizado por otro elemento.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>No se puede determinar el espacio libre en disco para %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>No se puede desconectar de %x.</target>
+
+<source>Unable to access %x.</source>
+<target>No se puede acceder a %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Fallo al obtener información del servidor %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>No se puede monitorizar el directorio %x.</target>
+
+<source>Cannot find device %x.</source>
+<target>No se encuentra el dispositivo %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>No se puede abrir el directorio %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Tipo de elemento no admitido.</target>
+
+<source>Incorrect command line:</source>
+<target>Línea de comandos incorrecta:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>El servidor no admite autenticación via %x.</target>
+
+<source>Required:</source>
+<target>Requerido:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>La operación superó el tiempo de espera tras 1 segundo.</pluralform>
+<pluralform>La operación superó el tiempo de espera tras %x segundos.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>No se puede esperar más de 1 conexión a la vez.</pluralform>
+<pluralform>No se pueden esperar más de %x conexiones a la vez.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Conexiones activas: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Fallo de apertura del canal SFTP número %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Ambos lados han cambiado desde la última sincronización.</target>
 
@@ -109,9 +258,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Los archivos de instalación están dañados. Reinstale FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>No se puede cargar el archivo %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>No se pudieron encontrar las siguiente carpetas:</target>
 
@@ -139,6 +285,9 @@
 <pluralform>%x elementos encontrados</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Tiempo transcurrido:</target>
+
 <source>File %x has an invalid date.</source>
 <target>El archivo %x tiene una fecha inválida.</target>
 
@@ -157,9 +306,6 @@
 <source>Items differ in attributes only</source>
 <target>Los elementos sólo se diferencian en los atributos</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>El nombre %x es utilizado por más de un elemento en la carpeta.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Resolviendo vínculo simbólico %x</target>
 
@@ -220,6 +366,15 @@
 <source>Out of memory.</source>
 <target>Sin memoria.</target>
 
+<source>Show in Explorer</source>
+<target>Mostrar en el Explorador</target>
+
+<source>Open with default application</source>
+<target>Abrir con la aplicación predeterminada</target>
+
+<source>Browse directory</source>
+<target>Examinar directorio</target>
+
 <source>Database file %x is incompatible.</source>
 <target>El archivo de base de datos %x es incompatible.</target>
 
@@ -232,12 +387,6 @@
 <source>Database file is corrupted:</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>
-
-<source>Cannot read file %x.</source>
-<target>No se puede leer el archivo %x.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Los archivos de datos aún no contienen información acerca de una sincronización anterior.</target>
 
@@ -256,9 +405,6 @@
 <source>Cannot get process information.</source>
 <target>No se puede obtener información del proceso.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>No se puede leer archivo de atributos de %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Esperando mientras el directorio está bloqueado:</target>
 
@@ -385,27 +531,12 @@
 <pluralform>%x subprocesos</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>No se puede leer el directorio %x.</target>
-
 <source>%x/sec</source>
 <target>%x/seg</target>
 
 <source>%x items</source>
 <target>%x elementos</target>
 
-<source>Show in Explorer</source>
-<target>Mostrar en el Explorador</target>
-
-<source>Open with default application</source>
-<target>Abrir con la aplicación predeterminada</target>
-
-<source>Browse directory</source>
-<target>Examinar directorio</target>
-
-<source>Unable to connect to %x.</source>
-<target>No se puede conectar a %x.</target>
-
 <source>Completed successfully</source>
 <target>Completado con éxito</target>
 
@@ -451,9 +582,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>No se pueden escribir los atributos de archivo de %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>No se puede abrir el archivo %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x y %y tienen contenidos diferentes.</target>
 
@@ -484,29 +612,20 @@
 <source>Source item %x not found</source>
 <target>No se encontró el archivo de origen %x</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>No se puede mover el archivo %x a %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>La carpeta principal %x no existe.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>El nombre %x es utilizado por otro elemento.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>No se puede copiar el archivo %x a %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>No se puede copiar el vínculo simbólico %x a %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Creando una Instantánea de volumen para %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>No se puede encontrar la carpeta %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>La carpeta de destino %x ya existe.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>La carpeta de destino %x ya existe, pero no estaba disponible durante la comparación de carpetas.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>El campo de entrada de la carpeta de destino no debe estar vacío.</target>
@@ -529,17 +648,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Espacio en disco insuficiente en:</target>
 
-<source>Required:</source>
-<target>Requerido:</target>
-
 <source>Available:</source>
 <target>Disponible:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Se van a sincronizar algunos archivos como partes de varias carpetas base.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Para evitar conflictos, defina filtros de exclusión de forma que cada archivo actualizado sea procesado desde una única carpeta base.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Para evitar conflictos, defina filtros de exclusión de forma que cada archivo actualizado aparezca solo en una única carpeta base.</target>
 
 <source>Versioning folder:</source>
 <target>Carpeta de versionado:</target>
@@ -565,122 +681,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>No es posible crear la fecha y hora para el versionado:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Tamaño no esperado del flujo de datos.
-Esperados: %x bytes
-Reales: %y bytes
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>No se pueden escribir los permisos de %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>No se admite esta operación entre dispositivos diferentes.</target>
-
-<source>Cannot delete file %x.</source>
-<target>No se puede eliminar el archivo %x.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>No se puede eliminar el vínculo simbólico %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>No se puede eliminar el directorio %x.</target>
-
-<source>Error Code %x</source>
-<target>Código de error %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>No se puede escribir el tiempo de modificación de %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>No se puede crear el directorio %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>No se puede determinar la ruta final de %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>El dispositivo no admite esta operación.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>No se puede resolver el vínculo simbólico %x.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>No es posible mover %x a la papelera de reciclaje.</target>
-
-<source>Authentication completed.</source>
-<target>Autenticación completada.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Puede cerrar esta página y continuar con FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Fallo de autenticación.</target>
-
-<source>Cannot find %x.</source>
-<target>No se encuentra %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Autorice el acceso a la cuenta de usuario %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>No se puede determinar el espacio libre en disco para %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>No se puede desconectar de %x.</target>
-
-<source>Unable to access %x.</source>
-<target>No se puede acceder a %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Fallo al obtener información del servidor %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>No se puede monitorizar el directorio %x.</target>
-
-<source>Cannot find device %x.</source>
-<target>No se encuentra el dispositivo %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>No se puede abrir el directorio %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Tipo de elemento no admitido.</target>
-
-<source>Incorrect command line:</source>
-<target>Línea de comandos incorrecta:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>El servidor no admite autenticación via %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>La operación superó el tiempo de espera tras 1 segundo.</pluralform>
-<pluralform>La operación superó el tiempo de espera tras %x segundos.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>No se puede esperar más de 1 conexión a la vez.</pluralform>
-<pluralform>No se pueden esperar más de %x conexiones a la vez.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Conexiones activas: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Fallo de apertura del canal SFTP número %x.</target>
-
 <source>Drag && drop</source>
 <target>Arrastrar y soltar</target>
 
@@ -747,6 +747,9 @@ Reales: %y bytes
 <source>Command line:</source>
 <target>Línea de comandos:</target>
 
+<source>&Hide console window</source>
+<target>&Ocultar la consola de comandos</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -782,8 +785,8 @@ El comando es disparado si:
 <source>Waiting until directory is available:</source>
 <target>Esperando que el directorio esté disponible:</target>
 
-<source>&Restore</source>
-<target>&Restaurar</target>
+<source>&Configure</source>
+<target>&Configura</target>
 
 <source>&Show error message</source>
 <target>Mo&strar mensaje de error</target>
@@ -818,8 +821,8 @@ El comando es disparado si:
 <source>Scanning...</source>
 <target>Escaneando...</target>
 
-<source>job name</source>
-<target>nombre de tarea</target>
+<source>configuration file</source>
+<target>archivo de configuración</target>
 
 <source>System: Sleep</source>
 <target>Sistema: suspender</target>
@@ -830,8 +833,8 @@ El comando es disparado si:
 <source>Nothing to synchronize</source>
 <target>Nada que sincronizar</target>
 
-<source>Executing command %x</source>
-<target>Ejecución del comando %x</target>
+<source>Executing command:</source>
+<target>Ejecución del comando:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Puede cambiar a la ventana principal de FreeFileSync para resolver este problema.</target>
@@ -1031,6 +1034,12 @@ El comando es disparado si:
 <source>Match case</source>
 <target>Coincidir mayúsculas y minúsculas</target>
 
+<source>Processed:</source>
+<target>Procesado(s):</target>
+
+<source>Remaining:</source>
+<target>Restantes:</target>
+
 <source>New</source>
 <target>Nuevo</target>
 
@@ -1199,7 +1208,7 @@ El comando es disparado si:
 <target>Tipo de conexión:</target>
 
 <source>Connected user accounts:</source>
-<target>Cuentas de usuario conectadas:</target>
+<target>Cuentas de usuarion conectadas:</target>
 
 <source>&Add connection</source>
 <target>&Agregar conexión</target>
@@ -1267,14 +1276,17 @@ El comando es disparado si:
 <source>&Don't show this dialog again</source>
 <target>&No volver a mostrar este diálogo</target>
 
-<source>Items found:</source>
-<target>Elementos encontrados:</target>
+<source>Bytes:</source>
+<target>Bytes:</target>
 
-<source>Time remaining:</source>
-<target>Tiempo restante:</target>
+<source>Items:</source>
+<target>Elementos:</target>
 
-<source>Time elapsed:</source>
-<target>Tiempo transcurrido:</target>
+<source>Synchronizing...</source>
+<target>Sincronizando...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimizar en el área de notificación</target>
 
 <source>Bytes</source>
 <target>Bytes</target>
@@ -1282,12 +1294,6 @@ El comando es disparado si:
 <source>Items</source>
 <target>Elementos</target>
 
-<source>Synchronizing...</source>
-<target>Sincronizando...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimizar en el área de notificación</target>
-
 <source>When finished:</source>
 <target>Tras finalizar:</target>
 
@@ -1363,6 +1369,12 @@ Esto garantiza un estado coherente incluso en caso de error grave.
 <source>&Delete logs after x days:</source>
 <target>&Eliminar los registros tras x días:</target>
 
+<source>Notification sounds:</source>
+<target>Notificaciones sonoras:</target>
+
+<source>Synchronization finished:</source>
+<target>Synchronización finalizada:</target>
+
 <source>Customize context menu:</source>
 <target>Personalizar menú contextual:</target>
 
@@ -1567,12 +1579,6 @@ Esto garantiza un estado coherente incluso en caso de error grave.
 <source>&Delete</source>
 <target>&Eliminar</target>
 
-<source>Include all</source>
-<target>Incluir todo</target>
-
-<source>Exclude all</source>
-<target>Excluir todo</target>
-
 <source>Show icons:</source>
 <target>Mostrar iconos:</target>
 
@@ -1609,6 +1615,21 @@ Esto garantiza un estado coherente incluso en caso de error grave.
 <source>Do&n't save</source>
 <target>&No guardar</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x no se puede renombrar.</target>
+
+<source>New name:</source>
+<target>Nuevo nombre:</target>
+
+<source>Rename Configuration</source>
+<target>Renombrar la configuración</target>
+
+<source>Configuration name must not be empty.</source>
+<target>El nombre de configuración no debe estar vacío.</target>
+
+<source>&Rename...</source>
+<target>&Renombrar...</target>
+
 <source>Hide configuration</source>
 <target>Ocultar configuración</target>
 
@@ -1720,8 +1741,8 @@ Esto garantiza un estado coherente incluso en caso de error grave.
 <source>Password:</source>
 <target>Contraseña:</target>
 
-<source>Key password:</source>
-<target>Contraseña de clave:</target>
+<source>Key passphrase:</source>
+<target>Frase de contraseña:</target>
 
 <source>Please enter a file path.</source>
 <target>Indique la ruta de un archivo.</target>
@@ -1885,6 +1906,9 @@ Esto garantiza un estado coherente incluso en caso de error grave.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>El contador mínimo de versión debe ser inferior al contador máximo.</target>
 
+<source>&Restore</source>
+<target>&Restaurar</target>
+
 <source>Files</source>
 <target>Archivos</target>
 
@@ -1951,6 +1975,9 @@ Esto garantiza un estado coherente incluso en caso de error grave.
 <source>The file is locked by another process:</source>
 <target>El archivo está bloqueado por otro proceso:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>No se puede determinar el soporte para permisos de archivos en la carpeta %x.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>No se puede leer el contexto de seguridad de %x.</target>
 
@@ -2002,12 +2029,12 @@ Esto garantiza un estado coherente incluso en caso de error grave.
 <source>Cannot change process I/O priorities.</source>
 <target>No se pudieron cambiar las prioridades de E/S del proceso.</target>
 
-<source>Unable to shut down the system.</source>
-<target>No es posible apagar el sistema.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Fallo al comprobar la papelera de reciclaje para la carpeta %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>No es posible apagar el sistema.</target>
+
 <source>Prepare installation</source>
 <target>Preparar la instalación</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/swedish.lng b/FreeFileSync/Build/Resources/Languages/swedish.lng
index 88752d22..cb1b2211 100755
--- a/FreeFileSync/Build/Resources/Languages/swedish.lng
+++ b/FreeFileSync/Build/Resources/Languages/swedish.lng
@@ -7,6 +7,155 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Cannot read file %x.</source>
+<target>Filen %x kan inte läsas in.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Oväntad storlek på dataström.
+Förväntad: %x byte
+Aktuell: %y byte
+</target>
+
+<source>Cannot write file %x.</source>
+<target>Filen %x kan inte skrivas.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Kan inte skriva behörigheter för %x.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Åtgärden stöds inte mellan olika enheter.</target>
+
+<source>Cannot delete file %x.</source>
+<target>Filen %x kan inte tas bort.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Kan inte ta bort den symboliska länken %x.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Kan inte ta bort mappen %x.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Kan inte flytta filen %x till %y.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Kan inte kopiera den symboliska länken %x till %y.</target>
+
+<source>Error Code %x</source>
+<target>Felkod %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>Kan inte läsa mappen %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Kan inte ändra tidsangivelsen för %x.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Kan inte läsa filattribut för %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Kan inte skapa mappen %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>Kan inte utläsa slutlig sökväg för %x.</target>
+
+<source>Operation not supported by device.</source>
+<target>Åtgärden stöds inte av enheten.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Den symboliska länken %x kan inte matchas.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>Kan inte att flytta %x till papperskorgen.</target>
+
+<source>Authentication completed.</source>
+<target>Autentisering slutförd.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Du kan nu stänga denna sida och fortsätta med FreeFileSync.</target>
+
+<source>Authentication failed.</source>
+<target>Autentisering misslyckades.</target>
+
+<source>Unable to connect to %x.</source>
+<target>Kan inte ansluta till %x.</target>
+
+<source>Cannot find %x.</source>
+<target>Kan inte hitta %x.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>Namnet %x, används av mer än ett objekt, i mappen.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Autentisera åtkomst till användarkonto %x.</target>
+
+<source>Cannot open file %x.</source>
+<target>Kan inte öppna %x.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>Namnet %x, används redan av ett annat objekt.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Kan inte avgöra ledigt utrymme på %x.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>Kan inte koppla ifrån %x.</target>
+
+<source>Unable to access %x.</source>
+<target>Kan inte komma åt %x.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>Kunde inte hämta information om server %x.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Mappen %x kan inte övervakas.</target>
+
+<source>Cannot find device %x.</source>
+<target>Kan inte hitta enheten  %x.</target>
+
+<source>Cannot open directory %x.</source>
+<target>Kan inte öppna %x.</target>
+
+<source>Unsupported item type.</source>
+<target>Objekttypen stöds inte.</target>
+
+<source>Incorrect command line:</source>
+<target>Felaktig kommandorad:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>Servern stödjer inte autentisering via %x.</target>
+
+<source>Required:</source>
+<target>Utrymmeskrav:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>Åtgärdens tidsgräns överskreds efter 1 sekund.</pluralform>
+<pluralform>Åtgärdens tidsgräns överskreds efter %x sekunder.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Kan inte vänta på fler än 1 anslutning åt gången.</pluralform>
+<pluralform>Kan inte vänta på fler än %x anslutningar åt gången.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Aktiva anslutningar: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>Kunde inte öppna SFTP-kanal nummer %x.</target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Bägge sidor har ändrats sedan senaste synkroniseringen.</target>
 
@@ -109,9 +258,6 @@
 <source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
 <target>Installationsfilerna är skadade. Installera om FreeFileSync.</target>
 
-<source>Cannot load file %x.</source>
-<target>Kan inte läsa in %x.</target>
-
 <source>Cannot find the following folders:</source>
 <target>Kan inte hitta följande mappar:</target>
 
@@ -139,6 +285,9 @@
 <pluralform>%x objekt hittade</pluralform>
 </target>
 
+<source>Time elapsed:</source>
+<target>Förfluten tid:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Filen %x har ett ogiltigt datum.</target>
 
@@ -157,9 +306,6 @@
 <source>Items differ in attributes only</source>
 <target>Endast attribut skiljer objekten åt</target>
 
-<source>The name %x is used by more than one item in the folder.</source>
-<target>Namnet %x, används av mer än ett objekt, i mappen.</target>
-
 <source>Resolving symbolic link %x</source>
 <target>Översätter den symboliska länken %x</target>
 
@@ -220,6 +366,15 @@
 <source>Out of memory.</source>
 <target>Minnesbrist.</target>
 
+<source>Show in Explorer</source>
+<target>Visa i Utforskaren</target>
+
+<source>Open with default application</source>
+<target>Öppna med standardprogram</target>
+
+<source>Browse directory</source>
+<target>Sök upp mapp</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Databasfilen %x är inkompatibel.</target>
 
@@ -232,12 +387,6 @@
 <source>Database file is corrupted:</source>
 <target>Databasfilen är skadad:</target>
 
-<source>Cannot write file %x.</source>
-<target>Filen %x kan inte skrivas.</target>
-
-<source>Cannot read file %x.</source>
-<target>Filen %x kan inte läsas in.</target>
-
 <source>The database files do not yet contain information about the last synchronization.</source>
 <target>Datapasfilen innehåller ännu ingen information om senaste synkronisering.</target>
 
@@ -256,9 +405,6 @@
 <source>Cannot get process information.</source>
 <target>Processinformation kan inte inhämtas.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Kan inte läsa filattribut för %x.</target>
-
 <source>Waiting while directory is locked:</source>
 <target>Väntar medan mappen låses:</target>
 
@@ -385,27 +531,12 @@
 <pluralform>%x trådar</pluralform>
 </target>
 
-<source>Cannot read directory %x.</source>
-<target>Kan inte läsa mappen %x.</target>
-
 <source>%x/sec</source>
 <target>%x/sek</target>
 
 <source>%x items</source>
 <target>%x objekt</target>
 
-<source>Show in Explorer</source>
-<target>Visa i Utforskaren</target>
-
-<source>Open with default application</source>
-<target>Öppna med standardprogram</target>
-
-<source>Browse directory</source>
-<target>Sök upp mapp</target>
-
-<source>Unable to connect to %x.</source>
-<target>Kan inte ansluta till %x.</target>
-
 <source>Completed successfully</source>
 <target>Korrekt slutförd</target>
 
@@ -451,9 +582,6 @@
 <source>Cannot write file attributes of %x.</source>
 <target>Kan inte skriva filattribut för %x.</target>
 
-<source>Cannot open file %x.</source>
-<target>Kan inte öppna %x.</target>
-
 <source>%x and %y have different content.</source>
 <target>%x och %y har olika innehåll.</target>
 
@@ -484,29 +612,20 @@
 <source>Source item %x not found</source>
 <target>Källobjektet %x hittades inte</target>
 
-<source>Cannot move file %x to %y.</source>
-<target>Kan inte flytta filen %x till %y.</target>
-
 <source>Parent folder %x is not existing.</source>
 <target>Överordnad mapp %x, finns inte.</target>
 
-<source>The name %x is already used by another item.</source>
-<target>Namnet %x, används redan av ett annat objekt.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Kan inte kopiera %x till %y.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Kan inte kopiera den symboliska länken %x till %y.</target>
-
 <source>Creating a Volume Shadow Copy for %x...</source>
 <target>Skapar en 'Volume Shadow Copy' för %x...</target>
 
 <source>Cannot find folder %x.</source>
 <target>Kan inte hitta mappen %x.</target>
 
-<source>Target folder %x already existing.</source>
-<target>Målmappen %x finns redan.</target>
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>Målmappen %x finns redan, men var inte tillgänglig vid mappjämförelsen.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Indatafältet för målmapp får inte vara tomt.</target>
@@ -529,17 +648,14 @@
 <source>Not enough free disk space available in:</source>
 <target>Ej tillräckligt ledigt diskutrymme på:</target>
 
-<source>Required:</source>
-<target>Utrymmeskrav:</target>
-
 <source>Available:</source>
 <target>Tillgängligt:</target>
 
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Vissa filer kommer att synkroniseras som en del av flera basmappar.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>För att undvika konflikter kan du använda ett undantagsfilter, så att varje uppdaterad fil behandlas i endast en basmapp.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Konfigurera undantagsfilter så att varje uppdaterad fil inkluderas av endast en basmapp, för att undvika konflikter.</target>
 
 <source>Versioning folder:</source>
 <target>Versionshanteringsmapp:</target>
@@ -565,122 +681,6 @@
 <source>Unable to create time stamp for versioning:</source>
 <target>Kunde inte skapa tidsstämpel för versionshantering:</target>
 
-<source>
-Unexpected size of data stream.
-Expected: %x bytes
-Actual: %y bytes
-</source>
-<target>
-Oväntad storlek på dataström.
-Förväntad: %x byte
-Aktuell: %y byte
-</target>
-
-<source>Cannot write permissions of %x.</source>
-<target>Kan inte skriva behörigheter för %x.</target>
-
-<source>Operation not supported between different devices.</source>
-<target>Åtgärden stöds inte mellan olika enheter.</target>
-
-<source>Cannot delete file %x.</source>
-<target>Filen %x kan inte tas bort.</target>
-
-<source>Cannot delete symbolic link %x.</source>
-<target>Kan inte ta bort den symboliska länken %x.</target>
-
-<source>Cannot delete directory %x.</source>
-<target>Kan inte ta bort mappen %x.</target>
-
-<source>Error Code %x</source>
-<target>Felkod %x</target>
-
-<source>Cannot write modification time of %x.</source>
-<target>Kan inte ändra tidsangivelsen för %x.</target>
-
-<source>Cannot create directory %x.</source>
-<target>Kan inte skapa mappen %x.</target>
-
-<source>Cannot determine final path for %x.</source>
-<target>Kan inte utläsa slutlig sökväg för %x.</target>
-
-<source>Operation not supported by device.</source>
-<target>Åtgärden stöds inte av enheten.</target>
-
-<source>Cannot resolve symbolic link %x.</source>
-<target>Den symboliska länken %x kan inte matchas.</target>
-
-<source>Unable to move %x to the recycle bin.</source>
-<target>Kan inte att flytta %x till papperskorgen.</target>
-
-<source>Authentication completed.</source>
-<target>Autentisering slutförd.</target>
-
-<source>You may close this page now and continue with FreeFileSync.</source>
-<target>Du kan nu stänga denna sida och fortsätta med FreeFileSync.</target>
-
-<source>Authentication failed.</source>
-<target>Autentisering misslyckades.</target>
-
-<source>Cannot find %x.</source>
-<target>Kan inte hitta %x.</target>
-
-<source>Please authorize access to user account %x.</source>
-<target>Autentisera åtkomst till användarkonto %x.</target>
-
-<source>Cannot determine free disk space for %x.</source>
-<target>Kan inte avgöra ledigt utrymme på %x.</target>
-
-<source>Unable to disconnect from %x.</source>
-<target>Kan inte koppla ifrån %x.</target>
-
-<source>Unable to access %x.</source>
-<target>Kan inte komma åt %x.</target>
-
-<source>Failed to get information about server %x.</source>
-<target>Kunde inte hämta information om server %x.</target>
-
-<source>Cannot monitor directory %x.</source>
-<target>Mappen %x kan inte övervakas.</target>
-
-<source>Cannot find device %x.</source>
-<target>Kan inte hitta enheten  %x.</target>
-
-<source>Cannot open directory %x.</source>
-<target>Kan inte öppna %x.</target>
-
-<source>Unsupported item type.</source>
-<target>Objekttypen stöds inte.</target>
-
-<source>Incorrect command line:</source>
-<target>Felaktig kommandorad:</target>
-
-<source>The server does not support authentication via %x.</source>
-<target>Servern stödjer inte autentisering via %x.</target>
-
-<source>
-<pluralform>Operation timed out after 1 second.</pluralform>
-<pluralform>Operation timed out after %x seconds.</pluralform>
-</source>
-<target>
-<pluralform>Åtgärdens tidsgräns överskreds efter 1 sekund.</pluralform>
-<pluralform>Åtgärdens tidsgräns överskreds efter %x sekunder.</pluralform>
-</target>
-
-<source>
-<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
-<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
-</source>
-<target>
-<pluralform>Kan inte vänta på fler än 1 anslutning åt gången.</pluralform>
-<pluralform>Kan inte vänta på fler än %x anslutningar åt gången.</pluralform>
-</target>
-
-<source>Active connections: %x</source>
-<target>Aktiva anslutningar: %x</target>
-
-<source>Failed to open SFTP channel number %x.</source>
-<target>Kunde inte öppna SFTP-kanal nummer %x.</target>
-
 <source>Drag && drop</source>
 <target>Dra && släpp</target>
 
@@ -747,6 +747,9 @@ Aktuell: %y byte
 <source>Command line:</source>
 <target>Kommandorad:</target>
 
+<source>&Hide console window</source>
+<target>&Dölj konsollfönster</target>
+
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -782,8 +785,8 @@ Kommandot triggas om:
 <source>Waiting until directory is available:</source>
 <target>Väntar på att mappen skall bli tillgänglig:</target>
 
-<source>&Restore</source>
-<target>&Återställ</target>
+<source>&Configure</source>
+<target>&Konfigurera</target>
 
 <source>&Show error message</source>
 <target>&Visa felmeddelande</target>
@@ -818,8 +821,8 @@ Kommandot triggas om:
 <source>Scanning...</source>
 <target>Skannar...</target>
 
-<source>job name</source>
-<target>åtgärdsnamn</target>
+<source>configuration file</source>
+<target>konfigurationsfil</target>
 
 <source>System: Sleep</source>
 <target>System: Viloläge</target>
@@ -830,8 +833,8 @@ Kommandot triggas om:
 <source>Nothing to synchronize</source>
 <target>Det finns inget att synkronisera</target>
 
-<source>Executing command %x</source>
-<target>Kör kommandot %x</target>
+<source>Executing command:</source>
+<target>Kör kommando:</target>
 
 <source>You can switch to FreeFileSync's main window to resolve this issue.</source>
 <target>Du kan växla till FreeFileSyncs programfönster för att lösa problemet.</target>
@@ -1031,6 +1034,12 @@ Kommandot triggas om:
 <source>Match case</source>
 <target>Matcha gemener/VERSALER</target>
 
+<source>Processed:</source>
+<target>Bearbetat:</target>
+
+<source>Remaining:</source>
+<target>Återstår:</target>
+
 <source>New</source>
 <target>Nytt</target>
 
@@ -1267,14 +1276,17 @@ Kommandot triggas om:
 <source>&Don't show this dialog again</source>
 <target>&Visa inte den här dialogen igen</target>
 
-<source>Items found:</source>
-<target>Funna poster:</target>
+<source>Bytes:</source>
+<target>Byte:</target>
 
-<source>Time remaining:</source>
-<target>Återstående tid:</target>
+<source>Items:</source>
+<target>Objekt:</target>
 
-<source>Time elapsed:</source>
-<target>Förfluten tid:</target>
+<source>Synchronizing...</source>
+<target>Synkroniserar...</target>
+
+<source>Minimize to notification area</source>
+<target>Minimera till meddelandefältet</target>
 
 <source>Bytes</source>
 <target>Byte</target>
@@ -1282,12 +1294,6 @@ Kommandot triggas om:
 <source>Items</source>
 <target>Objekt</target>
 
-<source>Synchronizing...</source>
-<target>Synkroniserar...</target>
-
-<source>Minimize to notification area</source>
-<target>Minimera till meddelandefältet</target>
-
 <source>When finished:</source>
 <target>Vid slutfört:</target>
 
@@ -1363,6 +1369,12 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel.
 <source>&Delete logs after x days:</source>
 <target>&Ta bort loggar efter x dagar:</target>
 
+<source>Notification sounds:</source>
+<target>Aviseringsljud:</target>
+
+<source>Synchronization finished:</source>
+<target>Synkronisering slutförd:</target>
+
 <source>Customize context menu:</source>
 <target>Anpassad kontextmeny:</target>
 
@@ -1567,12 +1579,6 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel.
 <source>&Delete</source>
 <target>&Ta bort</target>
 
-<source>Include all</source>
-<target>Inkludera alla</target>
-
-<source>Exclude all</source>
-<target>Undanta alla</target>
-
 <source>Show icons:</source>
 <target>Visa ikoner:</target>
 
@@ -1609,6 +1615,21 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel.
 <source>Do&n't save</source>
 <target>Spara &inte</target>
 
+<source>%x cannot be renamed.</source>
+<target>%x kan inte namnändras.</target>
+
+<source>New name:</source>
+<target>Nytt namn:</target>
+
+<source>Rename Configuration</source>
+<target>Byt namn på konfigurationen</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Konfigurationsnamnet kan inte lämnas tomt.</target>
+
+<source>&Rename...</source>
+<target>&Byt namn...</target>
+
 <source>Hide configuration</source>
 <target>Dölj konfigurationen</target>
 
@@ -1720,8 +1741,8 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel.
 <source>Password:</source>
 <target>Lösenord:</target>
 
-<source>Key password:</source>
-<target>Nyckellösenord:</target>
+<source>Key passphrase:</source>
+<target>Nyckellösenfras:</target>
 
 <source>Please enter a file path.</source>
 <target>Ange en filsökväg.</target>
@@ -1885,6 +1906,9 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel.
 <source>Minimum version count must be smaller than maximum count.</source>
 <target>Minsta antal versioner måste vara mindre än maximalt antal.</target>
 
+<source>&Restore</source>
+<target>&Återställ</target>
+
 <source>Files</source>
 <target>Filer</target>
 
@@ -1951,6 +1975,9 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel.
 <source>The file is locked by another process:</source>
 <target>Filen är låst av en annan process:</target>
 
+<source>Failed to determine file permission support for folder %x.</source>
+<target>Kunde inte avgöra filbehörighetsstöd för mappen %x.</target>
+
 <source>Cannot read security context of %x.</source>
 <target>Kan inte läsa säkerhetskontext för %x.</target>
 
@@ -2002,12 +2029,12 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel.
 <source>Cannot change process I/O priorities.</source>
 <target>Kan inte ändra I/O-prioritet.</target>
 
-<source>Unable to shut down the system.</source>
-<target>Kan inte stänga av systemet.</target>
-
 <source>Checking recycle bin failed for folder %x.</source>
 <target>Kontroll av papperskorgen misslyckades för %x.</target>
 
+<source>Unable to shut down the system.</source>
+<target>Kan inte stänga av systemet.</target>
+
 <source>Prepare installation</source>
 <target>Förbered installation</target>
 
diff --git a/FreeFileSync/Build/Resources/Languages/turkish.lng b/FreeFileSync/Build/Resources/Languages/turkish.lng
new file mode 100755
index 00000000..9c0171e3
--- /dev/null
+++ b/FreeFileSync/Build/Resources/Languages/turkish.lng
@@ -0,0 +1,2118 @@
+<header>
+	<language>Türkçe</language>
+	<translator>Kaya Zeren</translator>
+	<locale>tr_TR</locale>
+	<image>flag_turkey.png</image>
+	<plural_count>2</plural_count>
+	<plural_definition>n == 1 ? 0 : 1</plural_definition>
+</header>
+
+<source>Cannot read file %x.</source>
+<target>%x dosyası okunamadı.</target>
+
+<source>
+Unexpected size of data stream.
+Expected: %x bytes
+Actual: %y bytes
+</source>
+<target>
+Veri akışının boyutu beklenenden farklı.
+Beklenen: %x bayt
+Gerçekleşen: %y bayt
+</target>
+
+<source>Cannot write file %x.</source>
+<target>%x dosyası yazılamadı.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>%x izinleri yazılamadı.</target>
+
+<source>Operation not supported between different devices.</source>
+<target>Bu işlem farklı aygıtlar arasında yapılamaz.</target>
+
+<source>Cannot delete file %x.</source>
+<target>%x dosyası silinemedi.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>%x sembolik bağlantısı silinemedi.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>%x klasörü silinemedi.</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>%x dosyası %y üzerine taşınamadı.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>%x sembolik bağlantısı %y üzerine kopyalanamadı.</target>
+
+<source>Error Code %x</source>
+<target>Hata Kodu %x</target>
+
+<source>Cannot read directory %x.</source>
+<target>%x klasörü okunamadı.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>%x dosyasının değişiklik tarihi yazılamadı.</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>%x dosyasının öznitelikleri okunamadı.</target>
+
+<source>Cannot create directory %x.</source>
+<target>%x klasörü oluşturulamadı.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target>%x dosyasının son yolu belirlenemedi.</target>
+
+<source>Operation not supported by device.</source>
+<target>Bu işlem bu aygıt üzerinde yapılamaz.</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>%x sembolik bağlantısı çözümlenemedi.</target>
+
+<source>Unable to move %x to the recycle bin.</source>
+<target>%x geri dönüşüm kutusuna atılamadı.</target>
+
+<source>Authentication completed.</source>
+<target>Kimlik doğrulandı.</target>
+
+<source>You may close this page now and continue with FreeFileSync.</source>
+<target>Bu pencereyi kapatıp FreeFileSync kullanmaya devam edebilirsiniz.</target>
+
+<source>Authentication failed.</source>
+<target>Kimlik doğrulanamadı.</target>
+
+<source>Unable to connect to %x.</source>
+<target>%x üzerine bağlanılamadı.</target>
+
+<source>Cannot find %x.</source>
+<target>%x bulunamadı.</target>
+
+<source>The name %x is used by more than one item in the folder.</source>
+<target>%x adı klasördeki birden fazla öge için kullanılmış.</target>
+
+<source>Please authorize access to user account %x.</source>
+<target>Lütfen %x kullanıcı hesabına erişim izni verin.</target>
+
+<source>Cannot open file %x.</source>
+<target>%x dosyası açılamadı.</target>
+
+<source>The name %x is already used by another item.</source>
+<target>%x adı başka bir öge tarafından kullanılıyor.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>%x için boş disk alanı belirlenemedi.</target>
+
+<source>Unable to disconnect from %x.</source>
+<target>%x bağlantısı kesilemedi.</target>
+
+<source>Unable to access %x.</source>
+<target>%x bağlantısı kurulamadı.</target>
+
+<source>Failed to get information about server %x.</source>
+<target>%x sunucusu hakkında bilgi alınamadı.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>%x klasörü izlenemiyor.</target>
+
+<source>Cannot find device %x.</source>
+<target>%x aygıtı bulunamadı.</target>
+
+<source>Cannot open directory %x.</source>
+<target>%x klasörü açılamadı.</target>
+
+<source>Unsupported item type.</source>
+<target>Dosya türü desteklenmiyor.</target>
+
+<source>Incorrect command line:</source>
+<target>Satırdaki komut geçersiz:</target>
+
+<source>The server does not support authentication via %x.</source>
+<target>Sunucu %x üzerinden kimlik doğrulamasını desteklemiyor.</target>
+
+<source>Required:</source>
+<target>Zorunlu:</target>
+
+<source>
+<pluralform>Operation timed out after 1 second.</pluralform>
+<pluralform>Operation timed out after %x seconds.</pluralform>
+</source>
+<target>
+<pluralform>İşlem 1 saniye sonunda zaman aşımına uğradı.</pluralform>
+<pluralform>İşlem %x saniye sonunda zaman aşımına uğradı.</pluralform>
+</target>
+
+<source>
+<pluralform>Cannot wait on more than 1 connection at a time.</pluralform>
+<pluralform>Cannot wait on more than %x connections at a time.</pluralform>
+</source>
+<target>
+<pluralform>Aynı anda 1 taneden fazla bağlantı beklenemez.</pluralform>
+<pluralform>Aynı anda %x taneden fazla bağlantı beklenemez.</pluralform>
+</target>
+
+<source>Active connections: %x</source>
+<target>Etkin bağlantı sayısı: %x</target>
+
+<source>Failed to open SFTP channel number %x.</source>
+<target>%x SFTP kanal numarası açılamadı.</target>
+
+<source>Both sides have changed since last synchronization.</source>
+<target>Son eşitlemeden bu yana iki tarafında içeriği değişmiş.</target>
+
+<source>Cannot determine sync-direction:</source>
+<target>Eşitleme yönü belirlenemedi:</target>
+
+<source>No change since last synchronization.</source>
+<target>Son eşitlemeden bu yana bir değişiklik olmamış.</target>
+
+<source>The database entry is not in sync considering current settings.</source>
+<target>Geçerli kayıtlar ile veritabanı kaydı aynı değil.</target>
+
+<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
+<target>Varsayılan eşitleme yönleri ayarlanıyor: Yeni dosyalar eski dosyaların üzerine yazılacak.</target>
+
+<source>Creating file %x</source>
+<target>%x dosyası oluşturuluyor</target>
+
+<source>Creating folder %x</source>
+<target>%x klasörü oluşturuluyor</target>
+
+<source>Creating symbolic link %x</source>
+<target>%x sembolik bağlantısı oluşturuluyor</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 the recycle bin</source>
+<target>%x klasörü 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>
+
+<source>Deleting folder %x</source>
+<target>%x klasörü siliniyor</target>
+
+<source>Deleting symbolic link %x</source>
+<target>%x sembolik bağlantısı siliniyor</target>
+
+<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>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source>
+<target>Geri Dönüşüm Kutusu şu klasörler tarafından desteklenmiyor. Silinmiş ya da üzerine yazılmış klasörler geri yüklenemez:</target>
+
+<source>An exception occurred</source>
+<target>Olağan dışı bir durumla karşılaşıldı</target>
+
+<source>A left and a right directory path are expected after %x.</source>
+<target>%x ardından sol ve sağ klasör belirtilmelidir.</target>
+
+<source>Syntax error</source>
+<target>Yazım hatası</target>
+
+<source>Cannot find file %x.</source>
+<target>%x dosyası bulunamadı.</target>
+
+<source>Error</source>
+<target>Sorun</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>%x dosyası geçerli yapılandırma bilgilerini içermiyor.</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ği zaman, yapılandırma dosyasında klasör çifti düzeyinde ayarlar bulunmamalıdır.</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Klasörler birden fazla yapılandırma dosyasında kullanılamaz.</target>
+
+<source>Command line</source>
+<target>Komut Satırı</target>
+
+<source>Syntax:</source>
+<target>Yazım:</target>
+
+<source>config files:</source>
+<target>yapılandırma dosyaları:</target>
+
+<source>directory</source>
+<target>klasör</target>
+
+<source>global config file:</source>
+<target>genel yapılandırma dosyası:</target>
+
+<source>Any number of FreeFileSync "ffs_gui" and/or "ffs_batch" configuration files.</source>
+<target>FreeFileSync "ffs_gui" ya da "ffs_batch" yapılandırma dosyalarının sayısı.</target>
+
+<source>Any number of alternative directory pairs for at most one config file.</source>
+<target>En fazla bir yapılandırma dosyası için herhangi bir sayıda alternatif klasör çifti.</target>
+
+<source>Open the selected configuration for editing only, without executing it.</source>
+<target>Seçilmiş yapılandırmayı yürütmeden yalnız düzenlemek için açar.</target>
+
+<source>Path to an alternate GlobalSettings.xml file.</source>
+<target>Alternatif GlobalSettings.xml dosyasının yolu.</target>
+
+<source>Installation files are corrupted. Please reinstall FreeFileSync.</source>
+<target>Kurulum dosyaları bozulmuş. Lütfen FreeFileSync uygulamasını yeniden kurun.</target>
+
+<source>Cannot find the following folders:</source>
+<target>Aşağıdaki klasörler bulunamadı:</target>
+
+<source>The following folders do not yet exist:</source>
+<target>Şu klasörler bulunamadı:</target>
+
+<source>The folders are created automatically when needed.</source>
+<target>Klasörler gerektiğinde otomatik olarak oluşturulur.</target>
+
+<source>The following folder paths differ in case. Please use a single form in order to avoid duplicate accesses.</source>
+<target>Şu klasör yolu büyük küçük harf olarak farklı. Lütfen çift erişimleri engellemek için tek bir biçim kullanın.</target>
+
+<source>Scanning:</source>
+<target>Taranıyor:</target>
+
+<source>Comparison finished:</source>
+<target>Karşılaştırma tamamlandı:</target>
+
+<source>
+<pluralform>1 item found</pluralform>
+<pluralform>%x items found</pluralform>
+</source>
+<target>
+<pluralform>1 öge bulundu</pluralform>
+<pluralform>%x öge bulundu</pluralform>
+</target>
+
+<source>Time elapsed:</source>
+<target>Geçen süre:</target>
+
+<source>File %x has an invalid date.</source>
+<target>%x dosyasının tarihi geçersiz.</target>
+
+<source>Date:</source>
+<target>Tarih:</target>
+
+<source>Files have the same date but a different size.</source>
+<target>Dosyaların tarihleri aynı ancak boyutları farklı.</target>
+
+<source>Size:</source>
+<target>Boyut:</target>
+
+<source>Content comparison was skipped for excluded files.</source>
+<target>Katılmayan dosyalar için içerik karşılaştırması atlandı.</target>
+
+<source>Items differ in attributes only</source>
+<target>Yalnız öznitelikleri farklı olan ögeler</target>
+
+<source>Resolving symbolic link %x</source>
+<target>%x sembolik bağlantısı çözümleniyor</target>
+
+<source>Comparing content of files %x</source>
+<target>%x dosyalarının içeriği karşılaştırılıyor</target>
+
+<source>Generating file list...</source>
+<target>Dosya listesi oluşturuluyor...</target>
+
+<source>Fail-safe file copy</source>
+<target>Dosyalar sorunsuz kopyalansın</target>
+
+<source>Enabled</source>
+<target>Etkin</target>
+
+<source>Disabled</source>
+<target>Devre Dışı</target>
+
+<source>Copy locked files</source>
+<target>Kilitli dosyalar da kopyalansın</target>
+
+<source>Copy file access permissions</source>
+<target>Dosya Erişim İzinleri de Kopyalansın</target>
+
+<source>File time tolerance</source>
+<target>Yok sayılacak dosya zamanı farkı</target>
+
+<source>Run with background priority</source>
+<target>Artalan önceliği ile çalışsın</target>
+
+<source>Lock directories during sync</source>
+<target>Klasörler eşitleme sırasında kilitlensin</target>
+
+<source>Verify copied files</source>
+<target>Kopyalanmış dosyalar doğrulansın</target>
+
+<source>Using non-default global settings:</source>
+<target>Varsayılan olmayan genel ayarlar kullanılıyor:</target>
+
+<source>A folder input field is empty.</source>
+<target>Bir klasör giriş alanı boş.</target>
+
+<source>The corresponding folder will be considered as empty.</source>
+<target>Karşıdaki klasör boş olarak kabul edilecek.</target>
+
+<source>Exclude:</source>
+<target>Katılmayacak Ögeler:</target>
+
+<source>One base folder of a folder pair is contained in the other one.</source>
+<target>Klasör çiftindeki temel bir klasör diğerinin içinde bulunuyor.</target>
+
+<source>The folder should be excluded from synchronization via filter.</source>
+<target>Süzgeç kullanılarak klasör eşitlemeye katılmamalı.</target>
+
+<source>Calculating sync directions...</source>
+<target>Eşitleme yönleri hesaplanıyor...</target>
+
+<source>Out of memory.</source>
+<target>Bellek yetersiz.</target>
+
+<source>Show in Explorer</source>
+<target>Tarayıcıda Görüntüle</target>
+
+<source>Open with default application</source>
+<target>Varsayılan Uygulama ile Aç</target>
+
+<source>Browse directory</source>
+<target>Klasöre Gözat</target>
+
+<source>Database file %x is incompatible.</source>
+<target>%x veritabanı dosyası uyumsuz.</target>
+
+<source>Initial synchronization:</source>
+<target>Başlangıç eşitlemesi:</target>
+
+<source>Database file %x does not yet exist.</source>
+<target>%x veritabanı dosyası henüz yok.</target>
+
+<source>Database file is corrupted:</source>
+<target>Veritabanı dosyası bozulmuş:</target>
+
+<source>The database files do not yet contain information about the last synchronization.</source>
+<target>Veritabanı dosyalarında henüz son eşitleme bilgileri yok.</target>
+
+<source>Loading file %x...</source>
+<target>%x dosyaları yükleniyor...</target>
+
+<source>Saving file %x...</source>
+<target>%x dosyası kaydediliyor...</target>
+
+<source>Searching for folder %x...</source>
+<target>%x klasörü aranıyor...</target>
+
+<source>Timeout while searching for folder %x.</source>
+<target>%x klasöründeki arama işlemi zaman aşımına uğradı.</target>
+
+<source>Cannot get process information.</source>
+<target>İşlem bilgisi alınamadı.</target>
+
+<source>Waiting while directory is locked:</source>
+<target>Klasör kilitli olduğundan bekleniyor:</target>
+
+<source>Lock owner:</source>
+<target>Kilitleyen:</target>
+
+<source>Detecting abandoned lock...</source>
+<target>Kaldırılmış kilit algılanıyor...</target>
+
+<source>
+<pluralform>1 sec</pluralform>
+<pluralform>%x sec</pluralform>
+</source>
+<target>
+<pluralform>1 saniye</pluralform>
+<pluralform>%x saniye</pluralform>
+</target>
+
+<source>Item exists on left side only</source>
+<target>Yalnız solda bulunan ögeler</target>
+
+<source>Item exists on right side only</source>
+<target>Yalnız sağda bulunan ögeler</target>
+
+<source>Left side is newer</source>
+<target>Soldaki daha yeni ögeler</target>
+
+<source>Right side is newer</source>
+<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 taraf eşit</target>
+
+<source>Conflict/item cannot be categorized</source>
+<target>Uyuşmayan/sınıflanamayan ögeler</target>
+
+<source>Copy new item to left</source>
+<target>Yeni öge sola kopyalansın</target>
+
+<source>Copy new item to right</source>
+<target>Yeni öge sağa kopyalansın</target>
+
+<source>Delete left item</source>
+<target>Soldaki öge silinsin</target>
+
+<source>Delete right item</source>
+<target>Sağdaki öge silinsin</target>
+
+<source>Move file on left</source>
+<target>Soldaki dosya taşınsın</target>
+
+<source>Move file on right</source>
+<target>Sağdaki dosya taşınsın</target>
+
+<source>Update left item</source>
+<target>Soldaki öge güncellensin</target>
+
+<source>Update right item</source>
+<target>Sağdaki öge güncellensin</target>
+
+<source>Do nothing</source>
+<target>Hiçbir işlem yapılmasın</target>
+
+<source>Update attributes on left</source>
+<target>Soldaki öznitelikler güncellensin</target>
+
+<source>Update attributes on right</source>
+<target>Sağdaki öznitelikler güncellensin</target>
+
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>%x dosyası işlenirken sorun çıktı, satır %y, sütun %z.</target>
+
+<source>Services</source>
+<target>Hizmetler</target>
+
+<source>Show All</source>
+<target>Tümünü Görüntüle</target>
+
+<source>Hide Others</source>
+<target>Diğerlerini Gizle</target>
+
+<source>Hide %x</source>
+<target>%x Ögesini Gizle</target>
+
+<source>Quit %x</source>
+<target>%x Uygulamasından Çık</target>
+
+<source>Cannot set directory locks for the following folders:</source>
+<target>Şu klasörler kilitlenemedi:</target>
+
+<source>Errors:</source>
+<target>Hatalar:</target>
+
+<source>Warnings:</source>
+<target>Uyarılar:</target>
+
+<source>Items processed:</source>
+<target>İşlenen öge:</target>
+
+<source>Items remaining:</source>
+<target>Kalan öge:</target>
+
+<source>Total time:</source>
+<target>Toplam süre:</target>
+
+<source>Warning</source>
+<target>Uyarı</target>
+
+<source>Stopped</source>
+<target>Durduruldu</target>
+
+<source>Cleaning up log files:</source>
+<target>Günlük dosyaları temizleniyor:</target>
+
+<source>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
+</source>
+<target>
+<pluralform>1 iş parçacığı</pluralform>
+<pluralform>%x iş parçacığı</pluralform>
+</target>
+
+<source>%x/sec</source>
+<target>%x/saniye</target>
+
+<source>%x items</source>
+<target>%x öge</target>
+
+<source>Completed successfully</source>
+<target>Tamamlandı</target>
+
+<source>Completed with warnings</source>
+<target>Uyarılar ile tamamlandı</target>
+
+<source>Completed with errors</source>
+<target>Sorunlar ile tamamlandı</target>
+
+<source>Cannot access the Volume Shadow Copy Service.</source>
+<target>Birim Gölge Hizmetine erişilemiyor.</target>
+
+<source>Please run the 64-bit version of FreeFileSync to create shadow copies on this system.</source>
+<target>Lütfen bu sistemde gölge kopyalar oluşturmak için FreeFileSync uygulamasının 64 bit sürümünü kullanın.</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>File time and size</source>
+<target>Tarih ve Saate Göre</target>
+
+<source>File content</source>
+<target>İçeriğe Göre</target>
+
+<source>File size</source>
+<target>Boyuta Göre</target>
+
+<source>Two way</source>
+<target>Çift Yönlü</target>
+
+<source>Mirror</source>
+<target>Yansıtma</target>
+
+<source>Update</source>
+<target>Güncelleme</target>
+
+<source>Custom</source>
+<target>Özel</target>
+
+<source>Multiple...</source>
+<target>Çoklu...</target>
+
+<source>Cannot write file attributes of %x.</source>
+<target>%x dosya öznitelikleri yazılamadı.</target>
+
+<source>%x and %y have different content.</source>
+<target>%x ve %y farklı içeriklere sahip.</target>
+
+<source>Data verification error:</source>
+<target>Veri doğrulama sorunu:</target>
+
+<source>Moving file %x to %y</source>
+<target>%x dosyası %y içine taşınıyor</target>
+
+<source>Moving folder %x to %y</source>
+<target>%x klasörü %y içine taşınıyor</target>
+
+<source>Moving symbolic link %x to %y</source>
+<target>%x sembolik bağlantısı %y içine taşınıyor</target>
+
+<source>Updating file %x</source>
+<target>%x dosyası güncelleniyor</target>
+
+<source>Updating symbolic link %x</source>
+<target>%x sembolik bağlantısı güncelleniyor</target>
+
+<source>Verifying file %x</source>
+<target>%x dosyası doğrulanıyor</target>
+
+<source>Updating attributes of %x</source>
+<target>%x öznitelikleri güncelleniyor</target>
+
+<source>Source item %x not found</source>
+<target>%x kaynak ögesi bulunamadı</target>
+
+<source>Parent folder %x is not existing.</source>
+<target>%x üst klasörü bulunamadı.</target>
+
+<source>Cannot copy file %x to %y.</source>
+<target>%x dosyası %y üzerine kopyalanamadı.</target>
+
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>%x için Birim Gölge Hizmeti oluşturuluyor...</target>
+
+<source>Cannot find folder %x.</source>
+<target>%x klasörü bulunamadı.</target>
+
+<source>Target folder %x is already existing, but was not available during folder comparison.</source>
+<target>%x hedef klasörü zaten var ancak klasör karşılaştırması sırasında erişilemedi.</target>
+
+<source>Target folder input field must not be empty.</source>
+<target>Hedef klasör giriş alanı boş olmamalı.</target>
+
+<source>Source folder %x not found.</source>
+<target>%x kaynak klasörü bulunamadı.</target>
+
+<source>Please enter a target folder for versioning.</source>
+<target>Sürüm izlemesinde kullanılacak bir hedef klasör yazın.</target>
+
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Uyuşmazlığı çözümlenmemiş şu ögeler eşitlenmeyecek:</target>
+
+<source>Folder pair:</source>
+<target>Klasör çifti:</target>
+
+<source>The following folders are significantly different. Please check that the correct folders are selected for synchronization.</source>
+<target>Şu klasörler birbirinden çok farklı. Lütfen eşitleme için doğru klasörleri seçtiğinizden emin olun.</target>
+
+<source>Not enough free disk space available in:</source>
+<target>Şurada yeterli boş disk alanı yok:</target>
+
+<source>Available:</source>
+<target>Kullanılabilir:</target>
+
+<source>Some files will be synchronized as part of multiple base folders.</source>
+<target>Bazı dosyalar çoklu temel klasörlerin bir parçası olarak eşitlenecek.</target>
+
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target>Katılmayacaklar süzgeçleri ile çakışmalar engellenebilir. Güncellenen dosyalar yalnız bir tek temel klasörden alınır.</target>
+
+<source>Versioning folder:</source>
+<target>Sürüm klasörü:</target>
+
+<source>Base folder:</source>
+<target>Temel klasör:</target>
+
+<source>The versioning folder is contained in a base folder.</source>
+<target>Sürümlendirme klasörü bir temel klasör içinde bulunuyor.</target>
+
+<source>Synchronizing folder pair:</source>
+<target>Eşitlenen klasör çifti:</target>
+
+<source>Generating database...</source>
+<target>Veritabanı oluşturuluyor...</target>
+
+<source>Searching for old file versions:</source>
+<target>Önceki dosya sürümleri aranıyor:</target>
+
+<source>Removing old file versions:</source>
+<target>Önceki dosya sürümleri siliniyor:</target>
+
+<source>Unable to create time stamp for versioning:</source>
+<target>Sürümlendirme için zaman damgası oluşturulamadı:</target>
+
+<source>Drag && drop</source>
+<target>Dosyaları sürükleyip buraya bırakın</target>
+
+<source>Select a folder</source>
+<target>Bir klasör seçin</target>
+
+<source>&New</source>
+<target>&Yeni</target>
+
+<source>&Open...</source>
+<target>&Aç...</target>
+
+<source>Save &as...</source>
+<target>F&arklı Kaydet...</target>
+
+<source>E&xit</source>
+<target>Çı&k</target>
+
+<source>&File</source>
+<target>&Dosya</target>
+
+<source>&View help</source>
+<target>&Yardım Konuları</target>
+
+<source>&About</source>
+<target>H&akkında</target>
+
+<source>&Help</source>
+<target>&Yardım</target>
+
+<source>Usage:</source>
+<target>Kullanım:</target>
+
+<source>1. Select folders to watch.</source>
+<target>1. İzlenecek klasörleri seçin.</target>
+
+<source>2. Enter a command line.</source>
+<target>2. Bir satır komutu yazın.</target>
+
+<source>3. Press 'Start'.</source>
+<target>3. 'Başlat' düğmesine tıklayın.</target>
+
+<source>To get started just import a "ffs_batch" file.</source>
+<target>"ffs_batch" dosyasını yükleyerek başlayabilirsiniz.</target>
+
+<source>Folders to watch:</source>
+<target>İzlenecek Klasörler:</target>
+
+<source>Add folder</source>
+<target>Klasör Ekle</target>
+
+<source>Remove folder</source>
+<target>Klasörü Sil</target>
+
+<source>Browse</source>
+<target>Gözat</target>
+
+<source>Idle time (in seconds):</source>
+<target>Boşta Bekleme Süresi (saniye):</target>
+
+<source>Idle time between last detected change and execution of command</source>
+<target>Son algılanan değişiklik ile komutun yürütülmesi arasında beklenecek süre</target>
+
+<source>Command line:</source>
+<target>Satır Komutu:</target>
+
+<source>&Hide console window</source>
+<target>&Konsol penceresini gizle</target>
+
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Komut şu durumlarda yürütülür:
+- dosya ya alt klasörler değiştiğinde
+- yeni klasörler algılandığında (örneğin bir USB bellek takıldığında)
+</target>
+
+<source>Start</source>
+<target>Başlat</target>
+
+<source>About</source>
+<target>Hakkında</target>
+
+<source>Build: %x</source>
+<target>Yapım: %x</target>
+
+<source>All files</source>
+<target>Tüm Dosyalar</target>
+
+<source>Automated Synchronization</source>
+<target>Otomatik Eşitleme</target>
+
+<source>The %x protocol does not support directory monitoring:</source>
+<target>%x iletişim kuralı klasör izlemesini desteklemiyor:</target>
+
+<source>Directory monitoring active</source>
+<target>Klasör izlemesi yapılıyor</target>
+
+<source>Waiting until directory is available:</source>
+<target>Klasörün kullanılabilir olması bekleniyor:</target>
+
+<source>&Configure</source>
+<target>&Yapılandır</target>
+
+<source>&Show error message</source>
+<target>&Hata iletisini görüntüle</target>
+
+<source>&Quit</source>
+<target>Çı&k</target>
+
+<source>&Retry</source>
+<target>&Yeniden Dene</target>
+
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
+<target>
+<pluralform>1 bayt</pluralform>
+<pluralform>%x bayt</pluralform>
+</target>
+
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
+<source>Loading...</source>
+<target>Yükleniyor...</target>
+
+<source>Scanning...</source>
+<target>Taranıyor...</target>
+
+<source>configuration file</source>
+<target>yapılandırma dosyası</target>
+
+<source>System: Sleep</source>
+<target>Sistem: Uyku</target>
+
+<source>System: Shut down</source>
+<target>Sistem: Kapat</target>
+
+<source>Nothing to synchronize</source>
+<target>Eşitlenecek bir şey yok</target>
+
+<source>Executing command:</source>
+<target>Komut yürütülüyor:</target>
+
+<source>You can switch to FreeFileSync's main window to resolve this issue.</source>
+<target>Bu sorunu çözmek için FreeFileSync ana penceresine geçebilirsiniz.</target>
+
+<source>&Don't show this warning again</source>
+<target>Bu &uyarı bir daha görüntülenmesin</target>
+
+<source>&Ignore</source>
+<target>&Yok Say</target>
+
+<source>&Switch</source>
+<target>&Değiştir</target>
+
+<source>Switching to FreeFileSync's main window</source>
+<target>FreeFileSync ana penceresine geçiliyor</target>
+
+<source>Automatic retry</source>
+<target>Otomatik yeniden denensin</target>
+
+<source>Ignore &all</source>
+<target>Tümünü Yok S&ay</target>
+
+<source>Retrying operation...</source>
+<target>İşlem yeniden deneniyor...</target>
+
+<source>Serious Error</source>
+<target>Ciddi Sorun</target>
+
+<source>Last session</source>
+<target>Önceki oturum</target>
+
+<source>Today</source>
+<target>Bugün</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 gün</pluralform>
+<pluralform>%x gün</pluralform>
+</target>
+
+<source>Name</source>
+<target>Ad</target>
+
+<source>Last sync</source>
+<target>Son eşitleme</target>
+
+<source>Log</source>
+<target>Günlük</target>
+
+<source>Folder</source>
+<target>Klasör</target>
+
+<source>Symlink</source>
+<target>Smblkbağlantı</target>
+
+<source>Full path</source>
+<target>Tam Yol</target>
+
+<source>Relative path</source>
+<target>Bağıl yol</target>
+
+<source>Item name</source>
+<target>Öge adı</target>
+
+<source>Size</source>
+<target>Boyut</target>
+
+<source>Date</source>
+<target>Tarih</target>
+
+<source>Extension</source>
+<target>Uzantı</target>
+
+<source>Category</source>
+<target>Öge Türü</target>
+
+<source>Action</source>
+<target>İşlem</target>
+
+<source>Local comparison settings</source>
+<target>Yerel karşılaştırma ayarları</target>
+
+<source>Local synchronization settings</source>
+<target>Yerel eşitleme ayarları</target>
+
+<source>Local filter</source>
+<target>Yerel Süzgeç</target>
+
+<source>Active</source>
+<target>Etkin</target>
+
+<source>None</source>
+<target>Yok</target>
+
+<source>Remove local settings</source>
+<target>Yerel Ayarları Sil</target>
+
+<source>Clear local filter</source>
+<target>Yerel Süzgeci Temizle</target>
+
+<source>Copy</source>
+<target>Kopyala</target>
+
+<source>Paste</source>
+<target>Yapıştır</target>
+
+<source>The selected folder %x cannot be used with FreeFileSync.</source>
+<target>Seçilmiş %x klasörü FreeFileSync ile birlikte kullanılamaz.</target>
+
+<source>Please select a folder on a local file system, network or an MTP device.</source>
+<target>Lütfen yerel dosya sistemi, ağ ya da MTP aygıtı üzerinde bulunan bir klasör seçin.</target>
+
+<source>Defined by context of use</source>
+<target>Kullanım bağlamına göre tanımlı</target>
+
+<source>Requires FreeFileSync Donation Edition</source>
+<target>Bu özellik FreeFileSync Bağış Sürümünde bulunur</target>
+
+<source>&Save</source>
+<target>&Kaydet</target>
+
+<source>Save as &batch job...</source>
+<target>&Toplu İş Olarak Kaydet...</target>
+
+<source>Show &log</source>
+<target>Gün&lüğü Görüntüle</target>
+
+<source>Start &comparison</source>
+<target>&Karşılaştırmayı Başlat</target>
+
+<source>C&omparison settings</source>
+<target>K&arşılaştırma Ayarları</target>
+
+<source>&Filter settings</source>
+<target>&Süzme Ayarları</target>
+
+<source>S&ynchronization settings</source>
+<target>Eşi&tleme Ayarları</target>
+
+<source>Start &synchronization</source>
+<target>&Eşitlemeyi Başlat</target>
+
+<source>&Actions</source>
+<target>İş&lemler</target>
+
+<source>&Preferences</source>
+<target>&Ayarlar</target>
+
+<source>&Language</source>
+<target>&Dil</target>
+
+<source>&Find...</source>
+<target>A&rama...</target>
+
+<source>&Export file list...</source>
+<target>&Dosya Listesini Ver...</target>
+
+<source>&Reset layout</source>
+<target>Görünümü &Sıfırla</target>
+
+<source>&Tools</source>
+<target>&Araçlar</target>
+
+<source>&Check for updates now</source>
+<target>&Güncellemeleri Denetle</target>
+
+<source>Check &automatically once a week</source>
+<target>&Haftada Bir Denetlensin</target>
+
+<source>Cancel</source>
+<target>İptal</target>
+
+<source>Compare</source>
+<target>Karşılaştır</target>
+
+<source>Synchronize</source>
+<target>Eşitle</target>
+
+<source>Add folder pair</source>
+<target>Klasör Çifti Ekle</target>
+
+<source>Remove folder pair</source>
+<target>Klasör Çiftini Sil</target>
+
+<source>Access online storage</source>
+<target>Çevrimiçi Depolama Erişimi</target>
+
+<source>Close search bar</source>
+<target>Arama Çubuğunu Kapat</target>
+
+<source>Find:</source>
+<target>Aranacak ifade:</target>
+
+<source>Match case</source>
+<target>Büyük küçük harf uyumu göz önüne alınsın</target>
+
+<source>Processed:</source>
+<target>İşlenen:</target>
+
+<source>Remaining:</source>
+<target>Kalan:</target>
+
+<source>New</source>
+<target>Yeni</target>
+
+<source>Open...</source>
+<target>Aç...</target>
+
+<source>Save</source>
+<target>Kaydet</target>
+
+<source>Save as...</source>
+<target>Farklı Kaydet...</target>
+
+<source>View type:</source>
+<target>Görünüm Kipi:</target>
+
+<source>Select view:</source>
+<target>Eşit Dosya Görünümü:</target>
+
+<source>Save as default</source>
+<target>Varsayılan Olarak Kaydet</target>
+
+<source>Statistics:</source>
+<target>İstatistikler:</target>
+
+<source>Number of files and folders that will be deleted</source>
+<target>Silinecek dosya ve klasör sayısı</target>
+
+<source>Number of files that will be updated</source>
+<target>Güncellenecek dosya sayısı</target>
+
+<source>Number of files and folders that will be created</source>
+<target>Eklenecek dosya ve klasör sayısı</target>
+
+<source>Total bytes to copy</source>
+<target>Toplam kopyalanacak bayt</target>
+
+<source>Arrange folder pair</source>
+<target>Klasör çiftini belirleyin</target>
+
+<source>Main settings:</source>
+<target>Temel ayarlar:</target>
+
+<source>Use local settings:</source>
+<target>Yerel Ayarlar Kullanılsın:</target>
+
+<source>Select a variant:</source>
+<target>İşlem Türünü Seçin:</target>
+
+<source>Include &symbolic links:</source>
+<target>&Sembolik bağlantılar katılsın:</target>
+
+<source>&Follow</source>
+<target>İ&zlensin</target>
+
+<source>&Direct</source>
+<target>&Yönlendirilsin</target>
+
+<source>More information</source>
+<target>Ayrıntılı bilgiler</target>
+
+<source>&Ignore time shift [hh:mm]</source>
+<target>&Yok sayılacak zaman farkı [ss:dd]</target>
+
+<source>List of file time offsets to ignore</source>
+<target>Zaman farkı yok sayılacak dosyaların listesi</target>
+
+<source>Example:</source>
+<target>Örnek:</target>
+
+<source>Handle daylight saving time</source>
+<target>Yaz saati hakkında bilgiler</target>
+
+<source>Ignore errors</source>
+<target>Sorunlar yok sayılsın</target>
+
+<source>Retry count:</source>
+<target>Deneme Sayısı:</target>
+
+<source>Delay (in seconds):</source>
+<target>Bekleme (saniye):</target>
+
+<source>Performance improvements:</source>
+<target>Başarım İyileştirmeleri:</target>
+
+<source>Parallel file operations:</source>
+<target>Eş Zamanlı İşlenecek Dosya Sayısı:</target>
+
+<source>How to get best performance?</source>
+<target>En iyi başarım nasıl sağlanır?</target>
+
+<source>Local settings:</source>
+<target>Yerel ayarlar:</target>
+
+<source>Include:</source>
+<target>Katılacak Ögeler:</target>
+
+<source>Show examples</source>
+<target>Örneklere Bakın</target>
+
+<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source>
+<target>Eşitlenmeyecek dosyaların süzülme kurallarını belirleyin. Dosya yollarını bulundukları klasör çiftine göre yazın.</target>
+
+<source>File size:</source>
+<target>Dosya Boyutu:</target>
+
+<source>Minimum:</source>
+<target>En Küçük:</target>
+
+<source>Maximum:</source>
+<target>En Büyük:</target>
+
+<source>Time span:</source>
+<target>Zaman Aralığı:</target>
+
+<source>C&lear</source>
+<target>&Temizle</target>
+
+<source>Detect moved files</source>
+<target>Taşınmış dosyalar algılansın</target>
+
+<source>
+- Not supported by all file systems
+- Requires and creates database files
+- Detection not available for first sync
+</source>
+<target>
+- Tüm dosya sistemleri tarafından desteklenmez
+- Veritabanı dosyalarının kullanılması gerekir
+- Algılama, ilk eşitleme sırasında kullanılamaz
+</target>
+
+<source>Delete files:</source>
+<target>Dosya Silme İşlemi:</target>
+
+<source>&Recycle bin</source>
+<target>Ge&ri Dönüşüm Kutusuna Atılsın</target>
+
+<source>&Permanent</source>
+<target>&Kalıcı Olarak Silinsin</target>
+
+<source>&Versioning</source>
+<target>Eski &Sürüm Olarak Saklansın</target>
+
+<source>Move files to a user-defined folder</source>
+<target>Dosyalar kullanıcının belirteceği şu klasöre taşınsın</target>
+
+<source>Naming convention:</source>
+<target>Adlandırma Kuralı:</target>
+
+<source>Limit file versions:</source>
+<target>Dosya Sürümü Sayısı Sınırlaması:</target>
+
+<source>Last x days:</source>
+<target>Son x Gün:</target>
+
+<source>&Override default log path:</source>
+<target>Varsayılan yerine kullanılacak günlük y&olu:</target>
+
+<source>Run a command:</source>
+<target>Bir komut yürüt:</target>
+
+<source>OK</source>
+<target>Tamam</target>
+
+<source>Connection type:</source>
+<target>Bağlantı Türü:</target>
+
+<source>Connected user accounts:</source>
+<target>Bağlantılı kullanıcı hesapları:</target>
+
+<source>&Add connection</source>
+<target>&Bağlantı ekle</target>
+
+<source>&Disconnect</source>
+<target>Bağlantıyı &Kes</target>
+
+<source>Selected user account:</source>
+<target>Seçilmiş kullanıcı hesabı:</target>
+
+<source>Server name or IP address:</source>
+<target>Sunucu Adı / IP Adresi:</target>
+
+<source>Port:</source>
+<target>Kapı:</target>
+
+<source>Encryption:</source>
+<target>Şifreleme:</target>
+
+<source>&Disabled</source>
+<target>&Devre Dışı</target>
+
+<source>&Explicit SSL/TLS</source>
+<target>&Açık SSL/TLS</target>
+
+<source>Authentication:</source>
+<target>Kimlik Doğrulaması:</target>
+
+<source>&Password</source>
+<target>&Parola</target>
+
+<source>&Key file</source>
+<target>Anahtar &Dosyası</target>
+
+<source>&SSH agent</source>
+<target>&SSH İstemcisi</target>
+
+<source>User name:</source>
+<target>Kullanıcı Adı:</target>
+
+<source>Private key file:</source>
+<target>Özel Anahtar Dosyası:</target>
+
+<source>&Show password</source>
+<target>Parola &Görüntülensin</target>
+
+<source>Directory on server:</source>
+<target>Sunucudaki Klasör:</target>
+
+<source>Access timeout (in seconds):</source>
+<target>Erişim zaman aşımı (saniye):</target>
+
+<source>SFTP channels per connection:</source>
+<target>Bir Bağlantı için SFTP Kanalı Sayısı:</target>
+
+<source>Detect server limit</source>
+<target>Sunucu Sınırını Bul</target>
+
+<source>Select Folder</source>
+<target>Klasör Seçin</target>
+
+<source>Variant:</source>
+<target>İşlem Türü:</target>
+
+<source>&Don't show this dialog again</source>
+<target>Bu pencere bir daha &görüntülenmesin</target>
+
+<source>Bytes:</source>
+<target>Bayt:</target>
+
+<source>Items:</source>
+<target>Ögeler:</target>
+
+<source>Synchronizing...</source>
+<target>Eşitleniyor...</target>
+
+<source>Minimize to notification area</source>
+<target>Bildirim alanına küçült</target>
+
+<source>Bytes</source>
+<target>Bayt</target>
+
+<source>Items</source>
+<target>Öge</target>
+
+<source>When finished:</source>
+<target>Tamamlandığında:</target>
+
+<source>Auto-close</source>
+<target>Otomatik kapat</target>
+
+<source>Close</source>
+<target>Kapat</target>
+
+<source>&Pause</source>
+<target>&Duraklat</target>
+
+<source>Stop</source>
+<target>Durdur</target>
+
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>Eşitleme işleminin hiç bir soru sorulmadan yapılması için bir toplu iş dosyası oluşturun. İşlemi başlatmak için bu dosyaya çift tıklayın ya da bir görev zamanlayıcıya şu şekilde ekleyin: %x</target>
+
+<source>Progress dialog:</source>
+<target>İlerleme penceresi:</target>
+
+<source>Run minimized</source>
+<target>Küçültülmüş Çalıştırılsın</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Sorun ya da uyarılar açılır pencerede görüntülenir</target>
+
+<source>&Cancel</source>
+<target>İ&ptal edilsin</target>
+
+<source>Stop synchronization at first error</source>
+<target>Çıkan ilk sorunda eşitleme durdurulsun</target>
+
+<source>How can I schedule a batch job?</source>
+<target>Toplu İşlem Zamanlaması Hakkında Bilgiler</target>
+
+<source>&Keep relative paths</source>
+<target>Bağıl yollar &korunsun</target>
+
+<source>&Overwrite existing files</source>
+<target>&Varolan dosyaların üzerine yazılsın</target>
+
+<source>The following settings are used for all synchronization jobs.</source>
+<target>Aşağıdaki ayarlar tüm eşitleme işlemleri için geçerlidir.</target>
+
+<source>
+Copy to a temporary file (*.ffs_tmp) before overwriting target.
+This guarantees a consistent state even in case of a serious error.
+</source>
+<target>
+Dosyalar önce geçici dosyaya kopyalanıp (*.ffs_tmp) sonra yeniden adlandırılır. 
+Bu yöntem, ciddi bir sorun çıkması durumunda bile işlemin tutarlı olarak yapılmasını sağlar.
+</target>
+
+<source>recommended</source>
+<target>önerilen</target>
+
+<source>Copy shared or locked files using the Volume Shadow Copy Service.</source>
+<target>Paylaşılan ya da kilitlenmiş dosyalar Birim Gölge Hizmetini kullanılarak kopyalanır.</target>
+
+<source>requires administrator rights</source>
+<target>yönetici izinleri gerekir</target>
+
+<source>Transfer file and folder permissions.</source>
+<target>Dosya ve klasör izinleri de aktarılır.</target>
+
+<source>Show all permanently hidden dialogs and warning messages again</source>
+<target>Kalıcı olarak gizlenmiş tüm ileti ve uyarılar yeniden görüntülenir</target>
+
+<source>Default log path:</source>
+<target>Varsayılan günlük dosyası yolu:</target>
+
+<source>&Delete logs after x days:</source>
+<target>&Günlük kayıtlarının silineceği gün sayısı:</target>
+
+<source>Notification sounds:</source>
+<target>Bildirim sesleri:</target>
+
+<source>Synchronization finished:</source>
+<target>Eşitleme tamamlandı:</target>
+
+<source>Customize context menu:</source>
+<target>Sağ Tık Menüsü Uyarlamaları:</target>
+
+<source>Description</source>
+<target>Açıklama</target>
+
+<source>&Default</source>
+<target>&Varsayılan</target>
+
+<source>Feedback and suggestions are welcome:</source>
+<target>Geri bildirim ve önerilerinizi bekliyoruz:</target>
+
+<source>Home page</source>
+<target>Ana Sayfa</target>
+
+<source>FreeFileSync Forum</source>
+<target>FreeFileSync Forumu</target>
+
+<source>Email</source>
+<target>E-posta</target>
+
+<source>If you like FreeFileSync:</source>
+<target>FreeFileSync hoşunuza gittiyse:</target>
+
+<source>Support with a donation</source>
+<target>Bağış yaparak destek olun</target>
+
+<source>The auto updater was disabled by the administrator.</source>
+<target>Otomatik güncelleme yönetici tarafından devre dışı bırakılmış.</target>
+
+<source>Donation details</source>
+<target>Bağış Bilgileri</target>
+
+<source>Source code written in C++ using:</source>
+<target>Kaynak kodu C++ kullanılarak yazılmıştır:</target>
+
+<source>Published under the GNU General Public License:</source>
+<target>GNU Genel Kamu Lisansı koşulları altında yayınlanmıştır:</target>
+
+<source>Many thanks for localization:</source>
+<target>Çeviriler için çok teşekkürler:</target>
+
+<source>Activate the FreeFileSync Donation Edition by one of the following methods:</source>
+<target>FreeFileSync Bağış Sürümü şu yöntemlerden biri ile etkinleştirilebilir:</target>
+
+<source>1. Activate via internet now:</source>
+<target>1. İnternet üzerinden etkinleştirme:</target>
+
+<source>Activate online</source>
+<target>Çevrimiçi Etkinleştir</target>
+
+<source>2. Retrieve an offline activation key from the following URL:</source>
+<target>Şu adresten bir çevrimdışı etkinleştirme anahtarı alarak:</target>
+
+<source>&Copy to clipboard</source>
+<target>&Panoya Kopyala</target>
+
+<source>Enter activation key:</source>
+<target>Etkinleştirme Anahtarını Yazın:</target>
+
+<source>Activate offline</source>
+<target>Çevrimdışı Etkinleştir</target>
+
+<source>Highlight configurations that have not been run for more than the following number of days:</source>
+<target>Şu kadar gündür çalıştırılmayan yapılandırmalar vurgulansın:</target>
+
+<source>Synchronization Settings</source>
+<target>Eşitleme Ayarları</target>
+
+<source>Access Online Storage</source>
+<target>Çevrimiçi Depolama Erişimi</target>
+
+<source>Save as a Batch Job</source>
+<target>Toplu İş Olarak Kaydet</target>
+
+<source>Delete Items</source>
+<target>Ögeleri Sil</target>
+
+<source>Copy Items</source>
+<target>Ögeleri Kopyala</target>
+
+<source>Options</source>
+<target>Ayarlar</target>
+
+<source>Select Time Span</source>
+<target>Zaman Aralığı</target>
+
+<source>Highlight Configurations</source>
+<target>Yapılandırmalar Vurgulansın</target>
+
+<source>Info</source>
+<target>Bilgi</target>
+
+<source>No log entries</source>
+<target>Herhangi bir günlük kaydı yok</target>
+
+<source>Select all</source>
+<target>Tümünü Seç</target>
+
+<source>&Options</source>
+<target>&Ayarlar</target>
+
+<source>Main Bar</source>
+<target>Ana Çubuk</target>
+
+<source>Folder Pairs</source>
+<target>Klasör Çiftleri</target>
+
+<source>Find</source>
+<target>Arama</target>
+
+<source>View Settings</source>
+<target>Görünüm Ayarları</target>
+
+<source>Configuration</source>
+<target>İşlemler</target>
+
+<source>Overview</source>
+<target>Genel</target>
+
+<source>Swap sides</source>
+<target>Sağ ve Sol Tarafları Değiştir</target>
+
+<source>Show "%x"</source>
+<target>"%x" paneli görüntülensin</target>
+
+<source>&Show details</source>
+<target>&Ayrıntılara Bakın</target>
+
+<source>FreeFileSync %x is available!</source>
+<target>FreeFileSync %x sürümü yayınlanmış!</target>
+
+<source>Local path not available for %x.</source>
+<target>%x için yerel yol bulunamadı.</target>
+
+<source>Confirm</source>
+<target>Onaylayın</target>
+
+<source>
+<pluralform>Do you really want to execute the command %y for one item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Bir ö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>&Execute</source>
+<target>Çalış&tır</target>
+
+<source>Set direction:</source>
+<target>Yönü Seç:</target>
+
+<source>multiple selection</source>
+<target>çoklu seçim</target>
+
+<source>&Include via filter:</source>
+<target>&Katılacak ögelere ekle:</target>
+
+<source>&Exclude via filter:</source>
+<target>Katıl&mayacak ögelere ekle:</target>
+
+<source>Include temporarily</source>
+<target>Geçici Olarak Kat</target>
+
+<source>Exclude temporarily</source>
+<target>Geçici Olarak Katma</target>
+
+<source>&Synchronize selection</source>
+<target>&Seçimi Eşitle</target>
+
+<source>&Copy to...</source>
+<target>&Farklı Konuma Kopyala...</target>
+
+<source>&Delete</source>
+<target>&Sil</target>
+
+<source>Show icons:</source>
+<target>Simgeler Görüntülensin:</target>
+
+<source>Small</source>
+<target>Küçük</target>
+
+<source>Medium</source>
+<target>Orta</target>
+
+<source>Large</source>
+<target>Büyük</target>
+
+<source>Select time span...</source>
+<target>Zaman aralığını seçin...</target>
+
+<source>Donation Edition</source>
+<target>Bağış Sürümü</target>
+
+<source>Folder Comparison and Synchronization</source>
+<target>Klasör Karşılaştırma ve Eşitleme</target>
+
+<source>Configuration saved</source>
+<target>Yapılandırma kaydedildi</target>
+
+<source>FreeFileSync batch</source>
+<target>FreeFileSync toplu işi</target>
+
+<source>Do you want to save changes to %x?</source>
+<target>Değişiklikleri %x dosyasına kaydetmek istiyor musunuz?</target>
+
+<source>Never save &changes</source>
+<target>Değişiklikler asla &kaydedilmesin</target>
+
+<source>Do&n't save</source>
+<target>Kaydedilmesi&n</target>
+
+<source>%x cannot be renamed.</source>
+<target>%x yeniden adlandırılamadı.</target>
+
+<source>New name:</source>
+<target>Yeni ad:</target>
+
+<source>Rename Configuration</source>
+<target>Yapılandırmayı Yeniden Adlandır</target>
+
+<source>Configuration name must not be empty.</source>
+<target>Yapılandırma adı boş olamaz.</target>
+
+<source>&Rename...</source>
+<target>&Yeniden Adlandır...</target>
+
+<source>Hide configuration</source>
+<target>Yapılandırma gizlensin</target>
+
+<source>Highlight...</source>
+<target>Vurgula...</target>
+
+<source>Clear filter</source>
+<target>Süzgeci Temizle</target>
+
+<source>Show files that exist on left side only</source>
+<target>Yalnız sol tarafta bulunan dosyaları görüntüler ya da gizler</target>
+
+<source>Show files that exist on right side only</source>
+<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üler ya da gizler</target>
+
+<source>Show files that are newer on right</source>
+<target>Sağda daha yeni olan dosyaları görüntüler ya da gizler</target>
+
+<source>Show files that are equal</source>
+<target>Eşit dosyaları görüntüler ya da gizler</target>
+
+<source>Show files that are different</source>
+<target>Farklı olan dosyaları görüntüler ya da gizler</target>
+
+<source>Show conflicts</source>
+<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üler ya da gizler</target>
+
+<source>Show files that will be created on the right side</source>
+<target>Sağ tarafa eklenecek dosyaları görüntüler ya da gizler</target>
+
+<source>Show files that will be deleted on the left side</source>
+<target>Sol tarafta silinecek dosyaları görüntüler ya da gizler</target>
+
+<source>Show files that will be deleted on the right side</source>
+<target>Sağ tarafta silinecek dosyaları görüntüler ya da gizler</target>
+
+<source>Show files that will be updated on the left side</source>
+<target>Sol tarafta güncellenecek dosyaları görüntüler ya da gizler</target>
+
+<source>Show files that will be updated on the right side</source>
+<target>Sağ tarafta güncellenecek dosyaları görüntüler ya da gizler</target>
+
+<source>Show files that won't be copied</source>
+<target>Kopyalanmayacak dosyaları görüntüler ya da gizler</target>
+
+<source>Show filtered or temporarily excluded files</source>
+<target>Süzülmüş ya da geçici olarak katılmayan dosyaları görüntüler ya da gizler</target>
+
+<source>Filter</source>
+<target>Süzme</target>
+
+<source>All files are in sync</source>
+<target>Tüm dosyalar eşit</target>
+
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 klasör</pluralform>
+<pluralform>%x klasör</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 dosya</pluralform>
+<pluralform>%x dosya</pluralform>
+</target>
+
+<source>
+<pluralform>Showing %y of 1 row</pluralform>
+<pluralform>Showing %y of %x rows</pluralform>
+</source>
+<target>
+<pluralform>%y / 1 satır görüntüleniyor</pluralform>
+<pluralform>%y / %x satır görüntüleniyor</pluralform>
+</target>
+
+<source>Cannot find %x</source>
+<target>%x bulunamadı</target>
+
+<source>Move up</source>
+<target>Yukarı taşı</target>
+
+<source>Move down</source>
+<target>Aşağı taşı</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>
+
+<source>Searching for program updates...</source>
+<target>Yazılım güncellemesine bakılıyor...</target>
+
+<source>Paused</source>
+<target>Duraklatıldı</target>
+
+<source>Stop requested...</source>
+<target>Durdurulması istendi...</target>
+
+<source>Initializing...</source>
+<target>Başlatılıyor...</target>
+
+<source>Comparing content...</source>
+<target>İçerik karşılaştırılıyor...</target>
+
+<source>&Continue</source>
+<target>&Devam</target>
+
+<source>Progress</source>
+<target>İlerleme</target>
+
+<source>Thank you, %x, for your donation and support!</source>
+<target>Sevgili %x, bağışın ve desteğin için teşekkürler!</target>
+
+<source>Connections</source>
+<target>Bağlantılar</target>
+
+<source>Recommended range:</source>
+<target>Önerilen Aralık:</target>
+
+<source>Do you really want to disconnect from user account %x?</source>
+<target>%x kullanıcı hesabının bağlantısını kesmek istediğinize emin misiniz?</target>
+
+<source>Password:</source>
+<target>Parola:</target>
+
+<source>Key passphrase:</source>
+<target>Anahtar parolası:</target>
+
+<source>Please enter a file path.</source>
+<target>Lütfen bir dosya yolu yazın.</target>
+
+<source>
+<pluralform>Copy the following item to another folder?</pluralform>
+<pluralform>Copy the following %x items to another folder?</pluralform>
+</source>
+<target>
+<pluralform>Öge başka bir klasöre kopyalansın mı?</pluralform>
+<pluralform>%x öge başka bir klasöre kopyalansın mı?</pluralform>
+</target>
+
+<source>Please enter a target folder.</source>
+<target>Lütfen bir hedef klasör yazın.</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>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>Move</source>
+<target>Atılsın</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>
+<target>
+<pluralform>Aşağıdaki ögeyi silmek istediğinize emin misiniz?</pluralform>
+<pluralform>Aşağıdaki %x ögeyi silmek istediğinize emin misiniz?</pluralform>
+</target>
+
+<source>Start to synchronize the selection?</source>
+<target>Seçimin eşitlenmesi başlatılsın mı?</target>
+
+<source>Start synchronization now?</source>
+<target>Eşitleme başlatılsın mı?</target>
+
+<source>Copy DACL, SACL, Owner, Group</source>
+<target>DACL, SACL, Sahip, Grup kopyalansın</target>
+
+<source>Integrate external applications into context menu. The following macros are available:</source>
+<target>Sağ tık menüsüne dış uygulamalar eklenebilir. Şu kodlar kullanılabilir:</target>
+
+<source>Full file or folder path</source>
+<target>Tam dosya ya da klasör yolu</target>
+
+<source>Parent folder path</source>
+<target>Üst klasör yolu</target>
+
+<source>Temporary local copy for SFTP and MTP storage</source>
+<target>SFTP ve MTP depolama için geçici yerel kopya</target>
+
+<source>Parameters for opposite side</source>
+<target>Diğer tarafın parametreleri</target>
+
+<source>Show hidden dialogs again</source>
+<target>Gizlenmiş Pencereleri Yeniden Görüntüle</target>
+
+<source>All dialogs shown</source>
+<target>Tüm İletiler Görüntüleniyor</target>
+
+<source>Downloading update...</source>
+<target>Güncelleme indiriliyor...</target>
+
+<source>Identify equal files by comparing modification time and size.</source>
+<target>Dosyaların eşit olup olmadığı, son değişiklik zamanı ve boyuta göre belirlenir.</target>
+
+<source>Identify equal files by comparing the file content.</source>
+<target>Dosyaların eşit olup olmadığı, içeriklerine göre belirlenir.</target>
+
+<source>Identify equal files by comparing their file size.</source>
+<target>Dosyaların eşit olup olmadığı boyutlarına göre belirlenir.</target>
+
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>İki taraftaki değişiklikler de belirlenir ve kopyalanır. Silinme, taşınma ve çakışmalar, veritabanı kullanılarak otomatik olarak belirlenir.</target>
+
+<source>Create a mirror backup of the left folder by adapting the right folder to match.</source>
+<target>Sağ klasör, sola uyacak şekilde değiştirilerek, sol klasörün yansı yedeği oluşturulur.</target>
+
+<source>Copy new and updated files to the right folder.</source>
+<target>Sol taraftaki yeni ya da güncellenmiş dosyalar sağ tarafa kopyalanır.</target>
+
+<source>Configure your own synchronization rules.</source>
+<target>Eşitleme kuralları kullanıcının isteğine göre yapılandırılır.</target>
+
+<source>Comparison</source>
+<target>Karşılaştırma</target>
+
+<source>Synchronization</source>
+<target>Eşitleme</target>
+
+<source>This week</source>
+<target>Bu hafta</target>
+
+<source>This month</source>
+<target>Bu ay</target>
+
+<source>This year</source>
+<target>Bu yıl</target>
+
+<source>Byte</source>
+<target>Bayt</target>
+
+<source>KB</source>
+<target>KB</target>
+
+<source>MB</source>
+<target>MB</target>
+
+<source>Retain deleted and overwritten files in the recycle bin</source>
+<target>Silinmiş ve üzerine yazılmış dosyalar geri dönüşüm kutusunda tutulsun</target>
+
+<source>Delete and overwrite files permanently</source>
+<target>Dosyalar silinsin ve kalıcı olarak üzerine yazılsın</target>
+
+<source>Replace</source>
+<target>Ad Değiştirme</target>
+
+<source>Move files and replace if existing</source>
+<target>Dosyalar taşınır ve varsa üzerine yazılır</target>
+
+<source>Time stamp</source>
+<target>Zaman Damgalama</target>
+
+<source>Move files into a time-stamped subfolder</source>
+<target>Dosyalar zaman damgalı bir alt klasöre taşınır</target>
+
+<source>File</source>
+<target>Dosya</target>
+
+<source>Append a time stamp to each file name</source>
+<target>Dosya adlarına zaman damgası eklenir</target>
+
+<source>On completion:</source>
+<target>Tamamlandığında:</target>
+
+<source>On errors:</source>
+<target>Sorun Çıktığında:</target>
+
+<source>On success:</source>
+<target>Başarılı Olduğunda:</target>
+
+<source>Main config</source>
+<target>Temel Yapılandırma</target>
+
+<source>empty</source>
+<target>boş</target>
+
+<source>Leave as unresolved conflict</source>
+<target>Uyuşmazlık çözümlenmeden bırakılsın</target>
+
+<source>YYYY-MM-DD hhmmss</source>
+<target>YYYY-AA-GG SSddss</target>
+
+<source>Minimum version count must be smaller than maximum count.</source>
+<target>En az sürüm sayısı en çok sürüm sayısı değerinden küçük olmalıdır.</target>
+
+<source>&Restore</source>
+<target>Gö&rüntülensin</target>
+
+<source>Files</source>
+<target>Dosyalar</target>
+
+<source>Percentage</source>
+<target>Yüzde</target>
+
+<source>Failed to retrieve update information.</source>
+<target>Güncelleme bilgileri alınamadı.</target>
+
+<source>Automatic updates:</source>
+<target>Otomatik güncellemeler:</target>
+
+<source>Check for Program Updates</source>
+<target>Güncelleme Denetimi</target>
+
+<source>Auto-update now or download manually from the FreeFileSync home page?</source>
+<target>Şimdi otomatik olarak güncelle ya da FreeFileSync ana sayfasından indir</target>
+
+<source>&Auto-update</source>
+<target>&Otomatik Güncelle</target>
+
+<source>&Home page</source>
+<target>&Ana Sayfadan İndir</target>
+
+<source>Download now?</source>
+<target>İndirmek ister misiniz?</target>
+
+<source>&Download</source>
+<target>İn&dirin</target>
+
+<source>FreeFileSync is up to date.</source>
+<target>FreeFileSync güncel.</target>
+
+<source>Cannot find current FreeFileSync version number online. A newer version is likely available. Check manually now?</source>
+<target>Geçerli FreeFileSync sürümü çevrimiçi olarak öğrenilemedi. Yeni bir sürüm yayınlanmış gibi görünüyor. El ile denetlemek ister misiniz?</target>
+
+<source>&Check</source>
+<target>&Denetle</target>
+
+<source>Consistency check failed for %x.</source>
+<target>%x tutarlılık sınamasından geçemedi.</target>
+
+<source>Installation was registered on a different operating system.</source>
+<target>Kurulum başka bir işletim sistemi üzerinde kayıt edilmiş.</target>
+
+<source>Failed to activate FreeFileSync Donation Edition.</source>
+<target>FreeFileSync Bağış Sürümü etkinleştirilemedi.</target>
+
+<source>Incorrect activation key.</source>
+<target>Etkinleştirme anahtarı hatalı.</target>
+
+<source>Unable to register to receive system messages.</source>
+<target>Sistem iletilerini alabilmek için gerekli kayıt eklenemedi.</target>
+
+<source>The %x installation option is only available in the FreeFileSync Donation Edition.</source>
+<target>%x kurulumu yalnız FreeFileSync Bağış Sürümü ile yapılabilir.</target>
+
+<source>Cannot find system function %x.</source>
+<target>%x sistem işlevi bulunamadı.</target>
+
+<source>Unable to register device notifications for %x.</source>
+<target>%x aygıtının bildirimleri için gerekli kayıt eklenemedi.</target>
+
+<source>The file is locked by another process:</source>
+<target>Dosya başka bir işlem tarafından kilitlenmiş:</target>
+
+<source>Failed to determine file permission support for folder %x.</source>
+<target>%x klasörünün dosya izinleri desteği belirlenemedi.</target>
+
+<source>Cannot read security context of %x.</source>
+<target>%x için güvenlik bağlamı okunamadı.</target>
+
+<source>Cannot write security context of %x.</source>
+<target>%x için güvenlik bağlamı yazılamadı.</target>
+
+<source>Cannot read permissions of %x.</source>
+<target>%x izinleri okunamadı.</target>
+
+<source>Cannot copy permissions from %x to %y.</source>
+<target>İzinler %x üzerinden %y üzerine kopyalanamadı.</target>
+
+<source>%x is not a regular directory name.</source>
+<target>%x geçerli bir klasör adı değil.</target>
+
+<source>Cannot copy attributes from %x to %y.</source>
+<target>Öznitelikler %x üzerinden %y üzerine kopyalanamadı.</target>
+
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 dakika</pluralform>
+<pluralform>%x dakika</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 saat</pluralform>
+<pluralform>%x saat</pluralform>
+</target>
+
+<source>Cannot set privilege %x.</source>
+<target>%x izni verilemedi.</target>
+
+<source>Unable to suspend system sleep mode.</source>
+<target>Sistem uyku kipine geçirilemedi.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Giriş/Çıkış işlemi öncelikleri değiştirilemedi.</target>
+
+<source>Checking recycle bin failed for folder %x.</source>
+<target>%x klasörü için Geri Dönüşüm Kutusu denetlenemedi.</target>
+
+<source>Unable to shut down the system.</source>
+<target>Bilgisayar kapatılamıyor.</target>
+
+<source>Prepare installation</source>
+<target>Kuruluma hazırlanıyor</target>
+
+<source>Choose which components you want to install.</source>
+<target>Kurmak istediğiniz bileşenleri seçin.</target>
+
+<source>Select installation type:</source>
+<target>Kurulum türünü seçin:</target>
+
+<source>Local</source>
+<target>Yerel</target>
+
+<source>Portable</source>
+<target>Taşınabilir</target>
+
+<source>Save settings in %x</source>
+<target>Ayarlar %x üzerine kaydedilsin</target>
+
+<source>Register FreeFileSync file extensions</source>
+<target>FreeFileSync Dosya Uzantıları İlişkilendirilsin</target>
+
+<source>Create Explorer context menu entries</source>
+<target>Windows Gezgini Sağ Tık Menü Kayıtları Eklensin</target>
+
+<source>Save settings in installation directory</source>
+<target>Ayarlar Kurulum Klasörüne Kaydedilsin</target>
+
+<source>Do not write to Registry</source>
+<target>Kayıt Defterine Yazılmasın</target>
+
+<source>Just copy the files</source>
+<target>Yalnız Dosyalar Kopyalansın</target>
+
+<source>Choose a directory for installation:</source>
+<target>Kurulum Klasörünü Seçin:</target>
+
+<source>Create shortcuts:</source>
+<target>Oluşturulacak Kısayollar:</target>
+
+<source>Desktop</source>
+<target>Masaüstü</target>
+
+<source>Start Menu</source>
+<target>Başlat Menüsü</target>
+
+<source>Send To</source>
+<target>Gönder</target>
+
+<source>Registering FreeFileSync file extensions</source>
+<target>FreeFileSync dosya uzantıları kayıt defterine ekleniyor</target>
+
+<source>Unregistering FreeFileSync file extensions</source>
+<target>FreeFileSync dosya uzantıları kayıt defterinden siliniyor</target>
+
+<source>FreeFileSync Configuration</source>
+<target>FreeFileSync Yapılandırması</target>
+
+<source>FreeFileSync Batch File</source>
+<target>FreeFileSync Toplu İşlem Dosyası</target>
+
+<source>FreeFileSync Synchronization Database</source>
+<target>FreeFileSync Eşitleme Veritabanı</target>
+
+<source>RealTimeSync Configuration</source>
+<target>RealTimeSync Yapılandırması</target>
+
+<source>Edit with FreeFileSync</source>
+<target>FreeFileSync ile Düzenlensin</target>
+
+<source>Instead of an ad, here's an animal.</source>
+<target>Burada bir reklam yerine bir hayvan var.</target>
+
+<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source>
+<target>FreeFileSync taşınabilir sürümü bir %x alt klasörüne yüklenemez.</target>
+
+<source>Please choose the local installation type or select a different folder for installation.</source>
+<target>Kurulum için farklı bir klasör ya da yerel kurulum türünü seçin.</target>
+
+<source>Get the Donation Edition with bonus features and help keep FreeFileSync ad-free.</source>
+<target>Hediye özellikleri edinmek ve FreeFileSync yazılımını reklamsız kullanmak için Bağış Sürümünü alın.</target>
+
diff --git a/FreeFileSync/Build/Resources/Languages/ukrainian.lng b/FreeFileSync/Build/Resources/Languages/ukrainian.lng
index 9e3da1ea..5e0c211e 100755
--- a/FreeFileSync/Build/Resources/Languages/ukrainian.lng
+++ b/FreeFileSync/Build/Resources/Languages/ukrainian.lng
@@ -659,8 +659,8 @@ Actual: %y bytes
 <source>Some files will be synchronized as part of multiple base folders.</source>
 <target>Деякі файли були синхронізовані як частина декількох основних папок.</target>
 
-<source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source>
-<target>Для уникнення конфліктів, встановлюйте фільтри для виключення так щоб кожен оновлений файл розглядався тільки однією основною папкою.</target>
+<source>To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.</source>
+<target></target>
 
 <source>Versioning folder:</source>
 <target>Папка з версіями:</target>
@@ -827,8 +827,8 @@ The command is triggered if:
 <source>Scanning...</source>
 <target>Сканування...</target>
 
-<source>job name</source>
-<target>назва завдання</target>
+<source>configuration file</source>
+<target></target>
 
 <source>System: Sleep</source>
 <target>Система: Сон</target>
@@ -1041,6 +1041,12 @@ The command is triggered if:
 <source>Match case</source>
 <target>Враховувати регістр</target>
 
+<source>Processed:</source>
+<target></target>
+
+<source>Remaining:</source>
+<target></target>
+
 <source>New</source>
 <target>Нова</target>
 
@@ -1277,17 +1283,11 @@ The command is triggered if:
 <source>&Don't show this dialog again</source>
 <target>Більше &не показувати цей діалог</target>
 
-<source>Items found:</source>
-<target>Елементів знайдено:</target>
+<source>Bytes:</source>
+<target></target>
 
-<source>Time remaining:</source>
-<target>Залишилось часу:</target>
-
-<source>Bytes</source>
-<target>Байт</target>
-
-<source>Items</source>
-<target>Елементи</target>
+<source>Items:</source>
+<target></target>
 
 <source>Synchronizing...</source>
 <target>Синхронізація...</target>
@@ -1295,6 +1295,12 @@ The command is triggered if:
 <source>Minimize to notification area</source>
 <target>Згорнути в область повідомлень</target>
 
+<source>Bytes</source>
+<target>Байт</target>
+
+<source>Items</source>
+<target>Елементи</target>
+
 <source>When finished:</source>
 <target>Після завершення:</target>
 
@@ -1746,8 +1752,8 @@ This guarantees a consistent state even in case of a serious error.
 <source>Password:</source>
 <target>Пароль:</target>
 
-<source>Key password:</source>
-<target>Пароль ключа:</target>
+<source>Key passphrase:</source>
+<target></target>
 
 <source>Please enter a file path.</source>
 <target>Будь-ласка, введіть шлях до файлу.</target>
@@ -1983,8 +1989,8 @@ This guarantees a consistent state even in case of a serious error.
 <source>The file is locked by another process:</source>
 <target>Файл заблоковано іншим процесом:</target>
 
-<source>Checking file permissions failed for folder %x.</source>
-<target>Не вдалося перевірити права доступу до файлів для папки %x.</target>
+<source>Failed to determine file permission support for folder %x.</source>
+<target></target>
 
 <source>Cannot read security context of %x.</source>
 <target>Не вдається прочитати контекст безпеки %x.</target>
diff --git a/FreeFileSync/Source/Makefile b/FreeFileSync/Source/Makefile
index 3a7da2e8..856117c1 100644..100755
--- a/FreeFileSync/Source/Makefile
+++ b/FreeFileSync/Source/Makefile
@@ -17,7 +17,6 @@ CXXFLAGS  += `pkg-config --cflags libssh2`
 LINKFLAGS += `pkg-config --libs   libssh2`
 
 CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
-LINKFLAGS += `pkg-config --libs   gtk+-2.0`
 #treat as system headers so that warnings are hidden:
 CXXFLAGS  += -isystem/usr/include/gtk-2.0
 
@@ -28,13 +27,6 @@ CXXFLAGS  += `pkg-config --cflags libselinux` -DHAVE_SELINUX
 LINKFLAGS += `pkg-config --libs libselinux`
 endif
 
-#support for Ubuntu Unity (optional)
-UNITY_EXISTING=$(shell pkg-config --exists unity && echo YES)
-ifeq ($(UNITY_EXISTING),YES)
-CXXFLAGS  += `pkg-config --cflags unity` -DHAVE_UBUNTU_UNITY
-LINKFLAGS += `pkg-config --libs unity`
-endif
-
 CPP_FILES=
 CPP_FILES+=base/algorithm.cpp
 CPP_FILES+=base/application.cpp
@@ -45,10 +37,10 @@ CPP_FILES+=base/db_file.cpp
 CPP_FILES+=base/dir_lock.cpp
 CPP_FILES+=base/ffs_paths.cpp
 CPP_FILES+=base/file_hierarchy.cpp
-CPP_FILES+=base/generate_logfile.cpp
 CPP_FILES+=base/icon_buffer.cpp
 CPP_FILES+=base/icon_loader.cpp
 CPP_FILES+=base/localization.cpp
+CPP_FILES+=base/log_file.cpp
 CPP_FILES+=base/parallel_scan.cpp
 CPP_FILES+=base/path_filter.cpp
 CPP_FILES+=base/perf_check.cpp
@@ -65,7 +57,6 @@ CPP_FILES+=afs/init_curl_libssh2.cpp
 CPP_FILES+=afs/native.cpp
 CPP_FILES+=afs/sftp.cpp
 CPP_FILES+=afs/libssh2/init_libssh2.cpp
-CPP_FILES+=afs/libssh2/init_open_ssl.cpp
 CPP_FILES+=ui/batch_config.cpp
 CPP_FILES+=ui/abstract_folder_picker.cpp
 CPP_FILES+=ui/batch_status_handler.cpp
diff --git a/FreeFileSync/Source/RealTimeSync/Makefile b/FreeFileSync/Source/RealTimeSync/Makefile
index 8ac2b0b9..ef318cfc 100755
--- a/FreeFileSync/Source/RealTimeSync/Makefile
+++ b/FreeFileSync/Source/RealTimeSync/Makefile
@@ -8,7 +8,6 @@ LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
 
 #Gtk - support "no button border"
 CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
-LINKFLAGS += `pkg-config --libs   gtk+-2.0`
 #treat as system headers so that warnings are hidden:
 CXXFLAGS  += -isystem/usr/include/gtk-2.0
 
diff --git a/FreeFileSync/Source/RealTimeSync/application.cpp b/FreeFileSync/Source/RealTimeSync/application.cpp
index 443da37d..307f7d34 100644
--- a/FreeFileSync/Source/RealTimeSync/application.cpp
+++ b/FreeFileSync/Source/RealTimeSync/application.cpp
@@ -41,7 +41,33 @@ bool Application::OnInit()
 {
     //do not call wxApp::OnInit() to avoid using wxWidgets command line parser
 
-    ::gtk_rc_parse((fff::getResourceDirPf() + "styles.gtk_rc").c_str()); //remove inner border from bitmap buttons
+    //GTK should already have been initialized by wxWidgets (see \src\gtk\app.cpp:wxApp::Initialize)
+#if GTK_MAJOR_VERSION == 2
+    ::gtk_rc_parse((fff::getResourceDirPf() + "Gtk2Styles.rc").c_str());
+
+#elif GTK_MAJOR_VERSION == 3
+    try
+    {
+        GtkCssProvider* provider = ::gtk_css_provider_new ();
+        ZEN_ON_SCOPE_EXIT(::g_object_unref(provider));
+
+        GError* error = nullptr;
+        ZEN_ON_SCOPE_EXIT(if (error) ::g_error_free(error););
+
+        ::gtk_css_provider_load_from_path(provider, //GtkCssProvider* css_provider,
+                                          (fff::getResourceDirPf() + "Gtk3Styles.css").c_str(), //const gchar* path,
+                                          &error); //GError** error
+        if (error)
+            throw SysError(formatSystemError(L"gtk_css_provider_load_from_data", replaceCpy(_("Error Code %x"), L"%x", numberTo<std::wstring>(error->code)), utfTo<std::wstring>(error->message)));
+
+        ::gtk_style_context_add_provider_for_screen(::gdk_screen_get_default(),               //GdkScreen* screen,
+                                                    GTK_STYLE_PROVIDER(provider),             //GtkStyleProvider* provider,
+                                                    GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); //guint priority
+    }
+    catch (const SysError& e) { std::cerr << utfTo<std::string>(e.toString()) << "\n"; }
+#else
+#error unknown GTK version!
+#endif
 
     //Windows User Experience Interaction Guidelines: tool tips should have 5s timeout, info tips no timeout => compromise:
     wxToolTip::Enable(true); //yawn, a wxWidgets screw-up: wxToolTip::SetAutoPop is no-op if global tooltip window is not yet constructed: wxToolTip::Enable creates it
@@ -57,8 +83,8 @@ bool Application::OnInit()
     }
     catch (const FileError& e)
     {
-        //following dialog does NOT trigger "exit on frame delete" while we are in OnInit(): http://docs.wxwidgets.org/trunk/overview_app.html#overview_app_shutdown
-        showNotificationDialog(nullptr, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+        //following dialog does NOT trigger "exit on frame delete" while we are in OnInit(): https://docs.wxwidgets.org/trunk/overview_app.html#overview_app_shutdown
+        showNotificationDialog(nullptr, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
         //continue!
     }
 
@@ -100,7 +126,7 @@ void Application::onEnterEventLoop(wxEvent& event)
                 filePath += Zstr(".ffs_batch");
             else
             {
-                showNotificationDialog(nullptr, DialogInfoType::ERROR2, PopupDialogCfg().setMainInstructions(replaceCpy(_("Cannot find file %x."), L"%x", fmtPath(filePath))));
+                showNotificationDialog(nullptr, DialogInfoType::error, PopupDialogCfg().setMainInstructions(replaceCpy(_("Cannot find file %x."), L"%x", fmtPath(filePath))));
                 return;
             }
         }
diff --git a/FreeFileSync/Source/RealTimeSync/config.cpp b/FreeFileSync/Source/RealTimeSync/config.cpp
index bc28e767..0549111d 100644
--- a/FreeFileSync/Source/RealTimeSync/config.cpp
+++ b/FreeFileSync/Source/RealTimeSync/config.cpp
@@ -38,10 +38,10 @@ namespace
 {
 enum class RtsXmlType
 {
-    REAL,
-    BATCH,
-    GLOBAL,
-    OTHER
+    real,
+    batch,
+    global,
+    other
 };
 RtsXmlType getXmlTypeNoThrow(const XmlDoc& doc) //throw()
 {
@@ -51,14 +51,14 @@ RtsXmlType getXmlTypeNoThrow(const XmlDoc& doc) //throw()
         if (doc.root().getAttribute("XmlType", type))
         {
             if (type == "REAL")
-                return RtsXmlType::REAL;
+                return RtsXmlType::real;
             else if (type == "BATCH")
-                return RtsXmlType::BATCH;
+                return RtsXmlType::batch;
             else if (type == "GLOBAL")
-                return RtsXmlType::GLOBAL;
+                return RtsXmlType::global;
         }
     }
-    return RtsXmlType::OTHER;
+    return RtsXmlType::other;
 }
 
 
@@ -90,7 +90,7 @@ void rts::readConfig(const Zstring& filePath, XmlRealConfig& cfg, std::wstring&
 {
     XmlDoc doc = loadXml(filePath); //throw FileError
 
-    if (getXmlTypeNoThrow(doc) != RtsXmlType::REAL) //noexcept
+    if (getXmlTypeNoThrow(doc) != RtsXmlType::real) //noexcept
         throw FileError(replaceCpy(_("File %x does not contain a valid configuration."), L"%x", fmtPath(filePath)));
 
     int formatVer = 0;
@@ -133,7 +133,7 @@ void rts::readRealOrBatchConfig(const Zstring& filePath, XmlRealConfig& cfg, std
     const RtsXmlType xmlType = ::getXmlTypeNoThrow(doc);
 
     //convert batch config to RealTimeSync config
-    if (xmlType == RtsXmlType::BATCH)
+    if (xmlType == RtsXmlType::batch)
     {
         XmlIn in(doc);
 
@@ -180,7 +180,7 @@ wxLanguage rts::getProgramLanguage() //throw FileError
         throw;
     }
 
-    if (getXmlTypeNoThrow(doc) != RtsXmlType::GLOBAL) //noexcept
+    if (getXmlTypeNoThrow(doc) != RtsXmlType::global) //noexcept
         throw FileError(replaceCpy(_("File %x does not contain a valid configuration."), L"%x", fmtPath(filePath)));
 
     XmlIn in(doc);
diff --git a/FreeFileSync/Source/RealTimeSync/main_dlg.cpp b/FreeFileSync/Source/RealTimeSync/main_dlg.cpp
index 5d16e778..3aab7438 100644
--- a/FreeFileSync/Source/RealTimeSync/main_dlg.cpp
+++ b/FreeFileSync/Source/RealTimeSync/main_dlg.cpp
@@ -118,13 +118,13 @@ MainDialog::MainDialog(const Zstring& cfgFileName) :
             readRealOrBatchConfig(currentConfigFile, newConfig, warningMsg); //throw FileError
 
             if (!warningMsg.empty())
-                showNotificationDialog(this, DialogInfoType::WARNING, PopupDialogCfg().setDetailInstructions(warningMsg));
+                showNotificationDialog(this, DialogInfoType::warning, PopupDialogCfg().setDetailInstructions(warningMsg));
 
             loadCfgSuccess = warningMsg.empty();
         }
         catch (const FileError& e)
         {
-            showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+            showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
         }
 
     const bool startWatchingImmediately = loadCfgSuccess && !cfgFileName.empty();
@@ -164,7 +164,7 @@ MainDialog::~MainDialog()
     }
     catch (const FileError& e)
     {
-        showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+        showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
     }
 }
 
@@ -196,7 +196,7 @@ void MainDialog::OnMenuAbout(wxCommandEvent& event)
         L" x64";
 #endif
 
-    showNotificationDialog(this, DialogInfoType::INFO, PopupDialogCfg().
+    showNotificationDialog(this, DialogInfoType::info, PopupDialogCfg().
                            setTitle(_("About")).
                            setMainInstructions(L"RealTimeSync" L"\n\n" + replaceCpy(_("Build: %x"), L"%x", build)));
 }
@@ -264,7 +264,7 @@ void MainDialog::OnConfigSave(wxCommandEvent& event)
     }
     catch (const FileError& e)
     {
-        showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+        showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
     }
 }
 
@@ -280,11 +280,11 @@ void MainDialog::loadConfig(const Zstring& filepath)
             readRealOrBatchConfig(filepath, newConfig, warningMsg); //throw FileError
 
             if (!warningMsg.empty())
-                showNotificationDialog(this, DialogInfoType::WARNING, PopupDialogCfg().setDetailInstructions(warningMsg));
+                showNotificationDialog(this, DialogInfoType::warning, PopupDialogCfg().setDetailInstructions(warningMsg));
         }
         catch (const FileError& e)
         {
-            showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+            showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
             return;
         }
 
diff --git a/FreeFileSync/Source/RealTimeSync/tray_menu.cpp b/FreeFileSync/Source/RealTimeSync/tray_menu.cpp
index 8fba1101..28266879 100644
--- a/FreeFileSync/Source/RealTimeSync/tray_menu.cpp
+++ b/FreeFileSync/Source/RealTimeSync/tray_menu.cpp
@@ -251,7 +251,7 @@ rts::AbortReason rts::runFolderMonitor(const XmlRealConfig& config, const wxStri
 
     if (dirNamesNonFmt.empty())
     {
-        showNotificationDialog(nullptr, DialogInfoType::ERROR2, PopupDialogCfg().setMainInstructions(_("A folder input field is empty.")));
+        showNotificationDialog(nullptr, DialogInfoType::error, PopupDialogCfg().setMainInstructions(_("A folder input field is empty.")));
         return AbortReason::REQUEST_GUI;
     }
 
@@ -259,7 +259,7 @@ rts::AbortReason rts::runFolderMonitor(const XmlRealConfig& config, const wxStri
 
     if (cmdLine.empty())
     {
-        showNotificationDialog(nullptr, DialogInfoType::ERROR2, PopupDialogCfg().setMainInstructions(_("Incorrect command line:") + L" \"\""));
+        showNotificationDialog(nullptr, DialogInfoType::error, PopupDialogCfg().setMainInstructions(_("Incorrect command line:") + L" \"\""));
         return AbortReason::REQUEST_GUI;
     }
 
@@ -279,7 +279,7 @@ rts::AbortReason rts::runFolderMonitor(const XmlRealConfig& config, const wxStri
         catch (const FileError& e)
         {
             //blocks! however, we *expect* this to be a persistent error condition...
-            showNotificationDialog(nullptr, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+            showNotificationDialog(nullptr, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
         }
     };
 
@@ -306,13 +306,13 @@ rts::AbortReason rts::runFolderMonitor(const XmlRealConfig& config, const wxStri
             trayIcon.doUiRefreshNow(); //throw AbortMonitoring
 
             if (trayIcon.getShowErrorRequested())
-                switch (showConfirmationDialog(nullptr, DialogInfoType::ERROR2, PopupDialogCfg().
+                switch (showConfirmationDialog(nullptr, DialogInfoType::error, PopupDialogCfg().
                                                setDetailInstructions(msg), _("&Retry")))
                 {
-                    case ConfirmationButton::ACCEPT: //retry
+                    case ConfirmationButton::accept: //retry
                         return;
 
-                    case ConfirmationButton::CANCEL:
+                    case ConfirmationButton::cancel:
                         throw AbortMonitoring(AbortReason::REQUEST_GUI);
                 }
             std::this_thread::sleep_for(UI_UPDATE_INTERVAL);
diff --git a/FreeFileSync/Source/afs/abstract.cpp b/FreeFileSync/Source/afs/abstract.cpp
index d0621dcd..7a537b7d 100644
--- a/FreeFileSync/Source/afs/abstract.cpp
+++ b/FreeFileSync/Source/afs/abstract.cpp
@@ -199,16 +199,15 @@ AFS::FileCopyResult AFS::copyFileTransactional(const AbstractPath& apSource, con
 
         //- generate (hopefully) unique file name to avoid clashing with some remnant ffs_tmp file
         //- do not loop: avoid pathological cases, e.g. https://freefilesync.org/forum/viewtopic.php?t=1592
-        const Zstring& shortGuid = printNumber<Zstring>(Zstr("%04x"), static_cast<unsigned int>(getCrc16(generateGUID())));
-        const Zstring& tmpExt    = Zstr('.') + shortGuid + TEMP_FILE_ENDING;
-
         Zstring tmpName = beforeLast(fileName, Zstr('.'), IF_MISSING_RETURN_ALL);
 
         //don't make the temp name longer than the original when hitting file system name length limitations: "lpMaximumComponentLength is commonly 255 characters"
         while (tmpName.size() > 200) //BUT don't trim short names! we want early failure on filename-related issues
             tmpName = getUnicodeSubstring(tmpName, 0 /*uniPosFirst*/, unicodeLength(tmpName) / 2 /*uniPosLast*/); //consider UTF encoding when cutting in the middle! (e.g. for macOS)
 
-        const AbstractPath apTargetTmp = AFS::appendRelPath(*parentPath, tmpName + tmpExt);
+        const Zstring& shortGuid = printNumber<Zstring>(Zstr("%04x"), static_cast<unsigned int>(getCrc16(generateGUID())));
+
+        const AbstractPath apTargetTmp = AFS::appendRelPath(*parentPath, tmpName + Zstr('~') + shortGuid + TEMP_FILE_ENDING);
         //-------------------------------------------------------------------------------------------
 
         const AFS::FileCopyResult result = copyFilePlain(apTargetTmp); //throw FileError, ErrorFileLocked
@@ -229,7 +228,7 @@ AFS::FileCopyResult AFS::copyFileTransactional(const AbstractPath& apSource, con
             NOT PRESERVE the creation time of the .ffs_tmp file, but SILENTLY "reuses" whatever creation time the old "file.txt" had!
             This "feature" is called "File System Tunneling":
             https://devblogs.microsoft.com/oldnewthing/?p=34923
-            http://support.microsoft.com/kb/172190/en-us
+            https://support.microsoft.com/kb/172190/en-us
         */
         return result;
     }
diff --git a/FreeFileSync/Source/afs/ftp.cpp b/FreeFileSync/Source/afs/ftp.cpp
index 29ee5711..4901168d 100644
--- a/FreeFileSync/Source/afs/ftp.cpp
+++ b/FreeFileSync/Source/afs/ftp.cpp
@@ -14,7 +14,7 @@
 #include "ftp_common.h"
 #include "abstract_impl.h"
 #include "../base/resolve_path.h"
-    #include <gtk/gtk.h>
+    #include <glib.h>
 
 using namespace zen;
 using namespace fff;
@@ -475,8 +475,6 @@ public:
         options.emplace_back(CURLOPT_SHARE, curlShare);
 #endif
 
-        warn_static("add option for cert checking")
-
         //TODO: FTP option to require certificate checking?
 #if 0
         options.emplace_back(CURLOPT_CAINFO, "cacert.pem"); //hopefully latest version from https://curl.haxx.se/docs/caextract.html
diff --git a/FreeFileSync/Source/afs/gdrive.cpp b/FreeFileSync/Source/afs/gdrive.cpp
index 34166745..b55350bf 100644
--- a/FreeFileSync/Source/afs/gdrive.cpp
+++ b/FreeFileSync/Source/afs/gdrive.cpp
@@ -2063,7 +2063,7 @@ public:
 
                         //generate (hopefully) unique file name to avoid clashing with unrelated tmp file (concurrent FFS shutdown!)
                         const Zstring shortGuid = printNumber<Zstring>(Zstr("%04x"), static_cast<unsigned int>(getCrc16(generateGUID())));
-                        const Zstring dbFilePathTmp = dbFilePath + Zstr('.') + shortGuid + Zstr(".tmp");
+                        const Zstring dbFilePathTmp = dbFilePath + Zstr('.') + shortGuid + AFS::TEMP_FILE_ENDING;
 
                         ZEN_ON_SCOPE_FAIL(try { removeFilePlain(dbFilePathTmp); }
                         catch (FileError&) {});
diff --git a/FreeFileSync/Source/afs/init_curl_libssh2.cpp b/FreeFileSync/Source/afs/init_curl_libssh2.cpp
index dd0ecad5..dd956343 100644
--- a/FreeFileSync/Source/afs/init_curl_libssh2.cpp
+++ b/FreeFileSync/Source/afs/init_curl_libssh2.cpp
@@ -8,7 +8,7 @@
 #include <cassert>
 #include <zen/thread.h>
 #include <zen/file_error.h>
-#include "libssh2/init_open_ssl.h"
+#include <zen/open_ssl.h>
 #include "libssh2/init_libssh2.h"
 #include "libcurl/curl_wrap.h" //DON'T include <curl/curl.h> directly!
 
diff --git a/FreeFileSync/Source/afs/libssh2/init_libssh2.cpp b/FreeFileSync/Source/afs/libssh2/init_libssh2.cpp
index f64306bd..4db53458 100644
--- a/FreeFileSync/Source/afs/libssh2/init_libssh2.cpp
+++ b/FreeFileSync/Source/afs/libssh2/init_libssh2.cpp
@@ -7,16 +7,12 @@
 #include "init_libssh2.h"
 #include <cassert>
 #include <libssh2_sftp.h>
-#include <openssl/opensslv.h>
 
 
 #ifndef LIBSSH2_OPENSSL
     #error check code when/if-ever the OpenSSL libssh2 backend is changed
 #endif
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-    #error OpenSSL version too old
-#endif
 
 #if defined LIBSSH2_WIN32 && !defined HAVE_EVP_AES_128_CTR
     #error OpenSSL already supports EVP_aes_128_ctr(), etc. => no need for the libssh2 fallbacks!
diff --git a/FreeFileSync/Source/afs/libssh2/init_open_ssl.cpp b/FreeFileSync/Source/afs/libssh2/init_open_ssl.cpp
deleted file mode 100644
index 4f1725e1..00000000
--- a/FreeFileSync/Source/afs/libssh2/init_open_ssl.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// *****************************************************************************
-// * This file is part of the FreeFileSync project. It is distributed under    *
-// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0          *
-// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
-// *****************************************************************************
-
-#include "init_open_ssl.h"
-#include <cassert>
-#include <openssl/ssl.h>
-
-
-#ifndef OPENSSL_THREADS
-    #error FFS, we are royally screwed!
-#endif
-
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-    #error OpenSSL version too old
-#endif
-
-
-void zen::openSslInit()
-{
-    //official Wiki:           https://wiki.openssl.org/index.php/Library_Initialization
-    //see apps_shutdown():     https://github.com/openssl/openssl/blob/master/apps/openssl.c
-    //see Curl_ossl_cleanup(): https://github.com/curl/curl/blob/master/lib/vtls/openssl.c
-
-    //excplicitly init OpenSSL on main thread: they seem to initialize atomically! But it still might help to avoid issues:
-    [[maybe_unused]] const int rv = ::OPENSSL_init_ssl(OPENSSL_INIT_SSL_DEFAULT, nullptr);
-    assert(rv == 1); //https://www.openssl.org/docs/man1.1.0/ssl/OPENSSL_init_ssl.html
-}
-
-
-void zen::openSslTearDown() {} //OpenSSL 1.1.0+ deprecates all clean up functions
-
-
-struct OpenSslThreadCleanUp
-{
-    ~OpenSslThreadCleanUp()
-    {
-        //OpenSSL 1.1.0+ deprecates all clean up functions
-        //=> so much the theory, in practice it leaks, of course: https://github.com/openssl/openssl/issues/6283
-        OPENSSL_thread_stop();
-    }
-};
-thread_local OpenSslThreadCleanUp tearDownOpenSslThreadData;
diff --git a/FreeFileSync/Source/afs/libssh2/init_open_ssl.h b/FreeFileSync/Source/afs/libssh2/init_open_ssl.h
deleted file mode 100644
index e3889a87..00000000
--- a/FreeFileSync/Source/afs/libssh2/init_open_ssl.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// *****************************************************************************
-// * This file is part of the FreeFileSync project. It is distributed under    *
-// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0          *
-// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
-// *****************************************************************************
-
-#ifndef INIT_OPEN_SSL_H_2845370834275264456
-#define INIT_OPEN_SSL_H_2845370834275264456
-
-namespace zen
-{
-void openSslInit();
-void openSslTearDown();
-}
-
-#endif //INIT_OPEN_SSL_H_2845370834275264456
diff --git a/FreeFileSync/Source/afs/native.cpp b/FreeFileSync/Source/afs/native.cpp
index 4e883279..266c88d2 100644
--- a/FreeFileSync/Source/afs/native.cpp
+++ b/FreeFileSync/Source/afs/native.cpp
@@ -127,7 +127,7 @@ std::vector<FsItemRaw> getDirContentFlat(const Zstring& dirPath) //throw FileErr
                Linux                all      <input>
                Windows (NTFS, FAT)  all      <input>
 
-            some file systems return precomposed others decomposed UTF8: http://developer.apple.com/library/mac/#qa/qa1173/_index.html
+            some file systems return precomposed others decomposed UTF8: https://developer.apple.com/library/mac/#qa/qa1173/_index.html
                   - OS X edit controls and text fields may return precomposed UTF as directly received by keyboard or decomposed UTF that was copy & pasted in!
                   - Posix APIs require decomposed form: https://freefilesync.org/forum/viewtopic.php?t=2480
 
diff --git a/FreeFileSync/Source/afs/sftp.cpp b/FreeFileSync/Source/afs/sftp.cpp
index 110ecfc3..d1276d11 100644
--- a/FreeFileSync/Source/afs/sftp.cpp
+++ b/FreeFileSync/Source/afs/sftp.cpp
@@ -249,7 +249,7 @@ std::wstring formatSftpErrorRaw(unsigned long ec)
             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_FX_INVALID_FILENAME);
             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_FX_LINK_LOOP);
 
-        //SFTP error codes missing from libssh2: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-9.1
+        //SFTP error codes missing from libssh2: https://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-9.1
         case 22:
             return L"SSH_FX_CANNOT_DELETE";
         case 23:
diff --git a/FreeFileSync/Source/base/algorithm.cpp b/FreeFileSync/Source/base/algorithm.cpp
index d250347c..820b1bdd 100644
--- a/FreeFileSync/Source/base/algorithm.cpp
+++ b/FreeFileSync/Source/base/algorithm.cpp
@@ -1717,7 +1717,7 @@ void TempFileBuffer::createTempFiles(const std::set<FileDescriptor>& workLoad, P
         const Zstring fileName = AFS::getItemName(descr.path);
 
         auto it = findLast(fileName.begin(), fileName.end(), Zstr('.')); //gracefully handle case of missing "."
-        const Zstring tempFileName = Zstring(fileName.begin(), it) + Zstr('-') + descrHash + Zstring(it, fileName.end());
+        const Zstring tempFileName = Zstring(fileName.begin(), it) + Zstr('~') + descrHash + Zstring(it, fileName.end());
 
         const Zstring tempFilePath = appendSeparator(tempFolderPath_) + tempFileName;
         const AFS::StreamAttributes sourceAttr{ descr.attr.modTime, descr.attr.fileSize, descr.attr.fileId };
diff --git a/FreeFileSync/Source/base/application.cpp b/FreeFileSync/Source/base/application.cpp
index 498839f0..8007ee5e 100644
--- a/FreeFileSync/Source/base/application.cpp
+++ b/FreeFileSync/Source/base/application.cpp
@@ -21,8 +21,8 @@
 #include "synchronization.h"
 #include "help_provider.h"
 #include "fatal_error.h"
+#include "log_file.h"
 #include "resolve_path.h"
-#include "generate_logfile.h"
 #include "../ui/batch_status_handler.h"
 #include "../ui/main_dlg.h"
 #include "../afs/concrete.h"
@@ -58,8 +58,33 @@ bool Application::OnInit()
 {
     //do not call wxApp::OnInit() to avoid using wxWidgets command line parser
 
-    ::gtk_init(nullptr, nullptr);
-    ::gtk_rc_parse((getResourceDirPf() + "styles.gtk_rc").c_str()); //remove excessive inner border from bitmap buttons
+    //GTK should already have been initialized by wxWidgets (see \src\gtk\app.cpp:wxApp::Initialize)
+#if GTK_MAJOR_VERSION == 2
+    ::gtk_rc_parse((getResourceDirPf() + "Gtk2Styles.rc").c_str());
+
+#elif GTK_MAJOR_VERSION == 3
+    try
+    {
+        GtkCssProvider* provider = ::gtk_css_provider_new ();
+        ZEN_ON_SCOPE_EXIT(::g_object_unref(provider));
+
+        GError* error = nullptr;
+        ZEN_ON_SCOPE_EXIT(if (error) ::g_error_free(error););
+
+        ::gtk_css_provider_load_from_path(provider, //GtkCssProvider* css_provider,
+                                          (getResourceDirPf() + "Gtk3Styles.css").c_str(), //const gchar* path,
+                                          &error); //GError** error
+        if (error)
+            throw SysError(formatSystemError(L"gtk_css_provider_load_from_data", replaceCpy(_("Error Code %x"), L"%x", numberTo<std::wstring>(error->code)), utfTo<std::wstring>(error->message)));
+
+        ::gtk_style_context_add_provider_for_screen(::gdk_screen_get_default(),               //GdkScreen* screen,
+                                                    GTK_STYLE_PROVIDER(provider),             //GtkStyleProvider* provider,
+                                                    GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); //guint priority
+    }
+    catch (const SysError& e) { std::cerr << utfTo<std::string>(e.toString()) << "\n"; }
+#else
+#error unknown GTK version!
+#endif
 
 
     //Windows User Experience Interaction Guidelines: tool tips should have 5s timeout, info tips no timeout => compromise:
@@ -267,16 +292,16 @@ void Application::launch(const std::vector<Zstring>& commandArgs)
                 {
                     switch (getXmlType(filePath)) //throw FileError
                     {
-                        case XmlType::GUI:
-                            configFiles.emplace_back(filePath, XmlType::GUI);
+                        case XmlType::gui:
+                            configFiles.emplace_back(filePath, XmlType::gui);
                             break;
-                        case XmlType::BATCH:
-                            configFiles.emplace_back(filePath, XmlType::BATCH);
+                        case XmlType::batch:
+                            configFiles.emplace_back(filePath, XmlType::batch);
                             break;
-                        case XmlType::GLOBAL:
+                        case XmlType::global:
                             globalConfigFile = filePath;
                             break;
-                        case XmlType::OTHER:
+                        case XmlType::other:
                             return notifyFatalError(replaceCpy(_("File %x does not contain a valid configuration."), L"%x", fmtPath(filePath)), _("Error"));
                     }
                 }
@@ -345,7 +370,7 @@ void Application::launch(const std::vector<Zstring>& commandArgs)
         const Zstring filepath = configFiles[0].first;
 
         //batch mode
-        if (configFiles[0].second == XmlType::BATCH && !openForEdit)
+        if (configFiles[0].second == XmlType::batch && !openForEdit)
         {
             XmlBatchConfig batchCfg;
             try
@@ -374,7 +399,7 @@ void Application::launch(const std::vector<Zstring>& commandArgs)
                 readAnyConfig({ filepath }, guiCfg, warningMsg); //throw FileError
 
                 if (!warningMsg.empty())
-                    showNotificationDialog(nullptr, DialogInfoType::WARNING, PopupDialogCfg().setDetailInstructions(warningMsg));
+                    showNotificationDialog(nullptr, DialogInfoType::warning, PopupDialogCfg().setDetailInstructions(warningMsg));
                 //what about simulating changed config on parsing errors?
             }
             catch (const FileError& e)
@@ -406,7 +431,7 @@ void Application::launch(const std::vector<Zstring>& commandArgs)
             readAnyConfig(filePaths, guiCfg, warningMsg); //throw FileError
 
             if (!warningMsg.empty())
-                showNotificationDialog(nullptr, DialogInfoType::WARNING, PopupDialogCfg().setDetailInstructions(warningMsg));
+                showNotificationDialog(nullptr, DialogInfoType::warning, PopupDialogCfg().setDetailInstructions(warningMsg));
             //what about simulating changed config on parsing errors?
         }
         catch (const FileError& e)
@@ -432,7 +457,7 @@ void runGuiMode(const Zstring& globalConfigFilePath,
 
 void showSyntaxHelp()
 {
-    showNotificationDialog(nullptr, DialogInfoType::INFO, PopupDialogCfg().
+    showNotificationDialog(nullptr, DialogInfoType::info, PopupDialogCfg().
                            setTitle(_("Command line")).
                            setDetailInstructions(_("Syntax:") + L"\n\n" +
                                                  L"./FreeFileSync" + L"\n" +
@@ -458,12 +483,12 @@ void showSyntaxHelp()
 
 void runBatchMode(const Zstring& globalConfigFilePath, const XmlBatchConfig& batchCfg, const Zstring& cfgFilePath, FfsReturnCode& returnCode)
 {
-    const bool showPopupAllowed = !batchCfg.mainCfg.ignoreErrors && batchCfg.batchExCfg.batchErrorHandling == BatchErrorHandling::SHOW_POPUP;
+    const bool showPopupAllowed = !batchCfg.mainCfg.ignoreErrors && batchCfg.batchExCfg.batchErrorHandling == BatchErrorHandling::showPopup;
 
     auto notifyError = [&](const std::wstring& msg, FfsReturnCode rc)
     {
         if (showPopupAllowed)
-            showNotificationDialog(nullptr, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(msg));
+            showNotificationDialog(nullptr, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(msg));
         else //"exit" or "ignore"
             logFatalError(utfTo<std::string>(msg));
 
@@ -496,7 +521,7 @@ void runBatchMode(const Zstring& globalConfigFilePath, const XmlBatchConfig& bat
     }
     catch (const FileError& e)
     {
-        notifyError(e.toString(), FFS_RC_FINISHED_WITH_WARNINGS);
+        notifyError(e.toString(), FFS_RC_WARNING);
         //continue!
     }
 
@@ -567,7 +592,7 @@ void runBatchMode(const Zstring& globalConfigFilePath, const XmlBatchConfig& bat
     for (ConfigFileItem& cfi : globalCfg.gui.mainDlg.cfgFileHistory)
         if (equalNativePath(cfi.cfgFilePath, cfgFilePath))
         {
-            if (r.finalStatus != SyncResult::ABORTED)
+            if (r.finalStatus != SyncResult::aborted)
                 cfi.lastSyncTime = std::chrono::system_clock::to_time_t(syncStartTime);
             assert(!AFS::isNullPath(r.logFilePath));
             if (!AFS::isNullPath(r.logFilePath))
@@ -585,7 +610,7 @@ void runBatchMode(const Zstring& globalConfigFilePath, const XmlBatchConfig& bat
     }
     catch (const FileError& e)
     {
-        notifyError(e.toString(), FFS_RC_FINISHED_WITH_WARNINGS);
+        notifyError(e.toString(), FFS_RC_WARNING);
     }
 
     using FinalRequest = BatchStatusHandler::FinalRequest;
@@ -602,7 +627,7 @@ void runBatchMode(const Zstring& globalConfigFilePath, const XmlBatchConfig& bat
                 shutdownSystem(); //throw FileError
                 terminateProcess(0 /*exitCode*/); //no point in continuing and saving cfg again in onQueryEndSession() while the OS will kill us anytime!
             }
-            catch (const FileError& e) { notifyError(e.toString(), FFS_RC_FINISHED_WITH_WARNINGS); }
+            catch (const FileError& e) { notifyError(e.toString(), FFS_RC_WARNING); }
             break;
     }
 }
diff --git a/FreeFileSync/Source/base/comparison.cpp b/FreeFileSync/Source/base/comparison.cpp
index f898cdce..c0c6c4b7 100644
--- a/FreeFileSync/Source/base/comparison.cpp
+++ b/FreeFileSync/Source/base/comparison.cpp
@@ -191,10 +191,10 @@ ComparisonBuffer::ComparisonBuffer(const std::set<DirectoryKey>& foldersToRead,
     {
         switch (callback.reportError(msg, retryNumber))
         {
-            case ProcessCallback::IGNORE_ERROR:
+            case ProcessCallback::ignoreError:
                 return AFS::TraverserCallback::ON_ERROR_CONTINUE;
 
-            case ProcessCallback::RETRY:
+            case ProcessCallback::retry:
                 return AFS::TraverserCallback::ON_ERROR_RETRY;
         }
         assert(false);
diff --git a/FreeFileSync/Source/base/config.cpp b/FreeFileSync/Source/base/config.cpp
index 4a465329..edc7b05f 100644
--- a/FreeFileSync/Source/base/config.cpp
+++ b/FreeFileSync/Source/base/config.cpp
@@ -35,14 +35,14 @@ XmlType getXmlTypeNoThrow(const XmlDoc& doc) //throw()
         if (doc.root().getAttribute("XmlType", type))
         {
             if (type == "GUI")
-                return XmlType::GUI;
+                return XmlType::gui;
             else if (type == "BATCH")
-                return XmlType::BATCH;
+                return XmlType::batch;
             else if (type == "GLOBAL")
-                return XmlType::GLOBAL;
+                return XmlType::global;
         }
     }
-    return XmlType::OTHER;
+    return XmlType::other;
 }
 
 
@@ -58,16 +58,16 @@ void setXmlType(XmlDoc& doc, XmlType type) //throw()
 {
     switch (type)
     {
-        case XmlType::GUI:
+        case XmlType::gui:
             doc.root().setAttribute("XmlType", "GUI");
             break;
-        case XmlType::BATCH:
+        case XmlType::batch:
             doc.root().setAttribute("XmlType", "BATCH");
             break;
-        case XmlType::GLOBAL:
+        case XmlType::global:
             doc.root().setAttribute("XmlType", "GLOBAL");
             break;
-        case XmlType::OTHER:
+        case XmlType::other:
             assert(false);
             break;
     }
@@ -222,10 +222,10 @@ void writeText(const BatchErrorHandling& value, std::string& output)
 {
     switch (value)
     {
-        case BatchErrorHandling::SHOW_POPUP:
+        case BatchErrorHandling::showPopup:
             output = "Show";
             break;
-        case BatchErrorHandling::CANCEL:
+        case BatchErrorHandling::cancel:
             output = "Cancel";
             break;
     }
@@ -236,9 +236,9 @@ bool readText(const std::string& input, BatchErrorHandling& value)
 {
     const std::string tmp = trimCpy(input);
     if (tmp == "Show")
-        value = BatchErrorHandling::SHOW_POPUP;
+        value = BatchErrorHandling::showPopup;
     else if (tmp == "Cancel")
-        value = BatchErrorHandling::CANCEL;
+        value = BatchErrorHandling::cancel;
     else
         return false;
     return true;
@@ -283,13 +283,13 @@ void writeText(const PostSyncAction& value, std::string& output)
 {
     switch (value)
     {
-        case PostSyncAction::NONE:
+        case PostSyncAction::none:
             output = "None";
             break;
-        case PostSyncAction::SLEEP:
+        case PostSyncAction::sleep:
             output = "Sleep";
             break;
-        case PostSyncAction::SHUTDOWN:
+        case PostSyncAction::shutdown:
             output = "Shutdown";
             break;
     }
@@ -300,11 +300,11 @@ bool readText(const std::string& input, PostSyncAction& value)
 {
     const std::string tmp = trimCpy(input);
     if (tmp == "None")
-        value = PostSyncAction::NONE;
+        value = PostSyncAction::none;
     else if (tmp == "Sleep")
-        value = PostSyncAction::SLEEP;
+        value = PostSyncAction::sleep;
     else if (tmp == "Shutdown")
-        value = PostSyncAction::SHUTDOWN;
+        value = PostSyncAction::shutdown;
     else
         return false;
     return true;
@@ -847,16 +847,16 @@ void writeText(const SyncResult& value, std::string& output)
 {
     switch (value)
     {
-        case SyncResult::FINISHED_WITH_SUCCESS:
+        case SyncResult::finishedSuccess:
             output = "Success";
             break;
-        case SyncResult::FINISHED_WITH_WARNINGS:
+        case SyncResult::finishedWarning:
             output = "Warning";
             break;
-        case SyncResult::FINISHED_WITH_ERROR:
+        case SyncResult::finishedError:
             output = "Error";
             break;
-        case SyncResult::ABORTED:
+        case SyncResult::aborted:
             output = "Stopped";
             break;
     }
@@ -867,13 +867,13 @@ bool readText(const std::string& input, SyncResult& value)
 {
     const std::string tmp = trimCpy(input);
     if (tmp == "Success")
-        value = SyncResult::FINISHED_WITH_SUCCESS;
+        value = SyncResult::finishedSuccess;
     else if (tmp == "Warning")
-        value = SyncResult::FINISHED_WITH_WARNINGS;
+        value = SyncResult::finishedWarning;
     else if (tmp == "Error")
-        value = SyncResult::FINISHED_WITH_ERROR;
+        value = SyncResult::finishedError;
     else if (tmp == "Stopped")
-        value = SyncResult::ABORTED;
+        value = SyncResult::aborted;
     else
         return false;
     return true;
@@ -1320,7 +1320,7 @@ void readConfig(const XmlIn& in, BatchExclusiveConfig& cfg, int formatVer)
     {
         std::string str;
         if (inBatchCfg["HandleError"](str))
-            cfg.batchErrorHandling = str == "Stop" ? BatchErrorHandling::CANCEL : BatchErrorHandling::SHOW_POPUP;
+            cfg.batchErrorHandling = str == "Stop" ? BatchErrorHandling::cancel : BatchErrorHandling::showPopup;
     }
     else
         inBatchCfg["ErrorDialog"](cfg.batchErrorHandling);
@@ -1336,13 +1336,13 @@ void readConfig(const XmlIn& in, BatchExclusiveConfig& cfg, int formatVer)
         {
             tmp = trimCpy(tmp);
             if (tmp == "Summary")
-                cfg.postSyncAction = PostSyncAction::NONE;
+                cfg.postSyncAction = PostSyncAction::none;
             else if (tmp == "Exit")
                 cfg.autoCloseSummary = true;
             else if (tmp == "Sleep")
-                cfg.postSyncAction = PostSyncAction::SLEEP;
+                cfg.postSyncAction = PostSyncAction::sleep;
             else if (tmp == "Shutdown")
-                cfg.postSyncAction = PostSyncAction::SHUTDOWN;
+                cfg.postSyncAction = PostSyncAction::shutdown;
         }
     }
     else
@@ -1380,7 +1380,7 @@ void readConfig(const XmlIn& in, XmlBatchConfig& cfg, int formatVer)
                  str == "systemctl suspend" ||
                  str == "osascript -e 'tell application \"System Events\" to sleep'")
         {
-            cfg.batchExCfg.postSyncAction = PostSyncAction::SLEEP;
+            cfg.batchExCfg.postSyncAction = PostSyncAction::sleep;
             cfg.mainCfg.postSyncCommand.clear();
         }
         else if (str == "shutdown /s /t 60"  ||
@@ -1388,7 +1388,7 @@ void readConfig(const XmlIn& in, XmlBatchConfig& cfg, int formatVer)
                  str == "systemctl poweroff" ||
                  str == "osascript -e 'tell application \"System Events\" to shut down'")
         {
-            cfg.batchExCfg.postSyncAction = PostSyncAction::SHUTDOWN;
+            cfg.batchExCfg.postSyncAction = PostSyncAction::shutdown;
             cfg.mainCfg.postSyncCommand.clear();
         }
         else if (cfg.batchExCfg.runMinimized)
@@ -1533,7 +1533,7 @@ void readConfig(const XmlIn& in, XmlGlobalSettings& cfg, int formatVer)
         inGui["ConfigHistory"](cfgHist);
 
         for (const Zstring& cfgPath : cfgHist)
-            cfg.gui.mainDlg.cfgFileHistory.emplace_back(cfgPath, 0, getNullPath(), SyncResult::FINISHED_WITH_SUCCESS);
+            cfg.gui.mainDlg.cfgFileHistory.emplace_back(cfgPath, 0, getNullPath(), SyncResult::finishedSuccess);
     }
     //TODO: remove after migration! 2018-07-27
     else if (formatVer < 10)
@@ -1544,7 +1544,7 @@ void readConfig(const XmlIn& in, XmlGlobalSettings& cfg, int formatVer)
         inConfig["Configurations"](cfgFileHistory);
 
         for (const ConfigFileItemV9& item : cfgFileHistory)
-            cfg.gui.mainDlg.cfgFileHistory.emplace_back(item.filePath, item.lastSyncTime, getNullPath(), SyncResult::FINISHED_WITH_SUCCESS);
+            cfg.gui.mainDlg.cfgFileHistory.emplace_back(item.filePath, item.lastSyncTime, getNullPath(), SyncResult::finishedSuccess);
     }
     else
     {
@@ -1789,19 +1789,19 @@ void readConfig(const Zstring& filePath, XmlType type, ConfigType& cfg, int curr
 
 void fff::readConfig(const Zstring& filePath, XmlGuiConfig& cfg, std::wstring& warningMsg)
 {
-    ::readConfig(filePath, XmlType::GUI, cfg, XML_FORMAT_SYNC_CFG, warningMsg); //throw FileError
+    ::readConfig(filePath, XmlType::gui, cfg, XML_FORMAT_SYNC_CFG, warningMsg); //throw FileError
 }
 
 
 void fff::readConfig(const Zstring& filePath, XmlBatchConfig& cfg, std::wstring& warningMsg)
 {
-    ::readConfig(filePath, XmlType::BATCH, cfg, XML_FORMAT_SYNC_CFG, warningMsg); //throw FileError
+    ::readConfig(filePath, XmlType::batch, cfg, XML_FORMAT_SYNC_CFG, warningMsg); //throw FileError
 }
 
 
 void fff::readConfig(const Zstring& filePath, XmlGlobalSettings& cfg, std::wstring& warningMsg)
 {
-    ::readConfig(filePath, XmlType::GLOBAL, cfg, XML_FORMAT_GLOBAL_CFG, warningMsg); //throw FileError
+    ::readConfig(filePath, XmlType::global, cfg, XML_FORMAT_GLOBAL_CFG, warningMsg); //throw FileError
 }
 
 
@@ -1851,7 +1851,7 @@ void fff::readAnyConfig(const std::vector<Zstring>& filePaths, XmlGuiConfig& cfg
 
         switch (getXmlTypeNoThrow(doc))
         {
-            case XmlType::GUI:
+            case XmlType::gui:
             {
                 XmlGuiConfig guiCfg = parseConfig<XmlGuiConfig>(doc, filePath, XML_FORMAT_SYNC_CFG, warningMsg); //nothrow
                 if (firstItem)
@@ -1860,7 +1860,7 @@ void fff::readAnyConfig(const std::vector<Zstring>& filePaths, XmlGuiConfig& cfg
             }
             break;
 
-            case XmlType::BATCH:
+            case XmlType::batch:
             {
                 XmlBatchConfig batchCfg = parseConfig<XmlBatchConfig>(doc, filePath, XML_FORMAT_SYNC_CFG, warningMsg); //nothrow
                 if (firstItem)
@@ -1869,8 +1869,8 @@ void fff::readAnyConfig(const std::vector<Zstring>& filePaths, XmlGuiConfig& cfg
             }
             break;
 
-            case XmlType::GLOBAL:
-            case XmlType::OTHER:
+            case XmlType::global:
+            case XmlType::other:
                 throw FileError(replaceCpy(_("File %x does not contain a valid configuration."), L"%x", fmtPath(filePath)));
         }
     }
@@ -2196,19 +2196,19 @@ void writeConfig(const ConfigType& cfg, XmlType type, int xmlFormatVer, const Zs
 
 void fff::writeConfig(const XmlGuiConfig& cfg, const Zstring& filePath)
 {
-    ::writeConfig(cfg, XmlType::GUI, XML_FORMAT_SYNC_CFG, filePath); //throw FileError
+    ::writeConfig(cfg, XmlType::gui, XML_FORMAT_SYNC_CFG, filePath); //throw FileError
 }
 
 
 void fff::writeConfig(const XmlBatchConfig& cfg, const Zstring& filePath)
 {
-    ::writeConfig(cfg, XmlType::BATCH, XML_FORMAT_SYNC_CFG, filePath); //throw FileError
+    ::writeConfig(cfg, XmlType::batch, XML_FORMAT_SYNC_CFG, filePath); //throw FileError
 }
 
 
 void fff::writeConfig(const XmlGlobalSettings& cfg, const Zstring& filePath)
 {
-    ::writeConfig(cfg, XmlType::GLOBAL, XML_FORMAT_GLOBAL_CFG, filePath); //throw FileError
+    ::writeConfig(cfg, XmlType::global, XML_FORMAT_GLOBAL_CFG, filePath); //throw FileError
 }
 
 
diff --git a/FreeFileSync/Source/base/config.h b/FreeFileSync/Source/base/config.h
index ab9cbf97..89edfeb9 100644
--- a/FreeFileSync/Source/base/config.h
+++ b/FreeFileSync/Source/base/config.h
@@ -19,26 +19,26 @@ namespace fff
 {
 enum class XmlType
 {
-    GUI,
-    BATCH,
-    GLOBAL,
-    OTHER
+    gui,
+    batch,
+    global,
+    other
 };
 XmlType getXmlType(const Zstring& filePath); //throw FileError
 
 
 enum class BatchErrorHandling
 {
-    SHOW_POPUP,
-    CANCEL
+    showPopup,
+    cancel
 };
 
 
 enum class PostSyncAction
 {
-    NONE,
-    SLEEP,
-    SHUTDOWN
+    none,
+    sleep,
+    shutdown
 };
 
 struct ExternalApp
@@ -66,10 +66,10 @@ inline bool operator!=(const XmlGuiConfig& lhs, const XmlGuiConfig& rhs) { retur
 
 struct BatchExclusiveConfig
 {
-    BatchErrorHandling batchErrorHandling = BatchErrorHandling::SHOW_POPUP;
+    BatchErrorHandling batchErrorHandling = BatchErrorHandling::showPopup;
     bool runMinimized = false;
     bool autoCloseSummary = false;
-    PostSyncAction postSyncAction = PostSyncAction::NONE;
+    PostSyncAction postSyncAction = PostSyncAction::none;
 };
 
 
diff --git a/FreeFileSync/Source/base/db_file.cpp b/FreeFileSync/Source/base/db_file.cpp
index e9fd9e03..578b53f8 100644
--- a/FreeFileSync/Source/base/db_file.cpp
+++ b/FreeFileSync/Source/base/db_file.cpp
@@ -8,6 +8,7 @@
 #include <zen/guid.h>
 #include <zen/crc.h>
 #include <zen/zlib_wrap.h>
+#include "../afs/concrete.h"
 
 
 using namespace zen;
@@ -37,23 +38,14 @@ using DbStreams = std::map<UniqueId, SessionData>; //list of streams ordered by
   ------------------------------------------------------------------------------*/
 
 template <SelectedSide side> inline
-AbstractPath getDatabaseFilePath(const BaseFolderPair& baseFolder, bool tempfile = false)
+AbstractPath getDatabaseFilePath(const BaseFolderPair& baseFolder)
 {
     //Linux and Windows builds are binary incompatible: different file id?, problem with case sensitivity?
     //precomposed/decomposed UTF? are UTC file times really compatible? what about endianess!?
     //however 32 and 64-bit FreeFileSync are designed to produce binary-identical db files!
-    //Give db files different names.
+    //=> give db files different names:
     const Zstring dbName = Zstr(".sync"); //files beginning with dots are hidden e.g. in Nautilus
-    Zstring dbFileName;
-    if (tempfile) //generate (hopefully) unique file name to avoid clashing with some remnant ffs_tmp file
-    {
-        const Zstring shortGuid = printNumber<Zstring>(Zstr("%04x"), static_cast<unsigned int>(getCrc16(generateGUID())));
-        dbFileName = dbName + Zstr('.') + shortGuid + AFS::TEMP_FILE_ENDING;
-    }
-    else
-        dbFileName = dbName + SYNC_DB_FILE_ENDING;
-
-    return AFS::appendRelPath(baseFolder.getAbstractPath<side>(), dbFileName);
+    return AFS::appendRelPath(baseFolder.getAbstractPath<side>(), dbName + SYNC_DB_FILE_ENDING);
 }
 
 //#######################################################################################################################################
@@ -746,36 +738,31 @@ private:
 
 
 std::pair<DbStreams::const_iterator,
-    DbStreams::const_iterator> getCommonSession(const DbStreams& streamsLeft, const DbStreams& streamsRight, //throw FileError, FileErrorDatabaseNotExisting
-                                                const std::wstring& displayFilePathL, //used for diagnostics only
-                                                const std::wstring& displayFilePathR)
+    DbStreams::const_iterator> findCommonSession(const DbStreams& streamsLeft, const DbStreams& streamsRight, //throw FileError
+                                                 const std::wstring& displayFilePathL, //used for diagnostics only
+                                                 const std::wstring& displayFilePathR)
 {
-    auto itCommonL = streamsLeft .cend();
-    auto itCommonR = streamsRight.cend();
+    auto itCommonL = streamsLeft .end();
+    auto itCommonR = streamsRight.end();
 
     for (auto itL = streamsLeft.begin(); itL != streamsLeft.end(); ++itL)
     {
         auto itR = streamsRight.find(itL->first);
         if (itR != streamsRight.end())
-            /* handle case when db file is loaded together with a former copy of itself:
+            /* handle case when db file is loaded together with a (former) copy of itself:
                 - some streams may have been updated in the meantime => must not discard either db file!
                 - since db file was copied, multiple streams may have matching sessionID
-                   => IGNORE all of them: one of them may be used later against other sync targets!
-            */
+                   => IGNORE all of them: one of them may be used later against other sync targets!       */
             if (itL->second.isLeadStream != itR->second.isLeadStream)
             {
-                if (itCommonL != streamsLeft.end())
+                if (itCommonL != streamsLeft.end()) //should not be possible!
                     throw FileError(_("Database file is corrupted:") + L"\n" + fmtPath(displayFilePathL) + L"\n" + fmtPath(displayFilePathR),
-                                    L"Multiple common sessions found."); //should not be possible (anymore)
+                                    L"Multiple common sessions found.");
                 itCommonL = itL;
                 itCommonR = itR;
             }
     }
 
-    if (itCommonL == streamsLeft.end())
-        throw FileErrorDatabaseNotExisting(_("Initial synchronization:") + L" \n" +
-                                           _("The database files do not yet contain information about the last synchronization."));
-
     return { itCommonL, itCommonR };
 }
 }
@@ -805,16 +792,18 @@ std::shared_ptr<InSyncFolder> fff::loadLastSynchronousState(const BaseFolderPair
     const DbStreams streamsLeft  = ::loadStreams(dbPathLeft,  notifyLoadL); //throw FileError, FileErrorDatabaseNotExisting, X
     const DbStreams streamsRight = ::loadStreams(dbPathRight, notifyLoadR); //
 
-    //find associated session: there can be at most one session within intersection of left and right ids
-    std::pair<DbStreams::const_iterator,
-        DbStreams::const_iterator> session = getCommonSession(streamsLeft, streamsRight, //throw FileError, FileErrorDatabaseNotExisting
-                                                              AFS::getDisplayPath(dbPathLeft),
-                                                              AFS::getDisplayPath(dbPathRight));
+    //find associated session: there can be at most one session within intersection of left and right IDs
+    const auto [itStreamL, itStreamR] = findCommonSession(streamsLeft, streamsRight, //throw FileError
+                                                          AFS::getDisplayPath(dbPathLeft),
+                                                          AFS::getDisplayPath(dbPathRight));
+    if (itStreamL == streamsLeft.end())
+        throw FileErrorDatabaseNotExisting(_("Initial synchronization:") + L" \n" +
+                                           _("The database files do not yet contain information about the last synchronization."));
 
-    const bool leadStreamLeft = session.first->second.isLeadStream;
-    assert(session.first->second.isLeadStream != session.second->second.isLeadStream);
-    const ByteArray& streamL = session.first ->second.rawStream;
-    const ByteArray& streamR = session.second->second.rawStream;
+    const bool leadStreamLeft = itStreamL->second.isLeadStream;
+    assert(itStreamL->second.isLeadStream != itStreamR->second.isLeadStream);
+    const ByteArray& streamL = itStreamL ->second.rawStream;
+    const ByteArray& streamR = itStreamR->second.rawStream;
 
     return StreamParser::execute(leadStreamLeft, streamL, streamR, //throw FileError
                                  AFS::getDisplayPath(dbPathLeft),
@@ -822,51 +811,45 @@ std::shared_ptr<InSyncFolder> fff::loadLastSynchronousState(const BaseFolderPair
 }
 
 
-void fff::saveLastSynchronousState(const BaseFolderPair& baseFolder, const std::function<void(const std::wstring& statusMsg)>& notifyStatus /*throw X*/) //throw FileError, X
+void fff::saveLastSynchronousState(const BaseFolderPair& baseFolder, bool transactionalCopy,
+                                   const std::function<void(const std::wstring& statusMsg)>& notifyStatus /*throw X*/) //throw FileError, X
 {
     //transactional behaviour! write to tmp files first
-    const AbstractPath dbPathLeft  = getDatabaseFilePath< LEFT_SIDE>(baseFolder);
-    const AbstractPath dbPathRight = getDatabaseFilePath<RIGHT_SIDE>(baseFolder);
+    const AbstractPath dbPathL = getDatabaseFilePath< LEFT_SIDE>(baseFolder);
+    const AbstractPath dbPathR = getDatabaseFilePath<RIGHT_SIDE>(baseFolder);
 
-    const AbstractPath dbPathLeftTmp  = getDatabaseFilePath< LEFT_SIDE>(baseFolder, true /*tempfile*/);
-    const AbstractPath dbPathRightTmp = getDatabaseFilePath<RIGHT_SIDE>(baseFolder, true /*tempfile*/);
+    StreamStatusNotifier notifyLoadL(replaceCpy(_("Loading file %x..."), L"%x", fmtPath(AFS::getDisplayPath(dbPathL))), notifyStatus);
+    StreamStatusNotifier notifyLoadR(replaceCpy(_("Loading file %x..."), L"%x", fmtPath(AFS::getDisplayPath(dbPathR))), notifyStatus);
 
-    StreamStatusNotifier notifyLoadL(replaceCpy(_("Loading file %x..."), L"%x", fmtPath(AFS::getDisplayPath(dbPathLeft) )), notifyStatus);
-    StreamStatusNotifier notifyLoadR(replaceCpy(_("Loading file %x..."), L"%x", fmtPath(AFS::getDisplayPath(dbPathRight))), notifyStatus);
-
-    StreamStatusNotifier notifySaveL(replaceCpy(_("Saving file %x..."), L"%x", fmtPath(AFS::getDisplayPath(dbPathLeft) )), notifyStatus);
-    StreamStatusNotifier notifySaveR(replaceCpy(_("Saving file %x..."), L"%x", fmtPath(AFS::getDisplayPath(dbPathRight))), notifyStatus);
+    StreamStatusNotifier notifySaveL(replaceCpy(_("Saving file %x..."), L"%x", fmtPath(AFS::getDisplayPath(dbPathL))), notifyStatus);
+    StreamStatusNotifier notifySaveR(replaceCpy(_("Saving file %x..."), L"%x", fmtPath(AFS::getDisplayPath(dbPathR))), notifyStatus);
 
     //(try to) load old database files...
-    DbStreams streamsLeft; //list of session ID + DirInfo-stream
-    DbStreams streamsRight;
+    DbStreams streamsL; //list of session ID + DirInfo-stream
+    DbStreams streamsR;
 
-    try { streamsLeft  = ::loadStreams(dbPathLeft, notifyLoadL); } //throw FileError, FileErrorDatabaseNotExisting, X
+    try { streamsL = ::loadStreams(dbPathL, notifyLoadL); } //throw FileError, FileErrorDatabaseNotExisting, X
     catch (FileError&) {}
-    try { streamsRight = ::loadStreams(dbPathRight, notifyLoadR); } //throw FileError, FileErrorDatabaseNotExisting, X
+    try { streamsR = ::loadStreams(dbPathR, notifyLoadR); } //throw FileError, FileErrorDatabaseNotExisting, X
     catch (FileError&) {}
     //if error occurs: just overwrite old file! User is already informed about issues right after comparing!
 
     auto lastSyncState = std::make_shared<InSyncFolder>(InSyncFolder::DIR_STATUS_IN_SYNC);
-    auto itStreamOldL = streamsLeft .cend();
-    auto itStreamOldR = streamsRight.cend();
-    try
-    {
-        //find associated session: there can be at most one session within intersection of left and right ids
-        std::tie(itStreamOldL, itStreamOldR) = getCommonSession(streamsLeft, streamsRight, //throw FileError, FileErrorDatabaseNotExisting
-                                                                AFS::getDisplayPath(dbPathLeft),
-                                                                AFS::getDisplayPath(dbPathRight));
-
-        const bool leadStreamLeft = itStreamOldL->second.isLeadStream;
-
-        //load last synchrounous state
-        lastSyncState = StreamParser::execute(leadStreamLeft,
-                                              itStreamOldL->second.rawStream, //throw FileError
-                                              itStreamOldR->second.rawStream,
-                                              AFS::getDisplayPath(dbPathLeft),
-                                              AFS::getDisplayPath(dbPathRight));
-    }
-    catch (FileError&) {} //if error occurs: just overwrite old file! User is already informed about issues right after comparing!
+
+    //find associated session: there can be at most one session within intersection of left and right IDs
+    const auto [itStreamOldL, itStreamOldR] = findCommonSession(streamsL, streamsR, //throw FileError
+                                                                AFS::getDisplayPath(dbPathL),
+                                                                AFS::getDisplayPath(dbPathR));
+    if (itStreamOldL != streamsL.end())
+        try //load last synchrounous state
+        {
+            lastSyncState = StreamParser::execute(itStreamOldL->second.isLeadStream /*leadStreamLeft*/,
+                                                  itStreamOldL->second.rawStream, //throw FileError
+                                                  itStreamOldR->second.rawStream,
+                                                  AFS::getDisplayPath(dbPathL),
+                                                  AFS::getDisplayPath(dbPathR));
+        }
+        catch (FileError&) {} //if error occurs: just overwrite old file! User is already informed about errors right after comparing!
 
     //update last synchrounous state
     LastSynchronousStateUpdater::execute(baseFolder, *lastSyncState);
@@ -878,41 +861,112 @@ void fff::saveLastSynchronousState(const BaseFolderPair& baseFolder, const std::
     sessionDataR.isLeadStream = false;
 
     StreamGenerator::execute(*lastSyncState, //throw FileError
-                             AFS::getDisplayPath(dbPathLeft),
-                             AFS::getDisplayPath(dbPathRight),
+                             AFS::getDisplayPath(dbPathL),
+                             AFS::getDisplayPath(dbPathR),
                              sessionDataL.rawStream,
                              sessionDataR.rawStream);
 
     //check if there is some work to do at all
-    if (itStreamOldL != streamsLeft .end() && itStreamOldL->second == sessionDataL &&
-        itStreamOldR != streamsRight.end() && itStreamOldR->second == sessionDataR)
+    if (itStreamOldL != streamsL.end() && itStreamOldL->second == sessionDataL &&
+        itStreamOldR != streamsR.end() && itStreamOldR->second == sessionDataR)
         return; //some users monitor the *.ffs_db file with RTS => don't touch the file if it isnt't strictly needed
 
     //erase old session data
-    if (itStreamOldL != streamsLeft.end())
-        streamsLeft.erase(itStreamOldL);
-    if (itStreamOldR != streamsRight.end())
-        streamsRight.erase(itStreamOldR);
+    if (itStreamOldL != streamsL.end())
+        streamsL.erase(itStreamOldL);
+    if (itStreamOldR != streamsR.end())
+        streamsR.erase(itStreamOldR);
 
     //create new session data
     const std::string sessionID = zen::generateGUID();
 
-    streamsLeft [sessionID] = std::move(sessionDataL);
-    streamsRight[sessionID] = std::move(sessionDataR);
+    streamsL[sessionID] = std::move(sessionDataL);
+    streamsR[sessionID] = std::move(sessionDataR);
+
+    warn_static("finish: support massParallelExecute!?")
+    if (transactionalCopy &&
+        (!AFS::hasNativeTransactionalCopy(dbPathL) ||
+         !AFS::hasNativeTransactionalCopy(dbPathR)))
+    {
+        //write (temp-) files as a transaction
+        const Zstring shortGuid = printNumber<Zstring>(Zstr("%04x"), static_cast<unsigned int>(getCrc16(generateGUID())));
+
+        const AbstractPath dbPathTmpL = AFS::appendRelPath(*AFS::getParentPath(dbPathL), AFS::getItemName(dbPathL) + Zstr('.') + shortGuid + AFS::TEMP_FILE_ENDING);
+        const AbstractPath dbPathRTmp = AFS::appendRelPath(*AFS::getParentPath(dbPathR), AFS::getItemName(dbPathR) + Zstr('.') + shortGuid + AFS::TEMP_FILE_ENDING);
+
+        saveStreams(streamsL, dbPathTmpL, notifySaveL); //throw FileError, X
+        auto guardTmpL = makeGuard<ScopeGuardRunMode::ON_FAIL>([&] { try { AFS::removeFilePlain(dbPathTmpL); } catch (FileError&) {} });
+        saveStreams(streamsR, dbPathRTmp, notifySaveR); //throw FileError, X
+        auto guardTmpR = makeGuard<ScopeGuardRunMode::ON_FAIL>([&] { try { AFS::removeFilePlain(dbPathRTmp); } catch (FileError&) {} });
+
+        //operation finished: rename temp files -> this should work (almost) transactionally:
+        //if there were no write access, creation of temp files would have failed
+        AFS::removeFileIfExists(dbPathL);            //throw FileError
+        AFS::moveAndRenameItem(dbPathTmpL, dbPathL); //throw FileError, (ErrorMoveUnsupported)
+        guardTmpL.dismiss();
+
+        AFS::removeFileIfExists(dbPathR);            //throw FileError
+        AFS::moveAndRenameItem(dbPathRTmp, dbPathR); //throw FileError, (ErrorMoveUnsupported)
+        guardTmpR.dismiss();
+    }
+    else //some MTP devices don't even allow renaming files: https://freefilesync.org/forum/viewtopic.php?t=6531
+    {
+		warn_static("caveat: throw X leaves db file as deleted!")
+        AFS::removeFileIfExists(dbPathL);            //throw FileError
+        saveStreams(streamsL, dbPathL, notifySaveL); //throw FileError, X
+
+        AFS::removeFileIfExists(dbPathR);            //throw FileError
+        saveStreams(streamsR, dbPathR, notifySaveR); //throw FileError, X
+    }
+
+#if 0
+    warn_static("remove after test")
 
     //write (temp-) files as a transaction
-    saveStreams(streamsLeft,  dbPathLeftTmp,  notifySaveL); //throw FileError, X
-    auto guardTmpL = makeGuard<ScopeGuardRunMode::ON_FAIL>([&] { try { AFS::removeFilePlain(dbPathLeftTmp); } catch (FileError&) {} });
-    saveStreams(streamsRight, dbPathRightTmp, notifySaveR); //
-    auto guardTmpR = makeGuard<ScopeGuardRunMode::ON_FAIL>([&] { try { AFS::removeFilePlain(dbPathRightTmp); } catch (FileError&) {} });
-
-    //operation finished: rename temp files -> this should work (almost) transactionally:
-    //if there were no write access, creation of temp files would have failed
-    AFS::removeFileIfExists(dbPathLeft);               //throw FileError
-    AFS::moveAndRenameItem(dbPathLeftTmp, dbPathLeft); //throw FileError, (ErrorMoveUnsupported)
-    guardTmpL.dismiss();
-
-    AFS::removeFileIfExists(dbPathRight);                //
-    AFS::moveAndRenameItem(dbPathRightTmp, dbPathRight); //
-    guardTmpR.dismiss();
+    const Zstring shortGuid = printNumber<Zstring>(Zstr("%04x"), static_cast<unsigned int>(getCrc16(generateGUID())));
+
+    AbstractPath dbPathTmpL = getNullPath();
+    AbstractPath dbPathTmpR = getNullPath();
+    ZEN_ON_SCOPE_EXIT(
+    try { if (!AFS::isNullPath(dbPathTmpL)) AFS::removeFilePlain(dbPathTmpL); }
+    catch (FileError&) {}
+
+    try { if (!AFS::isNullPath(dbPathTmpR)) AFS::removeFilePlain(dbPathTmpR); }
+    catch (FileError&) {}
+    );
+
+    if (transactionalCopy && !AFS::hasNativeTransactionalCopy(dbPathL))
+    {
+		AbstractPath dbPathTmpL2 = AFS::appendRelPath(*AFS::getParentPath(dbPathL), AFS::getItemName(dbPathL) + Zstr('.') + shortGuid + AFS::TEMP_FILE_ENDING);
+        saveStreams(streamsL, dbPathTmpL2, notifySaveL); //throw FileError, X
+        dbPathTmpL = dbPathTmpL2;
+    }
+
+    if (transactionalCopy && !AFS::hasNativeTransactionalCopy(dbPathR))
+    {
+		AbstractPath dbPathTmpR2 = AFS::appendRelPath(*AFS::getParentPath(dbPathR), AFS::getItemName(dbPathR) + Zstr('.') + shortGuid + AFS::TEMP_FILE_ENDING);
+        saveStreams(streamsR, dbPathTmpR2, notifySaveR); //throw FileError, X
+        dbPathTmpR = dbPathTmpR2;
+    }
+
+    AFS::removeFileIfExists(dbPathL); //throw FileError
+    if (!AFS::isNullPath(dbPathTmpL))
+    {
+        //operation finished: rename temp files -> this should work (almost) transactionally:
+        //if there were no write access, creation of temp files would have failed
+        AFS::moveAndRenameItem(dbPathTmpL, dbPathL); //throw FileError, (ErrorMoveUnsupported)
+        dbPathTmpL = getNullPath();
+    }
+    else //some MTP devices don't even allow renaming files: https://freefilesync.org/forum/viewtopic.php?t=6531
+        saveStreams(streamsL, dbPathL, notifySaveL); //throw FileError, X
+
+    AFS::removeFileIfExists(dbPathR); //throw FileError
+    if (!AFS::isNullPath(dbPathTmpR))
+    {
+        AFS::moveAndRenameItem(dbPathTmpR, dbPathR); //throw FileError, (ErrorMoveUnsupported)
+        dbPathTmpR = getNullPath();
+    }
+    else
+        saveStreams(streamsR, dbPathR, notifySaveR); //throw FileError, X
+#endif
 }
diff --git a/FreeFileSync/Source/base/db_file.h b/FreeFileSync/Source/base/db_file.h
index e3e4b4d3..ca747dd9 100644
--- a/FreeFileSync/Source/base/db_file.h
+++ b/FreeFileSync/Source/base/db_file.h
@@ -97,7 +97,7 @@ DEFINE_NEW_FILE_ERROR(FileErrorDatabaseNotExisting);
 std::shared_ptr<InSyncFolder> loadLastSynchronousState(const BaseFolderPair& baseDirObj, //throw FileError, FileErrorDatabaseNotExisting -> return value always bound!
                                                        const std::function<void(const std::wstring& statusMsg)>& notifyStatus);
 
-void saveLastSynchronousState(const BaseFolderPair& baseDirObj, //throw FileError, X
+void saveLastSynchronousState(const BaseFolderPair& baseDirObj, bool transactionalCopy, //throw FileError, X
                               const std::function<void(const std::wstring& statusMsg)>& notifyStatus /*throw X*/);
 }
 
diff --git a/FreeFileSync/Source/base/icon_buffer.cpp b/FreeFileSync/Source/base/icon_buffer.cpp
index 1fc89766..b5973c34 100644
--- a/FreeFileSync/Source/base/icon_buffer.cpp
+++ b/FreeFileSync/Source/base/icon_buffer.cpp
@@ -307,7 +307,7 @@ IconBuffer::IconBuffer(IconSize sz) : pimpl_(std::make_unique<Impl>()), iconSize
 
 IconBuffer::~IconBuffer()
 {
-    setWorkload({}); //make sure interruption point is always reached! //needed???
+    setWorkload({}); //make sure interruption point is always reached! needed???
     pimpl_->worker.interrupt();
     pimpl_->worker.join();
 }
diff --git a/FreeFileSync/Source/base/icon_loader.cpp b/FreeFileSync/Source/base/icon_loader.cpp
index f7792118..b58d5a6d 100644
--- a/FreeFileSync/Source/base/icon_loader.cpp
+++ b/FreeFileSync/Source/base/icon_loader.cpp
@@ -9,6 +9,7 @@
 
     #include <gtk/gtk.h>
     #include <sys/stat.h>
+    #include <zen/sys_error.h>
 
 
 using namespace zen;
@@ -17,24 +18,33 @@ using namespace fff;
 
 namespace
 {
-ImageHolder copyToImageHolder(const GdkPixbuf* pixbuf)
+static_assert(GTK_MAJOR_VERSION == 2, "FreeFileSync does NOT (currently) support GTK3! The GTK calls below will lead to crashes due to not being thread-safe on GTK3.");
+//gdk_threads_enter(); + ZEN_ON_SCOPE_EXIT(::gdk_threads_leave); is NOT enough; e.g. GTK3 + openSuse still crashes with:
+//  Gtk:ERROR:gtkicontheme.c:4026:proxy_pixbuf_destroy: assertion failed: (icon_info->proxy_pixbuf != NULL)
+//GTK icon theme internals: https://github.com/GNOME/gtk/blob/master/gtk/gtkicontheme.c
+//Alternative: https://developer.gnome.org/gtk3/stable/GtkIconTheme.html#gtk-icon-info-load-icon-async
+//GTK2 OTOH crashes only extremely rarely, still this must be fixed
+warn_static("TODO: GTK / GDK not thread-safe! in particular gtk_icon_info_load_icon() is not!!!")
+
+
+ImageHolder copyToImageHolder(const GdkPixbuf* pixBuf)
 {
     //see: https://developer.gnome.org/gdk-pixbuf/stable/gdk-pixbuf-The-GdkPixbuf-Structure.html
-    if (pixbuf &&
-        ::gdk_pixbuf_get_colorspace(pixbuf) == GDK_COLORSPACE_RGB &&
-        ::gdk_pixbuf_get_bits_per_sample(pixbuf) == 8)
+    if (pixBuf &&
+        ::gdk_pixbuf_get_colorspace(pixBuf) == GDK_COLORSPACE_RGB &&
+        ::gdk_pixbuf_get_bits_per_sample(pixBuf) == 8)
     {
-        const int channels = ::gdk_pixbuf_get_n_channels(pixbuf);
+        const int channels = ::gdk_pixbuf_get_n_channels(pixBuf);
         if (channels == 3 || channels == 4)
         {
-            const int stride = ::gdk_pixbuf_get_rowstride(pixbuf);
-            const unsigned char* rgbaSrc = ::gdk_pixbuf_get_pixels(pixbuf);
+            const int stride = ::gdk_pixbuf_get_rowstride(pixBuf);
+            const unsigned char* rgbaSrc = ::gdk_pixbuf_get_pixels(pixBuf);
 
             if (channels == 3)
             {
-                assert(!::gdk_pixbuf_get_has_alpha(pixbuf));
+                assert(!::gdk_pixbuf_get_has_alpha(pixBuf));
 
-                ImageHolder out(::gdk_pixbuf_get_width(pixbuf), ::gdk_pixbuf_get_height(pixbuf), false /*withAlpha*/);
+                ImageHolder out(::gdk_pixbuf_get_width(pixBuf), ::gdk_pixbuf_get_height(pixBuf), false /*withAlpha*/);
                 unsigned char* rgbTrg = out.getRgb();
 
                 for (int y = 0; y < out.getHeight(); ++y)
@@ -51,9 +61,9 @@ ImageHolder copyToImageHolder(const GdkPixbuf* pixbuf)
             }
             else if (channels == 4)
             {
-                assert(::gdk_pixbuf_get_has_alpha(pixbuf));
+                assert(::gdk_pixbuf_get_has_alpha(pixBuf));
 
-                ImageHolder out(::gdk_pixbuf_get_width(pixbuf), ::gdk_pixbuf_get_height(pixbuf), true /*withAlpha*/);
+                ImageHolder out(::gdk_pixbuf_get_width(pixBuf), ::gdk_pixbuf_get_height(pixBuf), true /*withAlpha*/);
                 unsigned char* rgbTrg   = out.getRgb();
                 unsigned char* alphaTrg = out.getAlpha();
 
@@ -82,11 +92,36 @@ ImageHolder imageHolderFromGicon(GIcon* gicon, int pixelSize)
         if (GtkIconTheme* defaultTheme = ::gtk_icon_theme_get_default()) //not owned!
             if (GtkIconInfo* iconInfo = ::gtk_icon_theme_lookup_by_gicon(defaultTheme, gicon, pixelSize, GTK_ICON_LOOKUP_USE_BUILTIN)) //this may fail if icon is not installed on system
             {
+#if GTK_MAJOR_VERSION == 2
                 ZEN_ON_SCOPE_EXIT(::gtk_icon_info_free(iconInfo));
-                if (GdkPixbuf* pixBuf = ::gtk_icon_info_load_icon(iconInfo, nullptr))
+#elif GTK_MAJOR_VERSION == 3
+                ZEN_ON_SCOPE_EXIT(::g_object_unref(iconInfo));
+#else
+#error unknown GTK version!
+#endif
+                if (GdkPixbuf* pixBuf = ::gtk_icon_info_load_icon(iconInfo, nullptr /*error*/))
                 {
-                    ZEN_ON_SCOPE_EXIT(::g_object_unref(pixBuf)); //supersedes "::gdk_pixbuf_unref"!
-                    return copyToImageHolder(pixBuf);
+                    ZEN_ON_SCOPE_EXIT(::g_object_unref(pixBuf));
+
+                    //we might have to shrink the image (e.g. GTK3, openSUSE): "an icon theme may have icons that differ slightly from their nominal sizes"
+                    const int width  = ::gdk_pixbuf_get_width (pixBuf);
+                    const int height = ::gdk_pixbuf_get_height(pixBuf);
+
+                    const int maxExtent = std::max(width, height);
+                    if (pixelSize < maxExtent)
+                    {
+                        GdkPixbuf* pixBufShrinked = ::gdk_pixbuf_scale_simple(pixBuf,                         //const GdkPixbuf* src,
+                                                                              width  * pixelSize / maxExtent, //int dest_width,
+                                                                              height * pixelSize / maxExtent, //int dest_height,
+                                                                              GDK_INTERP_BILINEAR);           //GdkInterpType interp_type
+                        if (!pixBufShrinked)
+                            return ImageHolder();
+                        ZEN_ON_SCOPE_EXIT(::g_object_unref(pixBufShrinked));
+
+                        return copyToImageHolder(pixBufShrinked);
+                    }
+                    else
+                        return copyToImageHolder(pixBuf);
                 }
             }
     return ImageHolder();
@@ -141,17 +176,21 @@ ImageHolder fff::genericDirIcon(int pixelSize)
 
 ImageHolder fff::getFileIcon(const Zstring& filePath, int pixelSize)
 {
-    //2. retrieve file icons
-    GFile* file = ::g_file_new_for_path(filePath.c_str()); //documented to "never fail"
-    ZEN_ON_SCOPE_EXIT(::g_object_unref(file));
-
-    if (GFileInfo* fileInfo = ::g_file_query_info(file, G_FILE_ATTRIBUTE_STANDARD_ICON, G_FILE_QUERY_INFO_NONE, nullptr, nullptr))
+    try
     {
-        ZEN_ON_SCOPE_EXIT(::g_object_unref(fileInfo));
-        if (GIcon* gicon = ::g_file_info_get_icon(fileInfo)) //not owned!
-            return imageHolderFromGicon(gicon, pixelSize);
+        GFile* file = ::g_file_new_for_path(filePath.c_str()); //documented to "never fail"
+        ZEN_ON_SCOPE_EXIT(::g_object_unref(file));
+
+        if (GFileInfo* fileInfo = ::g_file_query_info(file, G_FILE_ATTRIBUTE_STANDARD_ICON, G_FILE_QUERY_INFO_NONE, nullptr, nullptr))
+        {
+            ZEN_ON_SCOPE_EXIT(::g_object_unref(fileInfo));
+            if (GIcon* gicon = ::g_file_info_get_icon(fileInfo)) //not owned!
+                return imageHolderFromGicon(gicon, pixelSize);
+        }
+        //need fallback: icon lookup may fail because some icons are currently not present on system
+
     }
-    //need fallback: icon lookup may fail because some icons are currently not present on system
+    catch (SysError&) { assert(false); }
 
     return ImageHolder();
 }
@@ -159,31 +198,36 @@ ImageHolder fff::getFileIcon(const Zstring& filePath, int pixelSize)
 
 ImageHolder fff::getThumbnailImage(const Zstring& filePath, int pixelSize) //return null icon on failure
 {
-    struct ::stat fileInfo = {};
-    if (::stat(filePath.c_str(), &fileInfo) == 0)
-        if (!S_ISFIFO(fileInfo.st_mode)) //skip named pipes: else gdk_pixbuf_get_file_info() would hang forever!
-        {
-            gint width  = 0;
-            gint height = 0;
-            if (/*GdkPixbufFormat* fmt =*/ ::gdk_pixbuf_get_file_info(filePath.c_str(), &width, &height))
-                if (width > 0 && height > 0 && pixelSize > 0)
-                {
-                    int trgWidth  = width;
-                    int trgHeight = height;
-
-                    const int maxExtent = std::max(width, height); //don't stretch small images, shrink large ones only!
-                    if (pixelSize < maxExtent)
+    try
+    {
+        struct ::stat fileInfo = {};
+        if (::stat(filePath.c_str(), &fileInfo) == 0)
+            if (!S_ISFIFO(fileInfo.st_mode)) //skip named pipes: else gdk_pixbuf_get_file_info() would hang forever!
+            {
+                gint width  = 0;
+                gint height = 0;
+                if (/*GdkPixbufFormat* fmt =*/ ::gdk_pixbuf_get_file_info(filePath.c_str(), &width, &height))
+                    if (width > 0 && height > 0 && pixelSize > 0)
                     {
-                        trgWidth  = width  * pixelSize / maxExtent;
-                        trgHeight = height * pixelSize / maxExtent;
+                        int trgWidth  = width;
+                        int trgHeight = height;
+
+                        const int maxExtent = std::max(width, height); //don't stretch small images, shrink large ones only!
+                        if (pixelSize < maxExtent)
+                        {
+                            trgWidth  = width  * pixelSize / maxExtent;
+                            trgHeight = height * pixelSize / maxExtent;
+                        }
+                        if (GdkPixbuf* pixBuf = ::gdk_pixbuf_new_from_file_at_size(filePath.c_str(), trgWidth, trgHeight, nullptr))
+                        {
+                            ZEN_ON_SCOPE_EXIT(::g_object_unref(pixBuf));
+                            return copyToImageHolder(pixBuf);
+                        }
                     }
-                    if (GdkPixbuf* pixBuf = ::gdk_pixbuf_new_from_file_at_size(filePath.c_str(), trgWidth, trgHeight, nullptr))
-                    {
-                        ZEN_ON_SCOPE_EXIT(::g_object_unref(pixBuf));
-                        return copyToImageHolder(pixBuf);
-                    }
-                }
-        }
+            }
+
+    }
+    catch (SysError&) { assert(false); }
 
     return ImageHolder();
 }
diff --git a/FreeFileSync/Source/base/localization.cpp b/FreeFileSync/Source/base/localization.cpp
index 8dcfc0ee..06083e31 100644
--- a/FreeFileSync/Source/base/localization.cpp
+++ b/FreeFileSync/Source/base/localization.cpp
@@ -420,7 +420,10 @@ public:
         const bool sysLangIsRTL      = sysLngInfo ? sysLngInfo->LayoutDirection == wxLayout_RightToLeft : false;
         const bool selectedLangIsRTL = selLngInfo ? selLngInfo->LayoutDirection == wxLayout_RightToLeft : false;
 
-        wxLogNull dummy; //rather than implementing a reasonable error handling wxWidgets decides to shows a modal dialog in wxLocale::Init -> at least we can shut it up!
+        //wxWidgets shows a modal dialog on error during wxLocale::Init -> at least we can shut it up!
+        wxLog* oldLogTarget = wxLog::SetActiveTarget(new wxLogStderr); //transfer and receive ownership!
+        ZEN_ON_SCOPE_EXIT(delete wxLog::SetActiveTarget(oldLogTarget));
+
         if (sysLangIsRTL == selectedLangIsRTL)
             locale_->Init(wxLANGUAGE_DEFAULT); //use sys-lang to preserve sub-language specific rules (e.g. german swiss number punctuation)
         else
diff --git a/FreeFileSync/Source/base/generate_logfile.cpp b/FreeFileSync/Source/base/log_file.cpp
index 33fc7739..5538880f 100644
--- a/FreeFileSync/Source/base/generate_logfile.cpp
+++ b/FreeFileSync/Source/base/log_file.cpp
@@ -4,7 +4,7 @@
 // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
 // *****************************************************************************
 
-#include "generate_logfile.h"
+#include "log_file.h"
 #include <zen/file_io.h>
 #include <wx/datetime.h>
 #include "ffs_paths.h"
@@ -144,13 +144,13 @@ AbstractPath saveNewLogFile(const ProcessSummary& summary, //throw FileError
     {
         switch (summary.finalStatus)
         {
-            case SyncResult::FINISHED_WITH_SUCCESS:
+            case SyncResult::finishedSuccess:
                 break;
-            case SyncResult::FINISHED_WITH_WARNINGS:
+            case SyncResult::finishedWarning:
                 return _("Warning");
-            case SyncResult::FINISHED_WITH_ERROR:
+            case SyncResult::finishedError:
                 return _("Error");
-            case SyncResult::ABORTED:
+            case SyncResult::aborted:
                 return _("Stopped");
         }
         return std::wstring();
diff --git a/FreeFileSync/Source/base/generate_logfile.h b/FreeFileSync/Source/base/log_file.h
index 52cc7780..52cc7780 100644
--- a/FreeFileSync/Source/base/generate_logfile.h
+++ b/FreeFileSync/Source/base/log_file.h
diff --git a/FreeFileSync/Source/base/parse_plural.h b/FreeFileSync/Source/base/parse_plural.h
index 7d4971b0..770e4947 100644
--- a/FreeFileSync/Source/base/parse_plural.h
+++ b/FreeFileSync/Source/base/parse_plural.h
@@ -66,7 +66,7 @@ private:
 
 //--------------------------- implementation ---------------------------
 
-//http://www.gnu.org/software/hello/manual/gettext/Plural-forms.html
+//https://www.gnu.org/software/hello/manual/gettext/Plural-forms.html
 //http://translate.sourceforge.net/wiki/l10n/pluralforms
 /*
 Grammar for Plural forms parser
diff --git a/FreeFileSync/Source/base/process_callback.h b/FreeFileSync/Source/base/process_callback.h
index bceec7b6..a89f9945 100644
--- a/FreeFileSync/Source/base/process_callback.h
+++ b/FreeFileSync/Source/base/process_callback.h
@@ -75,8 +75,8 @@ struct ProcessCallback
     //error handling:
     enum Response
     {
-        IGNORE_ERROR,
-        RETRY
+        ignoreError,
+        retry
     };
     virtual Response reportError     (const std::wstring& msg, size_t retryNumber) = 0; //throw X;     recoverable error situation
     virtual void     reportFatalError(const std::wstring& msg)                     = 0; //throw X; non-recoverable error situation
diff --git a/FreeFileSync/Source/base/return_codes.h b/FreeFileSync/Source/base/return_codes.h
index 9bbd2b11..a275a1a8 100644
--- a/FreeFileSync/Source/base/return_codes.h
+++ b/FreeFileSync/Source/base/return_codes.h
@@ -15,8 +15,8 @@ namespace fff
 enum FfsReturnCode //as returned after process exit
 {
     FFS_RC_SUCCESS = 0,
-    FFS_RC_FINISHED_WITH_WARNINGS,
-    FFS_RC_FINISHED_WITH_ERRORS,
+    FFS_RC_WARNING,
+    FFS_RC_ERROR,
     FFS_RC_ABORTED,
     FFS_RC_EXCEPTION,
 };
@@ -32,10 +32,10 @@ void raiseReturnCode(FfsReturnCode& rc, FfsReturnCode rcProposed)
 
 enum class SyncResult
 {
-    FINISHED_WITH_SUCCESS,
-    FINISHED_WITH_WARNINGS,
-    FINISHED_WITH_ERROR,
-    ABORTED,
+    finishedSuccess,
+    finishedWarning,
+    finishedError,
+    aborted,
 };
 
 
@@ -44,13 +44,13 @@ FfsReturnCode mapToReturnCode(SyncResult syncStatus)
 {
     switch (syncStatus)
     {
-        case SyncResult::FINISHED_WITH_SUCCESS:
+        case SyncResult::finishedSuccess:
             return FFS_RC_SUCCESS;
-        case SyncResult::FINISHED_WITH_WARNINGS:
-            return FFS_RC_FINISHED_WITH_WARNINGS;
-        case SyncResult::FINISHED_WITH_ERROR:
-            return FFS_RC_FINISHED_WITH_ERRORS;
-        case SyncResult::ABORTED:
+        case SyncResult::finishedWarning:
+            return FFS_RC_WARNING;
+        case SyncResult::finishedError:
+            return FFS_RC_ERROR;
+        case SyncResult::aborted:
             return FFS_RC_ABORTED;
     }
     assert(false);
@@ -63,13 +63,13 @@ std::wstring getFinalStatusLabel(SyncResult finalStatus)
 {
     switch (finalStatus)
     {
-        case SyncResult::FINISHED_WITH_SUCCESS:
+        case SyncResult::finishedSuccess:
             return  _("Completed successfully");
-        case SyncResult::FINISHED_WITH_WARNINGS:
+        case SyncResult::finishedWarning:
             return _("Completed with warnings");
-        case SyncResult::FINISHED_WITH_ERROR:
+        case SyncResult::finishedError:
             return _("Completed with errors");
-        case SyncResult::ABORTED:
+        case SyncResult::aborted:
             return _("Stopped");
     }
     assert(false);
diff --git a/FreeFileSync/Source/base/status_handler.h b/FreeFileSync/Source/base/status_handler.h
index b9857248..561e0cc7 100644
--- a/FreeFileSync/Source/base/status_handler.h
+++ b/FreeFileSync/Source/base/status_handler.h
@@ -72,7 +72,7 @@ struct Statistics
 struct ProcessSummary
 {
     std::chrono::system_clock::time_point startTime;
-    SyncResult finalStatus = SyncResult::ABORTED;
+    SyncResult finalStatus = SyncResult::aborted;
     std::wstring jobName; //may be empty
     ProgressStats statsProcessed;
     ProgressStats statsTotal;
@@ -84,6 +84,11 @@ struct ProcessSummary
 class StatusHandler : public ProcessCallback, public AbortCallback, public Statistics
 {
 public:
+    StatusHandler()
+    {
+        updateData(statsTotal_, -1, -1);
+    }
+
     //implement parts of ProcessCallback
     void initNewPhase(int itemsTotal, int64_t bytesTotal, Phase phase) override //(throw X)
     {
diff --git a/FreeFileSync/Source/base/status_handler_impl.h b/FreeFileSync/Source/base/status_handler_impl.h
index 3135753c..c3b32ca6 100644
--- a/FreeFileSync/Source/base/status_handler_impl.h
+++ b/FreeFileSync/Source/base/status_handler_impl.h
@@ -362,9 +362,9 @@ std::wstring tryReportingError(Function cmd /*throw FileError*/, Callback& cb /*
             assert(!e.toString().empty());
             switch (cb.reportError(e.toString(), retryNumber)) //throw X
             {
-                case ProcessCallback::IGNORE_ERROR:
+                case ProcessCallback::ignoreError:
                     return e.toString();
-                case ProcessCallback::RETRY:
+                case ProcessCallback::retry:
                     break; //continue with loop
             }
         }
diff --git a/FreeFileSync/Source/base/synchronization.cpp b/FreeFileSync/Source/base/synchronization.cpp
index fc13c8ca..bd407296 100644
--- a/FreeFileSync/Source/base/synchronization.cpp
+++ b/FreeFileSync/Source/base/synchronization.cpp
@@ -2454,7 +2454,7 @@ void fff::synchronize(const std::chrono::system_clock::time_point& syncStartTime
         if (!dependentFolders.empty())
         {
             std::wstring msg = _("Some files will be synchronized as part of multiple base folders.") + L"\n" +
-                               _("To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.") + L"\n";
+                               _("To avoid conflicts, set up exclude filters so that each updated file is included by only one base folder.") + L"\n";
 
             for (const AbstractPath& baseFolderPath : dependentFolders)
                 msg += L"\n" + AFS::getDisplayPath(baseFolderPath);
@@ -2553,7 +2553,7 @@ void fff::synchronize(const std::chrono::system_clock::time_point& syncStartTime
                 try
                 {
                     if (folderPairCfg.saveSyncDB)
-                        saveLastSynchronousState(baseFolder, //throw FileError
+                        saveLastSynchronousState(baseFolder, failSafeFileCopy, //throw FileError
                         [&](const std::wstring& statusMsg) { try { callback.reportStatus(statusMsg); /*throw X*/} catch (...) {}});
                 }
                 catch (FileError&) {}
@@ -2650,7 +2650,7 @@ void fff::synchronize(const std::chrono::system_clock::time_point& syncStartTime
 
                 tryReportingError([&]
                 {
-                    saveLastSynchronousState(baseFolder, //throw FileError, X
+                    saveLastSynchronousState(baseFolder, failSafeFileCopy, //throw FileError, X
                     [&](const std::wstring& statusMsg) { callback.reportStatus(statusMsg); /*throw X*/});
                 }, callback); //throw X
 
diff --git a/FreeFileSync/Source/base/versioning.cpp b/FreeFileSync/Source/base/versioning.cpp
index dca988f1..1a2bf050 100644
--- a/FreeFileSync/Source/base/versioning.cpp
+++ b/FreeFileSync/Source/base/versioning.cpp
@@ -443,10 +443,10 @@ void fff::applyVersioningLimit(const std::set<VersioningLimitFolder>& folderLimi
     {
         switch (callback.reportError(msg, retryNumber)) //throw X
         {
-            case ProcessCallback::IGNORE_ERROR:
+            case ProcessCallback::ignoreError:
                 return AFS::TraverserCallback::ON_ERROR_CONTINUE;
 
-            case ProcessCallback::RETRY:
+            case ProcessCallback::retry:
                 return AFS::TraverserCallback::ON_ERROR_RETRY;
         }
         assert(false);
diff --git a/FreeFileSync/Source/ui/abstract_folder_picker.cpp b/FreeFileSync/Source/ui/abstract_folder_picker.cpp
index 5b336a02..fffb5e73 100644
--- a/FreeFileSync/Source/ui/abstract_folder_picker.cpp
+++ b/FreeFileSync/Source/ui/abstract_folder_picker.cpp
@@ -122,7 +122,7 @@ AbstractFolderPickerDlg::AbstractFolderPickerDlg(wxWindow* parent, AbstractPath&
         {
             findAndNavigateToExistingPath(*AFS::getParentPath(folderPath)); //let's run async while the error message is shown :)
 
-            showNotificationDialog(parent /*"this" not yet shown!*/, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+            showNotificationDialog(parent /*"this" not yet shown!*/, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
         }
 
     //----------------------------------------------------------------------
@@ -234,7 +234,7 @@ void AbstractFolderPickerDlg::populateNodeThen(const wxTreeItemId& itemId, const
                             itemData2->errorMsg = result.errorMsg;
 
                             if (popupErrors)
-                                showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(result.errorMsg));
+                                showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(result.errorMsg));
                         }
 
                         itemData2->loadStatus = NodeLoadStatus::loaded; //set status *before* running callbacks
diff --git a/FreeFileSync/Source/ui/batch_config.cpp b/FreeFileSync/Source/ui/batch_config.cpp
index e0b248de..8240eed9 100644
--- a/FreeFileSync/Source/ui/batch_config.cpp
+++ b/FreeFileSync/Source/ui/batch_config.cpp
@@ -70,15 +70,15 @@ BatchDialog::BatchDialog(wxWindow* parent, BatchDialogConfig& dlgCfg) :
 {
     setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonSaveAs).setCancel(m_buttonCancel));
 
-    m_staticTextHeader->SetLabel(replaceCpy(m_staticTextHeader->GetLabel(), L"%x", L"FreeFileSync.exe <" + _("job name") + L">.ffs_batch"));
+    m_staticTextHeader->SetLabel(replaceCpy(m_staticTextHeader->GetLabel(), L"%x", L"FreeFileSync.exe <" + _("configuration file") + L">.ffs_batch"));
     m_staticTextHeader->Wrap(fastFromDIP(520));
 
     m_bitmapBatchJob->SetBitmap(getResourceImage(L"file_batch"));
 
     enumPostSyncAction_.
-    add(PostSyncAction::NONE,     L"").
-    add(PostSyncAction::SLEEP,    _("System: Sleep")).
-    add(PostSyncAction::SHUTDOWN, _("System: Shut down"));
+    add(PostSyncAction::none,     L"").
+    add(PostSyncAction::sleep,    _("System: Sleep")).
+    add(PostSyncAction::shutdown, _("System: Shut down"));
 
     setConfig(dlgCfg);
 
@@ -117,10 +117,10 @@ void BatchDialog::setConfig(const BatchDialogConfig& dlgCfg)
 
     switch (dlgCfg.batchExCfg.batchErrorHandling)
     {
-        case BatchErrorHandling::SHOW_POPUP:
+        case BatchErrorHandling::showPopup:
             m_radioBtnErrorDialogShow->SetValue(true);
             break;
-        case BatchErrorHandling::CANCEL:
+        case BatchErrorHandling::cancel:
             m_radioBtnErrorDialogCancel->SetValue(true);
             break;
     }
@@ -139,7 +139,7 @@ BatchDialogConfig BatchDialog::getConfig() const
 
     dlgCfg.ignoreErrors = m_checkBoxIgnoreErrors->GetValue();
 
-    dlgCfg.batchExCfg.batchErrorHandling  = m_radioBtnErrorDialogCancel->GetValue() ? BatchErrorHandling::CANCEL : BatchErrorHandling::SHOW_POPUP;
+    dlgCfg.batchExCfg.batchErrorHandling  = m_radioBtnErrorDialogCancel->GetValue() ? BatchErrorHandling::cancel : BatchErrorHandling::showPopup;
     dlgCfg.batchExCfg.runMinimized        = m_checkBoxRunMinimized->GetValue();
     dlgCfg.batchExCfg.autoCloseSummary    = m_checkBoxAutoClose   ->GetValue();
     dlgCfg.batchExCfg.postSyncAction = getEnumVal(enumPostSyncAction_, *m_choicePostSyncAction);
diff --git a/FreeFileSync/Source/ui/batch_status_handler.cpp b/FreeFileSync/Source/ui/batch_status_handler.cpp
index ddec33ec..cf2b249f 100644
--- a/FreeFileSync/Source/ui/batch_status_handler.cpp
+++ b/FreeFileSync/Source/ui/batch_status_handler.cpp
@@ -10,7 +10,7 @@
 #include <wx+/popup_dlg.h>
 #include <wx/app.h>
 #include "../base/resolve_path.h"
-#include "../base/generate_logfile.h"
+#include "../base/log_file.h"
 #include "../afs/concrete.h"
 
 using namespace zen;
@@ -32,20 +32,20 @@ BatchStatusHandler::BatchStatusHandler(bool showProgress,
     batchErrorHandling_(batchErrorHandling),
     automaticRetryCount_(automaticRetryCount),
     automaticRetryDelay_(automaticRetryDelay),
-    progressDlg_(createProgressDialog(*this, [this] { this->onProgressDialogTerminate(); }, *this, nullptr /*parentWindow*/, showProgress, autoCloseDialog,
+    progressDlg_(SyncProgressDialog::create([this] { userRequestAbort(); }, *this, nullptr /*parentWindow*/, showProgress, autoCloseDialog,
 startTime, jobName, soundFileSyncComplete, ignoreErrors, automaticRetryCount, [&]
 {
     switch (postSyncAction)
     {
-        case PostSyncAction::NONE:
-            return PostSyncAction2::NONE;
-        case PostSyncAction::SLEEP:
-            return PostSyncAction2::SLEEP;
-        case PostSyncAction::SHUTDOWN:
-            return PostSyncAction2::SHUTDOWN;
+        case PostSyncAction::none:
+            return PostSyncAction2::none;
+        case PostSyncAction::sleep:
+            return PostSyncAction2::sleep;
+        case PostSyncAction::shutdown:
+            return PostSyncAction2::shutdown;
     }
     assert(false);
-    return PostSyncAction2::NONE;
+    return PostSyncAction2::none;
 }())),
 jobName_(jobName),
          startTime_(startTime),
@@ -68,7 +68,7 @@ BatchStatusHandler::Result BatchStatusHandler::reportFinalStatus(const Zstring&
 {
     const auto totalTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - startTime_);
 
-    if (progressDlg_) progressDlg_->timerSetStatus(false /*active*/); //keep correct summary window stats considering count down timer, system sleep
+    progressDlg_->timerSetStatus(false /*active*/); //keep correct summary window stats considering count down timer, system sleep
 
     //determine post-sync status irrespective of further errors during tear-down
     const SyncResult finalStatus = [&]
@@ -76,19 +76,19 @@ BatchStatusHandler::Result BatchStatusHandler::reportFinalStatus(const Zstring&
         if (getAbortStatus())
         {
             errorLog_.logMsg(_("Stopped"), MSG_TYPE_ERROR); //= user cancel; *not* a MSG_TYPE_FATAL_ERROR!
-            return SyncResult::ABORTED;
+            return SyncResult::aborted;
         }
         else if (errorLog_.getItemCount(MSG_TYPE_ERROR | MSG_TYPE_FATAL_ERROR) > 0)
-            return SyncResult::FINISHED_WITH_ERROR;
+            return SyncResult::finishedError;
         else if (errorLog_.getItemCount(MSG_TYPE_WARNING) > 0)
-            return SyncResult::FINISHED_WITH_WARNINGS;
+            return SyncResult::finishedWarning;
 
         if (getStatsTotal(currentPhase()) == ProgressStats())
             errorLog_.logMsg(_("Nothing to synchronize"), MSG_TYPE_INFO);
-        return SyncResult::FINISHED_WITH_SUCCESS;
+        return SyncResult::finishedSuccess;
     }();
 
-    assert(finalStatus == SyncResult::ABORTED || currentPhase() == PHASE_SYNCHRONIZING);
+    assert(finalStatus == SyncResult::aborted || currentPhase() == PHASE_SYNCHRONIZING);
 
     const ProcessSummary summary
     {
@@ -109,13 +109,13 @@ BatchStatusHandler::Result BatchStatusHandler::reportFinalStatus(const Zstring&
                 case PostSyncCondition::COMPLETION:
                     return postSyncCommand_;
                 case PostSyncCondition::ERRORS:
-                    if (finalStatus == SyncResult::ABORTED ||
-                        finalStatus == SyncResult::FINISHED_WITH_ERROR)
+                    if (finalStatus == SyncResult::aborted ||
+                        finalStatus == SyncResult::finishedError)
                         return postSyncCommand_;
                     break;
                 case PostSyncCondition::SUCCESS:
-                    if (finalStatus == SyncResult::FINISHED_WITH_WARNINGS ||
-                        finalStatus == SyncResult::FINISHED_WITH_SUCCESS)
+                    if (finalStatus == SyncResult::finishedWarning ||
+                        finalStatus == SyncResult::finishedSuccess)
                         return postSyncCommand_;
                     break;
             }
@@ -150,103 +150,83 @@ BatchStatusHandler::Result BatchStatusHandler::reportFinalStatus(const Zstring&
         }
         catch (const FileError& e) { errorLog_.logMsg(e.toString(), MSG_TYPE_ERROR); }
 
-    if (progressDlg_)
-    {
-        //post sync action
-        bool autoClose = false;
-        FinalRequest finalRequest = FinalRequest::none;
+    //post sync action
+    bool autoClose = false;
+    FinalRequest finalRequest = FinalRequest::none;
 
-        if (getAbortStatus() && *getAbortStatus() == AbortTrigger::USER)
-            ; //user cancelled => don't run post sync command!
-        else
+    if (getAbortStatus() && *getAbortStatus() == AbortTrigger::USER)
+        ; //user cancelled => don't run post sync command!
+    else
+    {
+        auto mayRunAfterCountDown = [&](const std::wstring& operationName)
         {
-            auto mayRunAfterCountDown = [&](const std::wstring& operationName)
+            auto notifyStatusThrowOnCancel = [&](const std::wstring& msg)
             {
-                auto notifyStatusThrowOnCancel = [&](const std::wstring& msg)
+                try { reportStatus(msg); /*throw AbortProcess*/ }
+                catch (...)
                 {
-                    try { reportStatus(msg); /*throw AbortProcess*/ }
-                    catch (...)
-                    {
-                        if (getAbortStatus() && *getAbortStatus() == AbortTrigger::USER)
-                            throw;
-                    }
-                };
-
-                if (progressDlg_->getWindowIfVisible())
-                    try
-                    {
-                        delayAndCountDown(operationName, std::chrono::seconds(5), notifyStatusThrowOnCancel); //throw AbortProcess
-                    }
-                    catch (...) { return false; }
-
-                return true;
+                    if (getAbortStatus() && *getAbortStatus() == AbortTrigger::USER)
+                        throw;
+                }
             };
 
-            switch (progressDlg_->getOptionPostSyncAction())
-            {
-                case PostSyncAction2::NONE:
-                    autoClose = progressDlg_->getOptionAutoCloseDialog();
-                    break;
-                case PostSyncAction2::EXIT:
-                    assert(false);
-                    break;
-                case PostSyncAction2::SLEEP:
-                    if (mayRunAfterCountDown(_("System: Sleep")))
-                        try
-                        {
-                            suspendSystem(); //throw FileError
-                            autoClose = progressDlg_->getOptionAutoCloseDialog();
-                        }
-                        catch (const FileError& e) { errorLog_.logMsg(e.toString(), MSG_TYPE_ERROR); }
-                    break;
-                case PostSyncAction2::SHUTDOWN:
-                    if (mayRunAfterCountDown(_("System: Shut down")))
-                    {
-                        autoClose = true;
-                        finalRequest = FinalRequest::shutdown; //system shutdown must be handled by calling context!
-                    }
-                    break;
-            }
-        }
-        if (switchToGuiRequested_) //-> avoid recursive yield() calls, thous switch not before ending batch mode
-        {
-            autoClose = true;
-            finalRequest = FinalRequest::switchGui;
-        }
+            if (progressDlg_->getWindowIfVisible())
+                try
+                {
+                    delayAndCountDown(operationName, std::chrono::seconds(5), notifyStatusThrowOnCancel); //throw AbortProcess
+                }
+                catch (...) { return false; }
 
-        auto errorLogFinal = std::make_shared<const ErrorLog>(std::move(errorLog_));
+            return true;
+        };
 
-        //close progress dialog
-        if (autoClose) //warning: wxWindow::Show() is called within showSummary()!
-            progressDlg_->closeDirectly(true /*restoreParentFrame: n/a here*/); //progressDlg_ is main window => program will quit shortly after
-        else
-            //notify about (logical) application main window => program won't quit, but stay on this dialog
-            //setMainWindow(progressDlg_->getAsWindow()); -> not required anymore since we block waiting until dialog is closed below
-            progressDlg_->showSummary(finalStatus, errorLogFinal);
-
-        //wait until progress dialog notified shutdown via onProgressDialogTerminate()
-        //-> required since it has our "this" pointer captured in lambda "notifyWindowTerminate"!
-        //-> nicely manages dialog lifetime
-        for (;;)
+        switch (progressDlg_->getOptionPostSyncAction())
         {
-            wxTheApp->Yield(); //*first* refresh GUI (removing flicker) before sleeping!
-            if (!progressDlg_) break;
-            std::this_thread::sleep_for(UI_UPDATE_INTERVAL);
+            case PostSyncAction2::none:
+                autoClose = progressDlg_->getOptionAutoCloseDialog();
+                break;
+            case PostSyncAction2::exit:
+                assert(false);
+                break;
+            case PostSyncAction2::sleep:
+                if (mayRunAfterCountDown(_("System: Sleep")))
+                    try
+                    {
+                        suspendSystem(); //throw FileError
+                        autoClose = progressDlg_->getOptionAutoCloseDialog();
+                    }
+                    catch (const FileError& e) { errorLog_.logMsg(e.toString(), MSG_TYPE_ERROR); }
+                break;
+            case PostSyncAction2::shutdown:
+                if (mayRunAfterCountDown(_("System: Shut down")))
+                {
+                    autoClose = true;
+                    finalRequest = FinalRequest::shutdown; //system shutdown must be handled by calling context!
+                }
+                break;
         }
-
-        return { finalStatus, finalRequest, logFilePath };
     }
-    else
-        return { finalStatus, FinalRequest::none, logFilePath };
+    if (switchToGuiRequested_) //-> avoid recursive yield() calls, thous switch not before ending batch mode
+    {
+        autoClose = true;
+        finalRequest = FinalRequest::switchGui;
+    }
+
+    auto errorLogFinal = std::make_shared<const ErrorLog>(std::move(errorLog_));
 
+    progressDlg_->destroy(autoClose,
+                          true /*restoreParentFrame: n/a here*/,
+                          finalStatus, errorLogFinal);
+    progressDlg_ = nullptr;
 
+    return { finalStatus, finalRequest, logFilePath };
 }
 
 
 void BatchStatusHandler::initNewPhase(int itemsTotal, int64_t bytesTotal, ProcessCallback::Phase phaseID)
 {
     StatusHandler::initNewPhase(itemsTotal, bytesTotal, phaseID);
-    if (progressDlg_) progressDlg_->initNewPhase(); //call after "StatusHandler::initNewPhase"
+    progressDlg_->initNewPhase(); //call after "StatusHandler::initNewPhase"
 
     forceUiRefresh(); //throw AbortProcess; OS X needs a full yield to update GUI and get rid of "dummy" texts
 }
@@ -257,7 +237,7 @@ void BatchStatusHandler::updateDataProcessed(int itemsDelta, int64_t bytesDelta)
     StatusHandler::updateDataProcessed(itemsDelta, bytesDelta);
 
     //note: this method should NOT throw in order to properly allow undoing setting of statistics!
-    if (progressDlg_) progressDlg_->notifyProgressChange(); //noexcept
+    progressDlg_->notifyProgressChange(); //noexcept
     //for "curveDataBytes_->addRecord()"
 }
 
@@ -270,7 +250,6 @@ void BatchStatusHandler::logInfo(const std::wstring& msg)
 
 void BatchStatusHandler::reportWarning(const std::wstring& msg, bool& warningActive)
 {
-    if (!progressDlg_) abortProcessNow(); //throw AbortProcess
     PauseTimers dummy(*progressDlg_);
 
     errorLog_.logMsg(msg, MSG_TYPE_WARNING);
@@ -281,34 +260,33 @@ void BatchStatusHandler::reportWarning(const std::wstring& msg, bool& warningAct
     if (!progressDlg_->getOptionIgnoreErrors())
         switch (batchErrorHandling_)
         {
-            case BatchErrorHandling::SHOW_POPUP:
+            case BatchErrorHandling::showPopup:
             {
                 forceUiRefreshNoThrow(); //noexcept! => don't throw here when error occurs during clean up!
 
-                if (!progressDlg_) abortProcessNow(); //throw AbortProcess
                 bool dontWarnAgain = false;
-                switch (showQuestionDialog(progressDlg_->getWindowIfVisible(), DialogInfoType::WARNING,
+                switch (showQuestionDialog(progressDlg_->getWindowIfVisible(), DialogInfoType::warning,
                                            PopupDialogCfg().setDetailInstructions(msg + L"\n\n" + _("You can switch to FreeFileSync's main window to resolve this issue.")).
-                                           setCheckBox(dontWarnAgain, _("&Don't show this warning again"), QuestionButton2::NO),
+                                           setCheckBox(dontWarnAgain, _("&Don't show this warning again"), QuestionButton2::no),
                                            _("&Ignore"), _("&Switch")))
                 {
-                    case QuestionButton2::YES: //ignore
+                    case QuestionButton2::yes: //ignore
                         warningActive = !dontWarnAgain;
                         break;
 
-                    case QuestionButton2::NO: //switch
+                    case QuestionButton2::no: //switch
                         errorLog_.logMsg(_("Switching to FreeFileSync's main window"), MSG_TYPE_INFO);
                         switchToGuiRequested_ = true; //treat as a special kind of cancel
                         userAbortProcessNow(); //throw AbortProcess
 
-                    case QuestionButton2::CANCEL:
+                    case QuestionButton2::cancel:
                         userAbortProcessNow(); //throw AbortProcess
                         break;
                 }
             }
             break; //keep it! last switch might not find match
 
-            case BatchErrorHandling::CANCEL:
+            case BatchErrorHandling::cancel:
                 abortProcessNow(); //throw AbortProcess (not user-initiated!)
                 break;
         }
@@ -317,7 +295,6 @@ void BatchStatusHandler::reportWarning(const std::wstring& msg, bool& warningAct
 
 ProcessCallback::Response BatchStatusHandler::reportError(const std::wstring& msg, size_t retryNumber)
 {
-    if (!progressDlg_) abortProcessNow(); //throw AbortProcess
     PauseTimers dummy(*progressDlg_);
 
     //auto-retry
@@ -326,7 +303,7 @@ ProcessCallback::Response BatchStatusHandler::reportError(const std::wstring& ms
         errorLog_.logMsg(msg + L"\n-> " + _("Automatic retry"), MSG_TYPE_INFO);
         delayAndCountDown(_("Automatic retry") + (automaticRetryCount_ <= 1 ? L"" :  L" " + numberTo<std::wstring>(retryNumber + 1) + L"/" + numberTo<std::wstring>(automaticRetryCount_)),
         automaticRetryDelay_, [&](const std::wstring& statusMsg) { this->reportStatus(_("Error") + L": " + statusMsg); }); //throw AbortProcess
-        return ProcessCallback::RETRY;
+        return ProcessCallback::retry;
     }
 
     //always, except for "retry":
@@ -336,50 +313,48 @@ ProcessCallback::Response BatchStatusHandler::reportError(const std::wstring& ms
     {
         switch (batchErrorHandling_)
         {
-            case BatchErrorHandling::SHOW_POPUP:
+            case BatchErrorHandling::showPopup:
             {
                 forceUiRefreshNoThrow(); //noexcept! => don't throw here when error occurs during clean up!
 
-                if (!progressDlg_) abortProcessNow(); //throw AbortProcess
-                switch (showConfirmationDialog(progressDlg_->getWindowIfVisible(), DialogInfoType::ERROR2,
+                switch (showConfirmationDialog(progressDlg_->getWindowIfVisible(), DialogInfoType::error,
                                                PopupDialogCfg().setDetailInstructions(msg),
                                                _("&Ignore"), _("Ignore &all"), _("&Retry")))
                 {
-                    case ConfirmationButton3::ACCEPT: //ignore
-                        return ProcessCallback::IGNORE_ERROR;
+                    case ConfirmationButton3::accept: //ignore
+                        return ProcessCallback::ignoreError;
 
-                    case ConfirmationButton3::ACCEPT_ALL: //ignore all
+                    case ConfirmationButton3::acceptAll: //ignore all
                         progressDlg_->setOptionIgnoreErrors(true);
-                        return ProcessCallback::IGNORE_ERROR;
+                        return ProcessCallback::ignoreError;
 
-                    case ConfirmationButton3::DECLINE: //retry
+                    case ConfirmationButton3::decline: //retry
                         guardWriteLog.dismiss();
                         errorLog_.logMsg(msg + L"\n-> " + _("Retrying operation..."), MSG_TYPE_INFO);
-                        return ProcessCallback::RETRY;
+                        return ProcessCallback::retry;
 
-                    case ConfirmationButton3::CANCEL:
+                    case ConfirmationButton3::cancel:
                         userAbortProcessNow(); //throw AbortProcess
                         break;
                 }
             }
             break; //used if last switch didn't find a match
 
-            case BatchErrorHandling::CANCEL:
+            case BatchErrorHandling::cancel:
                 abortProcessNow(); //throw AbortProcess (not user-initiated!)
                 break;
         }
     }
     else
-        return ProcessCallback::IGNORE_ERROR;
+        return ProcessCallback::ignoreError;
 
     assert(false);
-    return ProcessCallback::IGNORE_ERROR; //dummy value
+    return ProcessCallback::ignoreError; //dummy value
 }
 
 
 void BatchStatusHandler::reportFatalError(const std::wstring& msg)
 {
-    if (!progressDlg_) abortProcessNow(); //throw AbortProcess
     PauseTimers dummy(*progressDlg_);
 
     errorLog_.logMsg(msg, MSG_TYPE_FATAL_ERROR);
@@ -387,31 +362,30 @@ void BatchStatusHandler::reportFatalError(const std::wstring& msg)
     if (!progressDlg_->getOptionIgnoreErrors())
         switch (batchErrorHandling_)
         {
-            case BatchErrorHandling::SHOW_POPUP:
+            case BatchErrorHandling::showPopup:
             {
                 forceUiRefreshNoThrow(); //noexcept! => don't throw here when error occurs during clean up!
 
-                if (!progressDlg_) abortProcessNow(); //throw AbortProcess
-                switch (showConfirmationDialog(progressDlg_->getWindowIfVisible(), DialogInfoType::ERROR2,
+                switch (showConfirmationDialog(progressDlg_->getWindowIfVisible(), DialogInfoType::error,
                                                PopupDialogCfg().setTitle(_("Serious Error")).
                                                setDetailInstructions(msg),
                                                _("&Ignore"), _("Ignore &all")))
                 {
-                    case ConfirmationButton2::ACCEPT:
+                    case ConfirmationButton2::accept:
                         break;
 
-                    case ConfirmationButton2::ACCEPT_ALL:
+                    case ConfirmationButton2::acceptAll:
                         progressDlg_->setOptionIgnoreErrors(true);
                         break;
 
-                    case ConfirmationButton2::CANCEL:
+                    case ConfirmationButton2::cancel:
                         userAbortProcessNow(); //throw AbortProcess
                         break;
                 }
             }
             break;
 
-            case BatchErrorHandling::CANCEL:
+            case BatchErrorHandling::cancel:
                 abortProcessNow(); //throw AbortProcess (not user-initiated!)
                 break;
         }
@@ -420,12 +394,5 @@ void BatchStatusHandler::reportFatalError(const std::wstring& msg)
 
 void BatchStatusHandler::forceUiRefreshNoThrow()
 {
-    if (progressDlg_)
-        progressDlg_->updateGui();
-}
-
-
-void BatchStatusHandler::onProgressDialogTerminate()
-{
-    progressDlg_ = nullptr;
+    progressDlg_->updateGui();
 }
diff --git a/FreeFileSync/Source/ui/batch_status_handler.h b/FreeFileSync/Source/ui/batch_status_handler.h
index b8b8e25d..d3bee240 100644
--- a/FreeFileSync/Source/ui/batch_status_handler.h
+++ b/FreeFileSync/Source/ui/batch_status_handler.h
@@ -58,21 +58,14 @@ public:
     Result reportFinalStatus(const Zstring& altLogFolderPathPhrase, int logfilesMaxAgeDays, const std::set<AbstractPath>& logFilePathsToKeep); //noexcept!!
 
 private:
-    void onProgressDialogTerminate();
-
     bool switchToGuiRequested_ = false;
-
     const BatchErrorHandling batchErrorHandling_;
     zen::ErrorLog errorLog_; //list of non-resolved errors and warnings
-
     const size_t automaticRetryCount_;
     const std::chrono::seconds automaticRetryDelay_;
-
-    SyncProgressDialog* progressDlg_; //managed to have shorter lifetime than this handler!
-
+    SyncProgressDialog* progressDlg_; //managed to have the same lifetime as this handler!
     const std::wstring jobName_;
     const std::chrono::system_clock::time_point startTime_;
-
     const Zstring postSyncCommand_;
     const PostSyncCondition postSyncCondition_;
 };
diff --git a/FreeFileSync/Source/ui/cfg_grid.cpp b/FreeFileSync/Source/ui/cfg_grid.cpp
index 5f368aca..dfceed07 100644
--- a/FreeFileSync/Source/ui/cfg_grid.cpp
+++ b/FreeFileSync/Source/ui/cfg_grid.cpp
@@ -129,7 +129,7 @@ void ConfigView::setLastRunStats(const std::vector<Zstring>& filePaths, const La
         assert(it != cfgList_.end());
         if (it != cfgList_.end())
         {
-            if (lastRun.result != SyncResult::ABORTED)
+            if (lastRun.result != SyncResult::aborted)
                 it->second.cfgItem.lastSyncTime = lastRun.lastRunTime;
 
             if (!AFS::isNullPath(lastRun.logFilePath))
@@ -367,12 +367,12 @@ private:
                         {
                             switch (item->cfgItem.logResult)
                             {
-                                case SyncResult::FINISHED_WITH_SUCCESS:
+                                case SyncResult::finishedSuccess:
                                     return getResourceImage(L"msg_finished_sicon");
-                                case SyncResult::FINISHED_WITH_WARNINGS:
+                                case SyncResult::finishedWarning:
                                     return getResourceImage(L"msg_warning_sicon");
-                                case SyncResult::FINISHED_WITH_ERROR:
-                                case SyncResult::ABORTED:
+                                case SyncResult::finishedError:
+                                case SyncResult::aborted:
                                     return getResourceImage(L"msg_error_sicon");
                             }
                             assert(false);
@@ -529,7 +529,7 @@ private:
                             assert(false);
                         assert(!AFS::isNullPath(item->cfgItem.logFilePath)); //see getRowMouseHover()
                     }
-                    catch (const FileError& e) { showNotificationDialog(&grid_, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString())); }
+                    catch (const FileError& e) { showNotificationDialog(&grid_, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString())); }
                     return;
             }
         event.Skip();
diff --git a/FreeFileSync/Source/ui/cfg_grid.h b/FreeFileSync/Source/ui/cfg_grid.h
index e23ef887..628c5400 100644
--- a/FreeFileSync/Source/ui/cfg_grid.h
+++ b/FreeFileSync/Source/ui/cfg_grid.h
@@ -31,7 +31,7 @@ struct ConfigFileItem
     Zstring    cfgFilePath;
     time_t     lastSyncTime = 0;  //last COMPLETED sync (aborted syncs don't count)
     AbstractPath logFilePath = getNullPath();     //ANY last sync attempt (including aborted syncs)
-    SyncResult   logResult = SyncResult::ABORTED; //
+    SyncResult   logResult = SyncResult::aborted; //
 };
 
 
@@ -97,7 +97,7 @@ public:
     struct LastRunStats
     {
         time_t       lastRunTime = 0;
-        SyncResult   result = SyncResult::ABORTED;
+        SyncResult   result = SyncResult::aborted;
         AbstractPath logFilePath; //optional
     };
     void setLastRunStats(const std::vector<Zstring>& filePaths, const LastRunStats& lastRun);
diff --git a/FreeFileSync/Source/ui/command_box.cpp b/FreeFileSync/Source/ui/command_box.cpp
index 2ef53a51..6e769bb7 100644
--- a/FreeFileSync/Source/ui/command_box.cpp
+++ b/FreeFileSync/Source/ui/command_box.cpp
@@ -19,10 +19,10 @@ using namespace fff;
 namespace
 {
 inline
-std::wstring getSeparationLine() { return std::wstring(50, EM_DASH); } //no space between dashes!
+wxString getSeparationLine() { return std::wstring(50, EM_DASH); } //no space between dashes!
 
 
-std::vector<std::pair<std::wstring, Zstring>> getDefaultCommands() //(description/command) pairs
+std::vector<std::pair<wxString, Zstring>> getDefaultCommands() //(description/command) pairs
 {
     return
     {
@@ -31,7 +31,7 @@ std::vector<std::pair<std::wstring, Zstring>> getDefaultCommands() //(descriptio
 }
 
 
-const wxEventType wxEVT_VALIDATE_USER_SELECTION = wxNewEventType();
+const wxEventType EVENT_VALIDATE_USER_SELECTION = wxNewEventType();
 }
 
 
@@ -57,7 +57,7 @@ CommandBox::CommandBox(wxWindow* parent,
     Connect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(CommandBox::OnSelection ), nullptr, this);
     Connect(wxEVT_MOUSEWHEEL,                wxMouseEventHandler  (CommandBox::OnMouseWheel), nullptr, this);
 
-    Connect(wxEVT_VALIDATE_USER_SELECTION, wxCommandEventHandler(CommandBox::OnValidateSelection), nullptr, this);
+    Connect(EVENT_VALIDATE_USER_SELECTION, wxCommandEventHandler(CommandBox::OnValidateSelection), nullptr, this);
 }
 
 
@@ -92,16 +92,16 @@ Zstring CommandBox::getValue() const
 
 void CommandBox::setValue(const Zstring& value)
 {
-    setValueAndUpdateList(trimCpy(utfTo<std::wstring>(value)));
+    setValueAndUpdateList(trimCpy(utfTo<wxString>(value)));
 }
 
 
 //set value and update list are technically entangled: see potential bug description below
-void CommandBox::setValueAndUpdateList(const std::wstring& value)
+void CommandBox::setValueAndUpdateList(const wxString& value)
 {
     //it may be a little lame to update the list on each mouse-button click, but it should be working and we dont't have to manipulate wxComboBox internals
 
-    std::deque<std::wstring> items;
+    std::vector<wxString> items;
 
     //1. built in commands
     for (const auto& [description, cmd] : defaultCommands_)
@@ -115,23 +115,23 @@ void CommandBox::setValueAndUpdateList(const std::wstring& value)
         items.push_back(getSeparationLine());
 
     for (const Zstring& hist : histSorted)
-        items.push_back(utfTo<std::wstring>(hist));
+        items.push_back(utfTo<wxString>(hist));
 
     //attention: if the target value is not part of the dropdown list, SetValue() will look for a string that *starts with* this value:
     //e.g. if the dropdown list contains "222" SetValue("22") will erroneously set and select "222" instead, while "111" would be set correctly!
     // -> by design on Windows!
     if (std::find(items.begin(), items.end(), value) == items.end())
     {
-        if (!value.empty())
-            items.push_front(getSeparationLine());
-        items.push_front(value);
+        if (!items.empty() && !value.empty())
+            items.insert(items.begin(), { value, getSeparationLine() });
+        else
+            items.insert(items.begin(), { value });
     }
 
     //this->Clear(); -> NO! emits yet another wxEVT_COMMAND_TEXT_UPDATED!!!
     wxItemContainer::Clear(); //suffices to clear the selection items only!
+    this->Append(items);
 
-    for (const std::wstring& item : items)
-        this->Append(item);
     //this->SetSelection(wxNOT_FOUND); //don't select anything
     ChangeValue(value); //preserve main text!
 }
@@ -139,9 +139,9 @@ void CommandBox::setValueAndUpdateList(const std::wstring& value)
 
 void CommandBox::OnSelection(wxCommandEvent& event)
 {
-    wxCommandEvent dummy2(wxEVT_VALIDATE_USER_SELECTION); //we cannot replace built-in commands at this position in call stack, so defer to a later time!
+    wxCommandEvent dummy(EVENT_VALIDATE_USER_SELECTION); //we cannot replace built-in commands at this position in call stack, so defer to a later time!
     if (auto handler = GetEventHandler())
-        handler->AddPendingEvent(dummy2);
+        handler->AddPendingEvent(dummy);
 
     event.Skip();
 }
@@ -149,14 +149,14 @@ void CommandBox::OnSelection(wxCommandEvent& event)
 
 void CommandBox::OnValidateSelection(wxCommandEvent& event)
 {
-    const auto value = copyStringTo<std::wstring>(GetValue());
+    const wxString value = GetValue();
 
     if (value == getSeparationLine())
-        return setValueAndUpdateList(std::wstring());
+        return setValueAndUpdateList(wxString());
 
     for (const auto& [description, cmd] : defaultCommands_)
         if (description == value)
-            return setValueAndUpdateList(utfTo<std::wstring>(cmd)); //replace GUI name by actual command string
+            return setValueAndUpdateList(utfTo<wxString>(cmd)); //replace GUI name by actual command string
 }
 
 
diff --git a/FreeFileSync/Source/ui/command_box.h b/FreeFileSync/Source/ui/command_box.h
index ddc6f7d0..5cc152fb 100644
--- a/FreeFileSync/Source/ui/command_box.h
+++ b/FreeFileSync/Source/ui/command_box.h
@@ -48,12 +48,12 @@ private:
     void OnValidateSelection(wxCommandEvent& event);
     void OnUpdateList(wxEvent& event);
 
-    void setValueAndUpdateList(const std::wstring& value);
+    void setValueAndUpdateList(const wxString& value);
 
     std::vector<Zstring> history_;
     size_t historyMax_ = 0;
 
-    const std::vector<std::pair<std::wstring, Zstring>> defaultCommands_;
+    const std::vector<std::pair<wxString, Zstring>> defaultCommands_;
 };
 }
 
diff --git a/FreeFileSync/Source/ui/file_grid.cpp b/FreeFileSync/Source/ui/file_grid.cpp
index a4b15a58..c115d1a0 100644
--- a/FreeFileSync/Source/ui/file_grid.cpp
+++ b/FreeFileSync/Source/ui/file_grid.cpp
@@ -128,23 +128,23 @@ class GridDataRight;
 struct IconManager
 {
     IconManager(GridDataLeft& provLeft, GridDataRight& provRight, IconBuffer::IconSize sz) :
-        iconBuffer(sz),
-        dirIcon        (IconBuffer::genericDirIcon (sz)),
-        linkOverlayIcon(IconBuffer::linkOverlayIcon(sz)),
-        iconUpdater(std::make_unique<IconUpdater>(provLeft, provRight, iconBuffer)) {}
+        iconBuffer_(sz),
+        dirIcon_        (IconBuffer::genericDirIcon (sz)),
+        linkOverlayIcon_(IconBuffer::linkOverlayIcon(sz)),
+        iconUpdater_(std::make_unique<IconUpdater>(provLeft, provRight, iconBuffer_)) {}
 
     void startIconUpdater();
-    IconBuffer& refIconBuffer() { return iconBuffer; }
+    IconBuffer& refIconBuffer() { return iconBuffer_; }
 
-    const wxBitmap& getGenericDirIcon () const { return dirIcon;         }
-    const wxBitmap& getLinkOverlayIcon() const { return linkOverlayIcon; }
+    const wxBitmap& getGenericDirIcon () const { return dirIcon_;         }
+    const wxBitmap& getLinkOverlayIcon() const { return linkOverlayIcon_; }
 
 private:
-    IconBuffer iconBuffer;
-    const wxBitmap dirIcon;
-    const wxBitmap linkOverlayIcon;
+    IconBuffer iconBuffer_;
+    const wxBitmap dirIcon_;
+    const wxBitmap linkOverlayIcon_;
 
-    std::unique_ptr<IconUpdater> iconUpdater; //bind ownership to GridDataRim<>!
+    std::unique_ptr<IconUpdater> iconUpdater_; //bind ownership to GridDataRim<>!
 };
 
 //########################################################################################################
@@ -1658,7 +1658,7 @@ private:
 
 //resolve circular linker dependencies
 inline
-void IconManager::startIconUpdater() { if (iconUpdater) iconUpdater->start(); }
+void IconManager::startIconUpdater() { if (iconUpdater_) iconUpdater_->start(); }
 }
 
 
diff --git a/FreeFileSync/Source/ui/folder_history_box.cpp b/FreeFileSync/Source/ui/folder_history_box.cpp
index 932e6730..2b824b1f 100644
--- a/FreeFileSync/Source/ui/folder_history_box.cpp
+++ b/FreeFileSync/Source/ui/folder_history_box.cpp
@@ -64,7 +64,9 @@ void FolderHistoryBox::setValueAndUpdateList(const wxString& folderPathPhrase)
     {
         //allow user changing to volume name and back, if possible
         std::vector<Zstring> aliases = getFolderPathAliases(utfTo<Zstring>(folderPathPhrase)); //may block when resolving [<volume name>]
-        std::transform(aliases.begin(), aliases.end(), std::back_inserter(dirList), [](const Zstring& str) { return utfTo<wxString>(str); });
+
+        for (const Zstring& str : aliases)
+            dirList.push_back(utfTo<wxString>(str));
     }
     if (sharedHistory_.get())
     {
@@ -74,7 +76,8 @@ void FolderHistoryBox::setValueAndUpdateList(const wxString& folderPathPhrase)
         if (!dirList.empty() && !tmp.empty())
             dirList.push_back(FolderHistory::separationLine());
 
-        std::transform(tmp.begin(), tmp.end(), std::back_inserter(dirList), [](const Zstring& str) { return utfTo<wxString>(str); });
+        for (const Zstring& str : tmp)
+            dirList.push_back(utfTo<wxString>(str));
     }
 
     //###########################################################################################
@@ -87,11 +90,10 @@ void FolderHistoryBox::setValueAndUpdateList(const wxString& folderPathPhrase)
 
     //this->Clear(); -> NO! emits yet another wxEVT_COMMAND_TEXT_UPDATED!!!
     wxItemContainer::Clear(); //suffices to clear the selection items only!
+    this->Append(dirList);
 
-    for (const wxString& dir : dirList)
-        this->Append(dir);
     //this->SetSelection(wxNOT_FOUND); //don't select anything
-    ChangeValue(folderPathPhrase);          //preserve main text!
+    ChangeValue(folderPathPhrase); //preserve main text!
 }
 
 
diff --git a/FreeFileSync/Source/ui/folder_selector.h b/FreeFileSync/Source/ui/folder_selector.h
index 2e4c4073..975ef75a 100644
--- a/FreeFileSync/Source/ui/folder_selector.h
+++ b/FreeFileSync/Source/ui/folder_selector.h
@@ -20,7 +20,7 @@ namespace fff
 //handle drag and drop, tooltip, label and manual input, coordinating a wxWindow, wxButton, and wxComboBox/wxTextCtrl
 /*
 Reasons NOT to use wxDirPickerCtrl, but wxButton instead:
-    - Crash on GTK 2: http://favapps.wordpress.com/2012/06/11/freefilesync-crash-in-linux-when-syncing-solved/
+    - Crash on GTK 2: https://favapps.wordpress.com/2012/06/11/freefilesync-crash-in-linux-when-syncing-solved/
     - still uses outdated ::SHBrowseForFolder() (even on Windows 7)
     - selection dialog remembers size, but NOT position => if user enlarges window, the next time he opens the dialog it may leap out of visible screen
     - hard-codes "Browse" button label
diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp
index e4243dee..d8e104bc 100644
--- a/FreeFileSync/Source/ui/gui_generated.cpp
+++ b/FreeFileSync/Source/ui/gui_generated.cpp
@@ -620,124 +620,122 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const
     bSizer42 = new wxBoxSizer( wxHORIZONTAL );
 
     m_bitmapLogStatus = new wxStaticBitmap( m_panelLog, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer42->Add( m_bitmapLogStatus, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+    bSizer42->Add( m_bitmapLogStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
     m_staticTextLogStatus = new wxStaticText( m_panelLog, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticTextLogStatus->Wrap( -1 );
     m_staticTextLogStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer42->Add( m_staticTextLogStatus, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    bSizer42->Add( m_staticTextLogStatus, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
-    m_panelItemsProcessed = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemsProcessed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer165;
-    bSizer165 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer165->Add( 0, 5, 0, 0, 5 );
+    bSizer42->Add( 10, 0, 0, 0, 5 );
 
-    wxStaticText* m_staticText962;
-    m_staticText962 = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("Items processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText962->Wrap( -1 );
-    bSizer165->Add( m_staticText962, 0, wxRIGHT|wxLEFT, 5 );
+    ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
+    ffgSizer11->SetFlexibleDirection( wxBOTH );
+    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer169;
-    bSizer169 = new wxBoxSizer( wxHORIZONTAL );
+    m_staticTextProcessed = new wxStaticText( m_panelLog, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextProcessed->Wrap( -1 );
+    ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
 
-    m_staticTextItemsProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsProcessed->Wrap( -1 );
-    m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+    m_staticTextRemaining = new wxStaticText( m_panelLog, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextRemaining->Wrap( -1 );
+    ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    bSizer169->Add( m_staticTextItemsProcessed, 0, wxALIGN_BOTTOM, 5 );
 
-    m_staticTextBytesProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesProcessed->Wrap( -1 );
-    bSizer169->Add( m_staticTextBytesProcessed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+    bSizer42->Add( ffgSizer11, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
 
+    m_panelItemStats = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    bSizer165->Add( bSizer169, 0, wxRIGHT|wxLEFT, 5 );
+    wxBoxSizer* bSizer291;
+    bSizer291 = new wxBoxSizer( wxVERTICAL );
 
+    ffgSizer111 = new wxFlexGridSizer( 2, 0, 5, 5 );
+    ffgSizer111->SetFlexibleDirection( wxBOTH );
+    ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    bSizer165->Add( 0, 5, 0, 0, 5 );
+    wxBoxSizer* bSizer293;
+    bSizer293 = new wxBoxSizer( wxHORIZONTAL );
 
+    m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    m_panelItemsProcessed->SetSizer( bSizer165 );
-    m_panelItemsProcessed->Layout();
-    bSizer165->Fit( m_panelItemsProcessed );
-    bSizer42->Add( m_panelItemsProcessed, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
 
-    m_panelItemsRemaining = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemsRemaining->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+    bSizer293->Add( 0, 0, 1, 0, 5 );
 
-    wxBoxSizer* bSizer166;
-    bSizer166 = new wxBoxSizer( wxVERTICAL );
+    m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_staticTextItemsProcessed->Wrap( -1 );
+    m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
+    bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizer166->Add( 0, 5, 0, 0, 5 );
 
-    wxStaticText* m_staticText971;
-    m_staticText971 = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText971->Wrap( -1 );
-    bSizer166->Add( m_staticText971, 0, wxRIGHT|wxLEFT, 5 );
+    ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer170;
-    bSizer170 = new wxBoxSizer( wxHORIZONTAL );
+    m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextBytesProcessed->Wrap( -1 );
+    ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
-    m_staticTextItemsRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
     m_staticTextItemsRemaining->Wrap( -1 );
     m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer170->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 );
+    ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextBytesRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticTextBytesRemaining->Wrap( -1 );
-    bSizer170->Add( m_staticTextBytesRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+    ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer166->Add( bSizer170, 0, wxRIGHT|wxLEFT, 5 );
+    bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
 
 
-    bSizer166->Add( 0, 5, 0, 0, 5 );
+    m_panelItemStats->SetSizer( bSizer291 );
+    m_panelItemStats->Layout();
+    bSizer291->Fit( m_panelItemStats );
+    bSizer42->Add( m_panelItemStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
+    m_panelTimeStats = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    m_panelItemsRemaining->SetSizer( bSizer166 );
-    m_panelItemsRemaining->Layout();
-    bSizer166->Fit( m_panelItemsRemaining );
-    bSizer42->Add( m_panelItemsRemaining, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
+    wxBoxSizer* bSizer292;
+    bSizer292 = new wxBoxSizer( wxVERTICAL );
 
-    wxPanel* m_panelTimeElapsed;
-    m_panelTimeElapsed = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelTimeElapsed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+    ffgSizer112 = new wxFlexGridSizer( 2, 0, 5, 5 );
+    ffgSizer112->SetFlexibleDirection( wxBOTH );
+    ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer168;
-    bSizer168 = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer* bSizer294;
+    bSizer294 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer168->Add( 0, 5, 0, 0, 5 );
+    bSizer294->Add( 0, 0, 1, 0, 5 );
+
+    m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeElapsed->Wrap( -1 );
+    m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    wxStaticText* m_staticText9611;
-    m_staticText9611 = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("Total time:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText9611->Wrap( -1 );
-    bSizer168->Add( m_staticText9611, 0, wxRIGHT|wxLEFT, 5 );
+    bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextTotalTime = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTotalTime->Wrap( -1 );
-    m_staticTextTotalTime->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer168->Add( m_staticTextTotalTime, 0, wxRIGHT|wxLEFT, 5 );
+    ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
 
-    bSizer168->Add( 0, 5, 0, 0, 5 );
+    bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
 
 
-    m_panelTimeElapsed->SetSizer( bSizer168 );
-    m_panelTimeElapsed->Layout();
-    bSizer168->Fit( m_panelTimeElapsed );
-    bSizer42->Add( m_panelTimeElapsed, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
+    m_panelTimeStats->SetSizer( bSizer292 );
+    m_panelTimeStats->Layout();
+    bSizer292->Fit( m_panelTimeStats );
+    bSizer42->Add( m_panelTimeStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    bSizerLog->Add( bSizer42, 0, wxALL, 5 );
+    bSizerLog->Add( bSizer42, 0, wxLEFT, 5 );
 
     m_staticline70 = new wxStaticLine( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
     bSizerLog->Add( m_staticline70, 0, wxEXPAND, 5 );
@@ -1801,14 +1799,14 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w
     m_staticText79->Wrap( -1 );
     bSizer165->Add( m_staticText79, 0, wxBOTTOM, 5 );
 
-    m_spinCtrlTimespan = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer165->Add( m_spinCtrlTimespan, 0, wxEXPAND, 5 );
-
     wxArrayString m_choiceUnitTimespanChoices;
     m_choiceUnitTimespan = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
     m_choiceUnitTimespan->SetSelection( 0 );
     bSizer165->Add( m_choiceUnitTimespan, 0, wxEXPAND, 5 );
 
+    m_spinCtrlTimespan = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+    bSizer165->Add( m_spinCtrlTimespan, 0, wxEXPAND, 5 );
+
 
     bSizer167->Add( bSizer165, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
@@ -1834,7 +1832,7 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w
     m_panelFilterSettingsTab->SetSizer( bSizer278 );
     m_panelFilterSettingsTab->Layout();
     bSizer278->Fit( m_panelFilterSettingsTab );
-    m_notebook->AddPage( m_panelFilterSettingsTab, _("dummy"), false );
+    m_notebook->AddPage( m_panelFilterSettingsTab, _("dummy"), true );
     m_panelSyncSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
     m_panelSyncSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
@@ -2349,7 +2347,7 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w
     m_panelSyncSettingsTab->SetSizer( bSizer276 );
     m_panelSyncSettingsTab->Layout();
     bSizer276->Fit( m_panelSyncSettingsTab );
-    m_notebook->AddPage( m_panelSyncSettingsTab, _("dummy"), true );
+    m_notebook->AddPage( m_panelSyncSettingsTab, _("dummy"), false );
 
     bSizer190->Add( m_notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
 
@@ -3226,94 +3224,130 @@ CompareProgressDlgGenerated::CompareProgressDlgGenerated( wxWindow* parent, wxWi
 {
     this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer40;
-    bSizer40 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer1811;
+    bSizer1811 = new wxBoxSizer( wxVERTICAL );
 
-    m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer187;
-    bSizer187 = new wxBoxSizer( wxVERTICAL );
+    bSizer1811->Add( 0, 0, 1, 0, 5 );
+
+    m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatus->Wrap( -1 );
+    bSizer1811->Add( m_staticTextStatus, 0, wxTOP|wxRIGHT|wxLEFT, 10 );
+
+    wxBoxSizer* bSizer199;
+    bSizer199 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer199->Add( 10, 0, 0, 0, 5 );
+
+    ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
+    ffgSizer11->SetFlexibleDirection( wxBOTH );
+    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticTextProcessed = new wxStaticText( this, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextProcessed->Wrap( -1 );
+    ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
 
+    m_staticTextRemaining = new wxStaticText( this, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextRemaining->Wrap( -1 );
+    ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    bSizer187->Add( 0, 5, 0, 0, 5 );
 
-    wxFlexGridSizer* fgSizer7;
-    fgSizer7 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    fgSizer7->SetFlexibleDirection( wxHORIZONTAL );
-    fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    bSizer199->Add( ffgSizer11, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
 
-    m_staticTextItemsFoundLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Items found:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextItemsFoundLabel->Wrap( -1 );
-    fgSizer7->Add( m_staticTextItemsFoundLabel, 0, wxALIGN_BOTTOM, 5 );
+    m_panelItemStats = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    m_staticTextItemsFound = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextItemsFound->Wrap( -1 );
-    m_staticTextItemsFound->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+    wxBoxSizer* bSizer291;
+    bSizer291 = new wxBoxSizer( wxVERTICAL );
+
+    ffgSizer111 = new wxFlexGridSizer( 2, 0, 5, 5 );
+    ffgSizer111->SetFlexibleDirection( wxBOTH );
+    ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    fgSizer7->Add( m_staticTextItemsFound, 0, wxALIGN_BOTTOM, 5 );
+    wxBoxSizer* bSizer293;
+    bSizer293 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextItemsRemainingLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextItemsRemainingLabel->Wrap( -1 );
-    fgSizer7->Add( m_staticTextItemsRemainingLabel, 0, wxALIGN_BOTTOM, 5 );
+    m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    bSizerItemsRemaining = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextItemsRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer293->Add( 0, 0, 1, 0, 5 );
+
+    m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_staticTextItemsProcessed->Wrap( -1 );
+    m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+
+    bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextBytesProcessed->Wrap( -1 );
+    ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+
+    m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
     m_staticTextItemsRemaining->Wrap( -1 );
     m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerItemsRemaining->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 );
+    ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextBytesRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticTextBytesRemaining->Wrap( -1 );
-    bSizerItemsRemaining->Add( m_staticTextBytesRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+    ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    fgSizer7->Add( bSizerItemsRemaining, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
 
-    m_staticTextTimeRemainingLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeRemainingLabel->Wrap( -1 );
-    fgSizer7->Add( m_staticTextTimeRemainingLabel, 0, wxALIGN_BOTTOM, 5 );
 
-    m_staticTextTimeRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeRemaining->Wrap( -1 );
-    m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+    m_panelItemStats->SetSizer( bSizer291 );
+    m_panelItemStats->Layout();
+    bSizer291->Fit( m_panelItemStats );
+    bSizer199->Add( m_panelItemStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+
+    m_panelTimeStats = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer292;
+    bSizer292 = new wxBoxSizer( wxVERTICAL );
+
+    ffgSizer112 = new wxFlexGridSizer( 2, 0, 5, 5 );
+    ffgSizer112->SetFlexibleDirection( wxBOTH );
+    ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    fgSizer7->Add( m_staticTextTimeRemaining, 0, wxALIGN_BOTTOM, 5 );
+    wxBoxSizer* bSizer294;
+    bSizer294 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText* m_staticText37;
-    m_staticText37 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText37->Wrap( -1 );
-    fgSizer7->Add( m_staticText37, 0, wxALIGN_BOTTOM, 5 );
+    m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    m_staticTextTimeElapsed = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    bSizer294->Add( 0, 0, 1, 0, 5 );
+
+    m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticTextTimeElapsed->Wrap( -1 );
     m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    fgSizer7->Add( m_staticTextTimeElapsed, 0, wxALIGN_BOTTOM, 5 );
-
+    bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizer187->Add( fgSizer7, 0, wxRIGHT|wxLEFT, 5 );
 
+    ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    bSizer187->Add( 0, 5, 0, 0, 5 );
+    m_staticTextTimeRemaining = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeRemaining->Wrap( -1 );
+    m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
+    ffgSizer112->Add( m_staticTextTimeRemaining, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
-    m_panelStatistics->SetSizer( bSizer187 );
-    m_panelStatistics->Layout();
-    bSizer187->Fit( m_panelStatistics );
-    bSizer40->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    wxBoxSizer* bSizer181;
-    bSizer181 = new wxBoxSizer( wxVERTICAL );
+    bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
 
-    m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatus->Wrap( -1 );
-    bSizer181->Add( m_staticTextStatus, 0, 0, 5 );
 
-    wxBoxSizer* bSizer199;
-    bSizer199 = new wxBoxSizer( wxHORIZONTAL );
+    m_panelTimeStats->SetSizer( bSizer292 );
+    m_panelTimeStats->Layout();
+    bSizer292->Fit( m_panelTimeStats );
+    bSizer199->Add( m_panelTimeStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
     bSizerErrorsRetry = new wxBoxSizer( wxHORIZONTAL );
 
@@ -3326,10 +3360,10 @@ CompareProgressDlgGenerated::CompareProgressDlgGenerated( wxWindow* parent, wxWi
 
     m_staticTextRetryCount = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticTextRetryCount->Wrap( -1 );
-    bSizerErrorsRetry->Add( m_staticTextRetryCount, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    bSizerErrorsRetry->Add( m_staticTextRetryCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer199->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    bSizer199->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
     bSizerErrorsIgnore = new wxBoxSizer( wxHORIZONTAL );
 
@@ -3338,47 +3372,48 @@ CompareProgressDlgGenerated::CompareProgressDlgGenerated( wxWindow* parent, wxWi
 
     m_staticText146 = new wxStaticText( this, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText146->Wrap( -1 );
-    bSizerErrorsIgnore->Add( m_staticText146, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+    bSizerErrorsIgnore->Add( m_staticText146, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 
-    bSizer199->Add( bSizerErrorsIgnore, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    bSizer199->Add( bSizerErrorsIgnore, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
     bSizerProgressGraph = new wxBoxSizer( wxHORIZONTAL );
 
-    m_panelProgressGraph = new zen::Graph2D( this, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_panelProgressGraph->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    bSizerProgressGraph->Add( m_panelProgressGraph, 1, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer247;
-    bSizer247 = new wxBoxSizer( wxVERTICAL );
+    ffgSizer113 = new wxFlexGridSizer( 2, 0, 5, 5 );
+    ffgSizer113->SetFlexibleDirection( wxBOTH );
+    ffgSizer113->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
     wxStaticText* m_staticText99;
-    m_staticText99 = new wxStaticText( this, wxID_ANY, _("Bytes"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText99 = new wxStaticText( this, wxID_ANY, _("Bytes:"), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText99->Wrap( -1 );
-    bSizer247->Add( m_staticText99, 0, wxALL, 5 );
+    ffgSizer113->Add( m_staticText99, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
     wxStaticText* m_staticText100;
-    m_staticText100 = new wxStaticText( this, wxID_ANY, _("Items"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText100 = new wxStaticText( this, wxID_ANY, _("Items:"), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText100->Wrap( -1 );
-    bSizer247->Add( m_staticText100, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+    ffgSizer113->Add( m_staticText100, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerProgressGraph->Add( ffgSizer113, 0, wxALL, 5 );
 
+    m_panelProgressGraph = new zen::Graph2D( this, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_panelProgressGraph->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    bSizerProgressGraph->Add( bSizer247, 0, 0, 5 );
+    bSizerProgressGraph->Add( m_panelProgressGraph, 1, wxEXPAND, 5 );
 
 
-    bSizer199->Add( bSizerProgressGraph, 1, wxALIGN_CENTER_VERTICAL, 5 );
+    bSizer199->Add( bSizerProgressGraph, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    bSizer181->Add( bSizer199, 0, wxTOP|wxEXPAND, 5 );
+    bSizer1811->Add( bSizer199, 0, wxEXPAND, 5 );
 
 
-    bSizer40->Add( bSizer181, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    bSizer1811->Add( 0, 0, 1, 0, 5 );
 
 
-    this->SetSizer( bSizer40 );
+    this->SetSizer( bSizer1811 );
     this->Layout();
-    bSizer40->Fit( this );
+    bSizer1811->Fit( this );
 }
 
 CompareProgressDlgGenerated::~CompareProgressDlgGenerated()
@@ -3473,7 +3508,10 @@ SyncProgressPanelGenerated::SyncProgressPanelGenerated( wxWindow* parent, wxWind
     bSizer175->Add( m_staticText99, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer233->Add( bSizer175, 0, 0, 5 );
+    bSizer233->Add( bSizer175, 0, wxALL, 5 );
+
+
+    bSizer233->Add( 0, 0, 1, 0, 5 );
 
     wxBoxSizer* bSizer174;
     bSizer174 = new wxBoxSizer( wxHORIZONTAL );
@@ -3487,156 +3525,133 @@ SyncProgressPanelGenerated::SyncProgressPanelGenerated( wxWindow* parent, wxWind
     bSizer174->Add( m_staticText100, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer233->Add( bSizer174, 0, wxTOP, 5 );
-
-
-    bSizer232->Add( bSizer233, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 );
-
-    m_panelItemsProcessed = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemsProcessed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer165;
-    bSizer165 = new wxBoxSizer( wxVERTICAL );
+    bSizer233->Add( bSizer174, 0, wxALL, 5 );
 
 
-    bSizer165->Add( 0, 5, 0, 0, 5 );
+    bSizer232->Add( bSizer233, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 
-    wxStaticText* m_staticText96;
-    m_staticText96 = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("Items processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText96->Wrap( -1 );
-    bSizer165->Add( m_staticText96, 0, wxRIGHT|wxLEFT, 5 );
+    ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
+    ffgSizer11->SetFlexibleDirection( wxBOTH );
+    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer169;
-    bSizer169 = new wxBoxSizer( wxHORIZONTAL );
+    m_staticTextProcessed = new wxStaticText( m_panelProgress, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextProcessed->Wrap( -1 );
+    ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
 
-    m_staticTextItemsProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsProcessed->Wrap( -1 );
-    m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+    m_staticTextRemaining = new wxStaticText( m_panelProgress, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextRemaining->Wrap( -1 );
+    ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    bSizer169->Add( m_staticTextItemsProcessed, 0, wxALIGN_BOTTOM, 5 );
 
-    m_staticTextBytesProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesProcessed->Wrap( -1 );
-    bSizer169->Add( m_staticTextBytesProcessed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+    bSizer232->Add( ffgSizer11, 0, wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 10 );
 
+    m_panelItemStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    bSizer165->Add( bSizer169, 0, wxRIGHT|wxLEFT, 5 );
+    wxBoxSizer* bSizer291;
+    bSizer291 = new wxBoxSizer( wxVERTICAL );
 
+    ffgSizer111 = new wxFlexGridSizer( 2, 0, 5, 5 );
+    ffgSizer111->SetFlexibleDirection( wxBOTH );
+    ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    bSizer165->Add( 0, 5, 0, 0, 5 );
+    wxBoxSizer* bSizer293;
+    bSizer293 = new wxBoxSizer( wxHORIZONTAL );
 
+    m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    m_panelItemsProcessed->SetSizer( bSizer165 );
-    m_panelItemsProcessed->Layout();
-    bSizer165->Fit( m_panelItemsProcessed );
-    bSizer232->Add( m_panelItemsProcessed, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 10 );
 
-    m_panelItemsRemaining = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemsRemaining->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+    bSizer293->Add( 0, 0, 1, 0, 5 );
 
-    wxBoxSizer* bSizer166;
-    bSizer166 = new wxBoxSizer( wxVERTICAL );
+    m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_staticTextItemsProcessed->Wrap( -1 );
+    m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
+    bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizer166->Add( 0, 5, 0, 0, 5 );
 
-    wxStaticText* m_staticText97;
-    m_staticText97 = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText97->Wrap( -1 );
-    bSizer166->Add( m_staticText97, 0, wxRIGHT|wxLEFT, 5 );
+    ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer170;
-    bSizer170 = new wxBoxSizer( wxHORIZONTAL );
+    m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextBytesProcessed->Wrap( -1 );
+    ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
-    m_staticTextItemsRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
     m_staticTextItemsRemaining->Wrap( -1 );
     m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer170->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 );
+    ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextBytesRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticTextBytesRemaining->Wrap( -1 );
-    bSizer170->Add( m_staticTextBytesRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+    ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer166->Add( bSizer170, 0, wxRIGHT|wxLEFT, 5 );
+    bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
 
 
-    bSizer166->Add( 0, 5, 0, 0, 5 );
+    m_panelItemStats->SetSizer( bSizer291 );
+    m_panelItemStats->Layout();
+    bSizer291->Fit( m_panelItemStats );
+    bSizer232->Add( m_panelItemStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
 
+    m_panelTimeStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    m_panelItemsRemaining->SetSizer( bSizer166 );
-    m_panelItemsRemaining->Layout();
-    bSizer166->Fit( m_panelItemsRemaining );
-    bSizer232->Add( m_panelItemsRemaining, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 10 );
+    wxBoxSizer* bSizer292;
+    bSizer292 = new wxBoxSizer( wxVERTICAL );
 
-    m_panelTimeRemaining = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelTimeRemaining->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+    ffgSizer112 = new wxFlexGridSizer( 2, 0, 5, 5 );
+    ffgSizer112->SetFlexibleDirection( wxBOTH );
+    ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer167;
-    bSizer167 = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer* bSizer294;
+    bSizer294 = new wxBoxSizer( wxHORIZONTAL );
 
+    m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    bSizer167->Add( 0, 5, 0, 0, 5 );
 
-    wxStaticText* m_staticText98;
-    m_staticText98 = new wxStaticText( m_panelTimeRemaining, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText98->Wrap( -1 );
-    bSizer167->Add( m_staticText98, 0, wxRIGHT|wxLEFT, 5 );
-
-    m_staticTextTimeRemaining = new wxStaticText( m_panelTimeRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeRemaining->Wrap( -1 );
-    m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer167->Add( m_staticTextTimeRemaining, 0, wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer167->Add( 0, 5, 0, 0, 5 );
+    bSizer294->Add( 0, 0, 1, 0, 5 );
 
+    m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeElapsed->Wrap( -1 );
+    m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    m_panelTimeRemaining->SetSizer( bSizer167 );
-    m_panelTimeRemaining->Layout();
-    bSizer167->Fit( m_panelTimeRemaining );
-    bSizer232->Add( m_panelTimeRemaining, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 10 );
+    bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxPanel* m_panelTimeElapsed;
-    m_panelTimeElapsed = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelTimeElapsed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer168;
-    bSizer168 = new wxBoxSizer( wxVERTICAL );
+    ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
+    m_staticTextTimeRemaining = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeRemaining->Wrap( -1 );
+    m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer168->Add( 0, 5, 0, 0, 5 );
+    ffgSizer112->Add( m_staticTextTimeRemaining, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
-    wxStaticText* m_staticText961;
-    m_staticText961 = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText961->Wrap( -1 );
-    bSizer168->Add( m_staticText961, 0, wxRIGHT|wxLEFT, 5 );
 
-    m_staticTextTimeElapsed = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeElapsed->Wrap( -1 );
-    m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+    bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
 
-    bSizer168->Add( m_staticTextTimeElapsed, 0, wxRIGHT|wxLEFT, 5 );
 
+    m_panelTimeStats->SetSizer( bSizer292 );
+    m_panelTimeStats->Layout();
+    bSizer292->Fit( m_panelTimeStats );
+    bSizer232->Add( m_panelTimeStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
 
-    bSizer168->Add( 0, 5, 0, 0, 5 );
 
+    bSizer232->Add( 0, 0, 1, 0, 5 );
 
-    m_panelTimeElapsed->SetSizer( bSizer168 );
-    m_panelTimeElapsed->Layout();
-    bSizer168->Fit( m_panelTimeElapsed );
-    bSizer232->Add( m_panelTimeElapsed, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 10 );
+    bSizerDynSpace = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizer232->Add( 10, 0, 0, 0, 5 );
+    bSizerDynSpace->Add( 0, 0, 0, 0, 5 );
 
 
-    bSizer232->Add( 0, 0, 1, 0, 5 );
+    bSizer232->Add( bSizerDynSpace, 0, 0, 5 );
 
 
-    bSizer161->Add( bSizer232, 0, wxTOP|wxBOTTOM|wxEXPAND, 10 );
+    bSizer161->Add( bSizer232, 0, wxEXPAND, 5 );
 
     m_panelGraphItems = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), 0 );
     m_panelGraphItems->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
@@ -4903,9 +4918,9 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
 
     bSizer172->Add( m_hyperlink101, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_hyperlink18 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("NSIS"), wxT("http://nsis.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink18 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("NSIS"), wxT("https://nsis.sourceforge.io"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
     m_hyperlink18->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    m_hyperlink18->SetToolTip( _("http://nsis.sourceforge.net") );
+    m_hyperlink18->SetToolTip( _("https://nsis.sourceforge.io") );
 
     bSizer172->Add( m_hyperlink18, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
diff --git a/FreeFileSync/Source/ui/gui_generated.h b/FreeFileSync/Source/ui/gui_generated.h
index 3d9eef07..616cf0bb 100644
--- a/FreeFileSync/Source/ui/gui_generated.h
+++ b/FreeFileSync/Source/ui/gui_generated.h
@@ -153,6 +153,9 @@ protected:
     wxPanel* m_panelLog;
     wxBoxSizer* bSizerLog;
     wxBoxSizer* bSizer42;
+    wxFlexGridSizer* ffgSizer11;
+    wxFlexGridSizer* ffgSizer111;
+    wxFlexGridSizer* ffgSizer112;
     wxStaticLine* m_staticline70;
     wxPanel* m_panelConfig;
     wxBoxSizer* bSizerConfig;
@@ -261,13 +264,17 @@ public:
     wxBitmapButton* m_bpButtonSelectAltFolderRight;
     wxStaticBitmap* m_bitmapLogStatus;
     wxStaticText* m_staticTextLogStatus;
-    wxPanel* m_panelItemsProcessed;
+    wxStaticText* m_staticTextProcessed;
+    wxStaticText* m_staticTextRemaining;
+    wxPanel* m_panelItemStats;
+    wxStaticBitmap* m_bitmapItemStat;
     wxStaticText* m_staticTextItemsProcessed;
     wxStaticText* m_staticTextBytesProcessed;
-    wxPanel* m_panelItemsRemaining;
     wxStaticText* m_staticTextItemsRemaining;
     wxStaticText* m_staticTextBytesRemaining;
-    wxStaticText* m_staticTextTotalTime;
+    wxPanel* m_panelTimeStats;
+    wxStaticBitmap* m_bitmapTimeStat;
+    wxStaticText* m_staticTextTimeElapsed;
     wxBoxSizer* bSizerStatistics;
     wxBoxSizer* bSizerData;
 
@@ -390,8 +397,8 @@ protected:
     wxStaticLine* m_staticline23;
     wxStaticBitmap* m_bitmapFilterDate;
     wxStaticText* m_staticText79;
-    wxSpinCtrl* m_spinCtrlTimespan;
     wxChoice* m_choiceUnitTimespan;
+    wxSpinCtrl* m_spinCtrlTimespan;
     wxStaticLine* m_staticline231;
     wxButton* m_buttonClear;
     wxPanel* m_panelSyncSettingsTab;
@@ -737,24 +744,30 @@ class CompareProgressDlgGenerated : public wxPanel
 private:
 
 protected:
-    wxPanel* m_panelStatistics;
-    wxStaticText* m_staticTextItemsFoundLabel;
-    wxStaticText* m_staticTextItemsFound;
-    wxStaticText* m_staticTextItemsRemainingLabel;
-    wxBoxSizer* bSizerItemsRemaining;
-    wxStaticText* m_staticTextItemsRemaining;
-    wxStaticText* m_staticTextBytesRemaining;
-    wxStaticText* m_staticTextTimeRemainingLabel;
-    wxStaticText* m_staticTextTimeRemaining;
-    wxStaticText* m_staticTextTimeElapsed;
     wxStaticText* m_staticTextStatus;
+    wxFlexGridSizer* ffgSizer11;
+    wxFlexGridSizer* ffgSizer111;
+    wxFlexGridSizer* ffgSizer112;
     wxStaticText* m_staticText1461;
     wxStaticText* m_staticTextRetryCount;
     wxStaticText* m_staticText146;
     wxBoxSizer* bSizerProgressGraph;
+    wxFlexGridSizer* ffgSizer113;
     zen::Graph2D* m_panelProgressGraph;
 
 public:
+    wxStaticText* m_staticTextProcessed;
+    wxStaticText* m_staticTextRemaining;
+    wxPanel* m_panelItemStats;
+    wxStaticBitmap* m_bitmapItemStat;
+    wxStaticText* m_staticTextItemsProcessed;
+    wxStaticText* m_staticTextBytesProcessed;
+    wxStaticText* m_staticTextItemsRemaining;
+    wxStaticText* m_staticTextBytesRemaining;
+    wxPanel* m_panelTimeStats;
+    wxStaticBitmap* m_bitmapTimeStat;
+    wxStaticText* m_staticTextTimeElapsed;
+    wxStaticText* m_staticTextTimeRemaining;
     wxBoxSizer* bSizerErrorsRetry;
     wxStaticBitmap* m_bitmapRetryErrors;
     wxBoxSizer* bSizerErrorsIgnore;
@@ -775,6 +788,9 @@ private:
 protected:
     wxPanel* m_panel53;
     wxBoxSizer* bSizer42;
+    wxFlexGridSizer* ffgSizer11;
+    wxFlexGridSizer* ffgSizer111;
+    wxFlexGridSizer* ffgSizer112;
     wxStaticText* m_staticText1461;
     wxStaticText* m_staticText146;
     wxStaticText* m_staticText137;
@@ -790,15 +806,19 @@ public:
     zen::Graph2D* m_panelGraphBytes;
     wxStaticBitmap* m_bitmapGraphKeyBytes;
     wxStaticBitmap* m_bitmapGraphKeyItems;
-    wxPanel* m_panelItemsProcessed;
+    wxStaticText* m_staticTextProcessed;
+    wxStaticText* m_staticTextRemaining;
+    wxPanel* m_panelItemStats;
+    wxStaticBitmap* m_bitmapItemStat;
     wxStaticText* m_staticTextItemsProcessed;
     wxStaticText* m_staticTextBytesProcessed;
-    wxPanel* m_panelItemsRemaining;
     wxStaticText* m_staticTextItemsRemaining;
     wxStaticText* m_staticTextBytesRemaining;
-    wxPanel* m_panelTimeRemaining;
-    wxStaticText* m_staticTextTimeRemaining;
+    wxPanel* m_panelTimeStats;
+    wxStaticBitmap* m_bitmapTimeStat;
     wxStaticText* m_staticTextTimeElapsed;
+    wxStaticText* m_staticTextTimeRemaining;
+    wxBoxSizer* bSizerDynSpace;
     zen::Graph2D* m_panelGraphItems;
     wxBoxSizer* bSizerProgressFooter;
     wxBoxSizer* bSizerErrorsRetry;
diff --git a/FreeFileSync/Source/ui/gui_status_handler.cpp b/FreeFileSync/Source/ui/gui_status_handler.cpp
index 64d6daff..be2dea7a 100644
--- a/FreeFileSync/Source/ui/gui_status_handler.cpp
+++ b/FreeFileSync/Source/ui/gui_status_handler.cpp
@@ -11,7 +11,7 @@
 #include <wx/wupdlock.h>
 #include <wx+/popup_dlg.h>
 #include "main_dlg.h"
-#include "../base/generate_logfile.h"
+#include "../base/log_file.h"
 #include "../base/resolve_path.h"
 #include "../afs/concrete.h"
 
@@ -133,14 +133,14 @@ StatusHandlerTemporaryPanel::Result StatusHandlerTemporaryPanel::reportFinalStat
         if (getAbortStatus())
         {
             errorLog_.logMsg(_("Stopped"), MSG_TYPE_ERROR); //= user cancel; *not* a MSG_TYPE_FATAL_ERROR!
-            return SyncResult::ABORTED;
+            return SyncResult::aborted;
         }
         else if (errorLog_.getItemCount(MSG_TYPE_ERROR | MSG_TYPE_FATAL_ERROR) > 0)
-            return SyncResult::FINISHED_WITH_ERROR;
+            return SyncResult::finishedError;
         else if (errorLog_.getItemCount(MSG_TYPE_WARNING) > 0)
-            return SyncResult::FINISHED_WITH_WARNINGS;
+            return SyncResult::finishedWarning;
         else
-            return SyncResult::FINISHED_WITH_SUCCESS;
+            return SyncResult::finishedSuccess;
     }();
 
     const ProcessSummary summary
@@ -188,15 +188,15 @@ void StatusHandlerTemporaryPanel::reportWarning(const std::wstring& msg, bool& w
         forceUiRefreshNoThrow(); //noexcept! => don't throw here when error occurs during clean up!
 
         bool dontWarnAgain = false;
-        switch (showConfirmationDialog(&mainDlg_, DialogInfoType::WARNING,
+        switch (showConfirmationDialog(&mainDlg_, DialogInfoType::warning,
                                        PopupDialogCfg().setDetailInstructions(msg).
                                        setCheckBox(dontWarnAgain, _("&Don't show this warning again")),
                                        _("&Ignore")))
         {
-            case ConfirmationButton::ACCEPT:
+            case ConfirmationButton::accept:
                 warningActive = !dontWarnAgain;
                 break;
-            case ConfirmationButton::CANCEL:
+            case ConfirmationButton::cancel:
                 userAbortProcessNow(); //throw AbortProcess
                 break;
         }
@@ -215,7 +215,7 @@ ProcessCallback::Response StatusHandlerTemporaryPanel::reportError(const std::ws
         errorLog_.logMsg(msg + L"\n-> " + _("Automatic retry"), MSG_TYPE_INFO);
         delayAndCountDown(_("Automatic retry") + (automaticRetryCount_ <= 1 ? L"" :  L" " + numberTo<std::wstring>(retryNumber + 1) + L"/" + numberTo<std::wstring>(automaticRetryCount_)),
         automaticRetryDelay_, [&](const std::wstring& statusMsg) { this->reportStatus(_("Error") + L": " + statusMsg); }); //throw AbortProcess
-        return ProcessCallback::RETRY;
+        return ProcessCallback::retry;
     }
 
     //always, except for "retry":
@@ -225,32 +225,32 @@ ProcessCallback::Response StatusHandlerTemporaryPanel::reportError(const std::ws
     {
         forceUiRefreshNoThrow(); //noexcept! => don't throw here when error occurs during clean up!
 
-        switch (showConfirmationDialog(&mainDlg_, DialogInfoType::ERROR2,
+        switch (showConfirmationDialog(&mainDlg_, DialogInfoType::error,
                                        PopupDialogCfg().setDetailInstructions(msg),
                                        _("&Ignore"), _("Ignore &all"), _("&Retry")))
         {
-            case ConfirmationButton3::ACCEPT: //ignore
-                return ProcessCallback::IGNORE_ERROR;
+            case ConfirmationButton3::accept: //ignore
+                return ProcessCallback::ignoreError;
 
-            case ConfirmationButton3::ACCEPT_ALL: //ignore all
+            case ConfirmationButton3::acceptAll: //ignore all
                 mainDlg_.compareStatus_->setOptionIgnoreErrors(true);
-                return ProcessCallback::IGNORE_ERROR;
+                return ProcessCallback::ignoreError;
 
-            case ConfirmationButton3::DECLINE: //retry
+            case ConfirmationButton3::decline: //retry
                 guardWriteLog.dismiss();
                 errorLog_.logMsg(msg + L"\n-> " + _("Retrying operation..."), MSG_TYPE_INFO); //explain why there are duplicate "doing operation X" info messages in the log!
-                return ProcessCallback::RETRY;
+                return ProcessCallback::retry;
 
-            case ConfirmationButton3::CANCEL:
+            case ConfirmationButton3::cancel:
                 userAbortProcessNow(); //throw AbortProcess
                 break;
         }
     }
     else
-        return ProcessCallback::IGNORE_ERROR;
+        return ProcessCallback::ignoreError;
 
     assert(false);
-    return ProcessCallback::IGNORE_ERROR; //dummy return value
+    return ProcessCallback::ignoreError; //dummy return value
 }
 
 
@@ -264,19 +264,19 @@ void StatusHandlerTemporaryPanel::reportFatalError(const std::wstring& msg)
     {
         forceUiRefreshNoThrow(); //noexcept! => don't throw here when error occurs during clean up!
 
-        switch (showConfirmationDialog(&mainDlg_, DialogInfoType::ERROR2,
+        switch (showConfirmationDialog(&mainDlg_, DialogInfoType::error,
                                        PopupDialogCfg().setTitle(_("Serious Error")).
                                        setDetailInstructions(msg),
                                        _("&Ignore"), _("Ignore &all")))
         {
-            case ConfirmationButton2::ACCEPT: //ignore
+            case ConfirmationButton2::accept: //ignore
                 break;
 
-            case ConfirmationButton2::ACCEPT_ALL: //ignore all
+            case ConfirmationButton2::acceptAll: //ignore all
                 mainDlg_.compareStatus_->setOptionIgnoreErrors(true);
                 break;
 
-            case ConfirmationButton2::CANCEL:
+            case ConfirmationButton2::cancel:
                 userAbortProcessNow(); //throw AbortProcess
                 break;
         }
@@ -320,8 +320,8 @@ StatusHandlerFloatingDialog::StatusHandlerFloatingDialog(wxFrame* parentDlg,
                                                          const Zstring& postSyncCommand,
                                                          PostSyncCondition postSyncCondition,
                                                          bool& autoCloseDialog) :
-    progressDlg_(createProgressDialog(*this, [this] { this->onProgressDialogTerminate(); }, *this, parentDlg, true /*showProgress*/, autoCloseDialog,
-startTime, jobName, soundFileSyncComplete, ignoreErrors, automaticRetryCount, PostSyncAction2::NONE)),
+    progressDlg_(SyncProgressDialog::create([this] { userRequestAbort(); }, *this, parentDlg, true /*showProgress*/, autoCloseDialog,
+startTime, jobName, soundFileSyncComplete, ignoreErrors, automaticRetryCount, PostSyncAction2::none)),
            automaticRetryCount_(automaticRetryCount),
            automaticRetryDelay_(automaticRetryDelay),
            jobName_(jobName),
@@ -342,7 +342,7 @@ StatusHandlerFloatingDialog::Result StatusHandlerFloatingDialog::reportFinalStat
 {
     const auto totalTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - startTime_);
 
-    if (progressDlg_) progressDlg_->timerSetStatus(false /*active*/); //keep correct summary window stats considering count down timer, system sleep
+    progressDlg_->timerSetStatus(false /*active*/); //keep correct summary window stats considering count down timer, system sleep
 
     //determine post-sync status irrespective of further errors during tear-down
     const SyncResult finalStatus = [&]
@@ -350,19 +350,19 @@ StatusHandlerFloatingDialog::Result StatusHandlerFloatingDialog::reportFinalStat
         if (getAbortStatus())
         {
             errorLog_.logMsg(_("Stopped"), MSG_TYPE_ERROR); //= user cancel; *not* a MSG_TYPE_FATAL_ERROR!
-            return SyncResult::ABORTED;
+            return SyncResult::aborted;
         }
         else if (errorLog_.getItemCount(MSG_TYPE_ERROR | MSG_TYPE_FATAL_ERROR) > 0)
-            return SyncResult::FINISHED_WITH_ERROR;
+            return SyncResult::finishedError;
         else if (errorLog_.getItemCount(MSG_TYPE_WARNING) > 0)
-            return SyncResult::FINISHED_WITH_WARNINGS;
+            return SyncResult::finishedWarning;
 
         if (getStatsTotal(currentPhase()) == ProgressStats())
             errorLog_.logMsg(_("Nothing to synchronize"), MSG_TYPE_INFO);
-        return SyncResult::FINISHED_WITH_SUCCESS;
+        return SyncResult::finishedSuccess;
     }();
 
-    assert(finalStatus == SyncResult::ABORTED || currentPhase() == PHASE_SYNCHRONIZING);
+    assert(finalStatus == SyncResult::aborted || currentPhase() == PHASE_SYNCHRONIZING);
 
     const ProcessSummary summary
     {
@@ -383,13 +383,13 @@ StatusHandlerFloatingDialog::Result StatusHandlerFloatingDialog::reportFinalStat
                 case PostSyncCondition::COMPLETION:
                     return postSyncCommand_;
                 case PostSyncCondition::ERRORS:
-                    if (finalStatus == SyncResult::ABORTED ||
-                        finalStatus == SyncResult::FINISHED_WITH_ERROR)
+                    if (finalStatus == SyncResult::aborted ||
+                        finalStatus == SyncResult::finishedError)
                         return postSyncCommand_;
                     break;
                 case PostSyncCondition::SUCCESS:
-                    if (finalStatus == SyncResult::FINISHED_WITH_WARNINGS ||
-                        finalStatus == SyncResult::FINISHED_WITH_SUCCESS)
+                    if (finalStatus == SyncResult::finishedWarning ||
+                        finalStatus == SyncResult::finishedSuccess)
                         return postSyncCommand_;
                     break;
             }
@@ -422,86 +422,71 @@ StatusHandlerFloatingDialog::Result StatusHandlerFloatingDialog::reportFinalStat
         }
         catch (const FileError& e) { errorLog_.logMsg(e.toString(), MSG_TYPE_ERROR); }
 
-    if (progressDlg_)
+    auto mayRunAfterCountDown = [&](const std::wstring& operationName)
     {
-        auto mayRunAfterCountDown = [&](const std::wstring& operationName)
+        auto notifyStatusThrowOnCancel = [&](const std::wstring& msg)
         {
-            auto notifyStatusThrowOnCancel = [&](const std::wstring& msg)
+            try { reportStatus(msg); /*throw AbortProcess*/ }
+            catch (...)
             {
-                try { reportStatus(msg); /*throw AbortProcess*/ }
-                catch (...)
-                {
-                    if (getAbortStatus() && *getAbortStatus() == AbortTrigger::USER)
-                        throw;
-                }
-            };
-
-            if (progressDlg_->getWindowIfVisible())
-                try
-                {
-                    delayAndCountDown(operationName, std::chrono::seconds(5), notifyStatusThrowOnCancel); //throw AbortProcess
-                }
-                catch (...) { return false; }
-
-            return true;
+                if (getAbortStatus() && *getAbortStatus() == AbortTrigger::USER)
+                    throw;
+            }
         };
 
-        //post sync action
-        bool autoClose = false;
-        FinalRequest finalRequest = FinalRequest::none;
-
-        if (getAbortStatus() && *getAbortStatus() == AbortTrigger::USER)
-            ; //user cancelled => don't run post sync command!
-        else
-            switch (progressDlg_->getOptionPostSyncAction())
+        if (progressDlg_->getWindowIfVisible())
+            try
             {
-                case PostSyncAction2::NONE:
-                    autoClose = progressDlg_->getOptionAutoCloseDialog();
-                    break;
-                case PostSyncAction2::EXIT:
-                    autoClose = true;
-                    finalRequest = FinalRequest::exit; //program exit must be handled by calling context!
-                    break;
-                case PostSyncAction2::SLEEP:
-                    if (mayRunAfterCountDown(_("System: Sleep")))
-                        try
-                        {
-                            suspendSystem(); //throw FileError
-                            autoClose = progressDlg_->getOptionAutoCloseDialog();
-                        }
-                        catch (const FileError& e) { errorLog_.logMsg(e.toString(), MSG_TYPE_ERROR); }
-                    break;
-                case PostSyncAction2::SHUTDOWN:
-                    if (mayRunAfterCountDown(_("System: Shut down")))
-                    {
-                        autoClose = true;
-                        finalRequest = FinalRequest::shutdown; //system shutdown must be handled by calling context!
-                    }
-                    break;
+                delayAndCountDown(operationName, std::chrono::seconds(5), notifyStatusThrowOnCancel); //throw AbortProcess
             }
+            catch (...) { return false; }
 
-        auto errorLogFinal = std::make_shared<const ErrorLog>(std::move(errorLog_));
+        return true;
+    };
 
-        //close progress dialog
-        if (autoClose)
-            progressDlg_->closeDirectly(finalRequest == FinalRequest::none /*restoreParentFrame*/);
-        else
-            progressDlg_->showSummary(finalStatus, errorLogFinal);
+    //post sync action
+    bool autoClose = false;
+    FinalRequest finalRequest = FinalRequest::none;
 
-        //wait until progress dialog notified shutdown via onProgressDialogTerminate()
-        //-> required since it has our "this" pointer captured in lambda "notifyWindowTerminate"!
-        //-> nicely manages dialog lifetime
-        for (;;)
+    if (getAbortStatus() && *getAbortStatus() == AbortTrigger::USER)
+        ; //user cancelled => don't run post sync command!
+    else
+        switch (progressDlg_->getOptionPostSyncAction())
         {
-            wxTheApp->Yield(); //*first* refresh GUI (removing flicker) before sleeping!
-            if (!progressDlg_) break;
-            std::this_thread::sleep_for(UI_UPDATE_INTERVAL);
+            case PostSyncAction2::none:
+                autoClose = progressDlg_->getOptionAutoCloseDialog();
+                break;
+            case PostSyncAction2::exit:
+                autoClose = true;
+                finalRequest = FinalRequest::exit; //program exit must be handled by calling context!
+                break;
+            case PostSyncAction2::sleep:
+                if (mayRunAfterCountDown(_("System: Sleep")))
+                    try
+                    {
+                        suspendSystem(); //throw FileError
+                        autoClose = progressDlg_->getOptionAutoCloseDialog();
+                    }
+                    catch (const FileError& e) { errorLog_.logMsg(e.toString(), MSG_TYPE_ERROR); }
+                break;
+            case PostSyncAction2::shutdown:
+                if (mayRunAfterCountDown(_("System: Shut down")))
+                {
+                    autoClose = true;
+                    finalRequest = FinalRequest::shutdown; //system shutdown must be handled by calling context!
+                }
+                break;
         }
 
-        return { summary, errorLogFinal, finalRequest, logFilePath };
-    }
-    else
-        return { summary, std::make_shared<const ErrorLog>(std::move(errorLog_)), FinalRequest::none, logFilePath };
+    auto errorLogFinal = std::make_shared<const ErrorLog>(std::move(errorLog_));
+
+    autoCloseDialogOut_ = //output parameter owned by SyncProgressDialog (evaluate *after* user closed the results dialog)
+        progressDlg_->destroy(autoClose,
+                              finalRequest == FinalRequest::none /*restoreParentFrame*/,
+                              finalStatus, errorLogFinal).autoCloseDialog;
+    progressDlg_ = nullptr;
+
+    return { summary, errorLogFinal, finalRequest, logFilePath };
 }
 
 
@@ -509,7 +494,7 @@ void StatusHandlerFloatingDialog::initNewPhase(int itemsTotal, int64_t bytesTota
 {
     assert(phaseID == PHASE_SYNCHRONIZING);
     StatusHandler::initNewPhase(itemsTotal, bytesTotal, phaseID);
-    if (progressDlg_) progressDlg_->initNewPhase(); //call after "StatusHandler::initNewPhase"
+    progressDlg_->initNewPhase(); //call after "StatusHandler::initNewPhase"
 
     forceUiRefresh(); //throw AbortProcess; OS X needs a full yield to update GUI and get rid of "dummy" texts
 }
@@ -523,7 +508,6 @@ void StatusHandlerFloatingDialog::logInfo(const std::wstring& msg)
 
 void StatusHandlerFloatingDialog::reportWarning(const std::wstring& msg, bool& warningActive)
 {
-    if (!progressDlg_) abortProcessNow(); //throw AbortProcess
     PauseTimers dummy(*progressDlg_);
 
     errorLog_.logMsg(msg, MSG_TYPE_WARNING);
@@ -535,17 +519,16 @@ void StatusHandlerFloatingDialog::reportWarning(const std::wstring& msg, bool& w
     {
         forceUiRefreshNoThrow(); //noexcept! => don't throw here when error occurs during clean up!
 
-        if (!progressDlg_) abortProcessNow(); //throw AbortProcess
         bool dontWarnAgain = false;
-        switch (showConfirmationDialog(progressDlg_->getWindowIfVisible(), DialogInfoType::WARNING,
+        switch (showConfirmationDialog(progressDlg_->getWindowIfVisible(), DialogInfoType::warning,
                                        PopupDialogCfg().setDetailInstructions(msg).
                                        setCheckBox(dontWarnAgain, _("&Don't show this warning again")),
                                        _("&Ignore")))
         {
-            case ConfirmationButton::ACCEPT:
+            case ConfirmationButton::accept:
                 warningActive = !dontWarnAgain;
                 break;
-            case ConfirmationButton::CANCEL:
+            case ConfirmationButton::cancel:
                 userAbortProcessNow(); //throw AbortProcess
                 break;
         }
@@ -556,7 +539,6 @@ void StatusHandlerFloatingDialog::reportWarning(const std::wstring& msg, bool& w
 
 ProcessCallback::Response StatusHandlerFloatingDialog::reportError(const std::wstring& msg, size_t retryNumber)
 {
-    if (!progressDlg_) abortProcessNow(); //throw AbortProcess
     PauseTimers dummy(*progressDlg_);
 
     //auto-retry
@@ -565,7 +547,7 @@ ProcessCallback::Response StatusHandlerFloatingDialog::reportError(const std::ws
         errorLog_.logMsg(msg + L"\n-> " + _("Automatic retry"), MSG_TYPE_INFO);
         delayAndCountDown(_("Automatic retry") + (automaticRetryCount_ <= 1 ? L"" :  L" " + numberTo<std::wstring>(retryNumber + 1) + L"/" + numberTo<std::wstring>(automaticRetryCount_)),
         automaticRetryDelay_, [&](const std::wstring& statusMsg) { this->reportStatus(_("Error") + L": " + statusMsg); }); //throw AbortProcess
-        return ProcessCallback::RETRY;
+        return ProcessCallback::retry;
     }
 
     //always, except for "retry":
@@ -575,39 +557,37 @@ ProcessCallback::Response StatusHandlerFloatingDialog::reportError(const std::ws
     {
         forceUiRefreshNoThrow(); //noexcept! => don't throw here when error occurs during clean up!
 
-        if (!progressDlg_) abortProcessNow(); //throw AbortProcess
-        switch (showConfirmationDialog(progressDlg_->getWindowIfVisible(), DialogInfoType::ERROR2,
+        switch (showConfirmationDialog(progressDlg_->getWindowIfVisible(), DialogInfoType::error,
                                        PopupDialogCfg().setDetailInstructions(msg),
                                        _("&Ignore"), _("Ignore &all"), _("&Retry")))
         {
-            case ConfirmationButton3::ACCEPT: //ignore
-                return ProcessCallback::IGNORE_ERROR;
+            case ConfirmationButton3::accept: //ignore
+                return ProcessCallback::ignoreError;
 
-            case ConfirmationButton3::ACCEPT_ALL: //ignore all
+            case ConfirmationButton3::acceptAll: //ignore all
                 progressDlg_->setOptionIgnoreErrors(true);
-                return ProcessCallback::IGNORE_ERROR;
+                return ProcessCallback::ignoreError;
 
-            case ConfirmationButton3::DECLINE: //retry
+            case ConfirmationButton3::decline: //retry
                 guardWriteLog.dismiss();
                 errorLog_.logMsg(msg + L"\n-> " + _("Retrying operation..."), MSG_TYPE_INFO); //explain why there are duplicate "doing operation X" info messages in the log!
-                return ProcessCallback::RETRY;
+                return ProcessCallback::retry;
 
-            case ConfirmationButton3::CANCEL:
+            case ConfirmationButton3::cancel:
                 userAbortProcessNow(); //throw AbortProcess
                 break;
         }
     }
     else
-        return ProcessCallback::IGNORE_ERROR;
+        return ProcessCallback::ignoreError;
 
     assert(false);
-    return ProcessCallback::IGNORE_ERROR; //dummy value
+    return ProcessCallback::ignoreError; //dummy value
 }
 
 
 void StatusHandlerFloatingDialog::reportFatalError(const std::wstring& msg)
 {
-    if (!progressDlg_) abortProcessNow(); //throw AbortProcess
     PauseTimers dummy(*progressDlg_);
 
     errorLog_.logMsg(msg, MSG_TYPE_FATAL_ERROR);
@@ -616,20 +596,19 @@ void StatusHandlerFloatingDialog::reportFatalError(const std::wstring& msg)
     {
         forceUiRefreshNoThrow(); //noexcept! => don't throw here when error occurs during clean up!
 
-        if (!progressDlg_) abortProcessNow(); //throw AbortProcess
-        switch (showConfirmationDialog(progressDlg_->getWindowIfVisible(), DialogInfoType::ERROR2,
+        switch (showConfirmationDialog(progressDlg_->getWindowIfVisible(), DialogInfoType::error,
                                        PopupDialogCfg().setTitle(_("Serious Error")).
                                        setDetailInstructions(msg),
                                        _("&Ignore"), _("Ignore &all")))
         {
-            case ConfirmationButton2::ACCEPT:
+            case ConfirmationButton2::accept:
                 break;
 
-            case ConfirmationButton2::ACCEPT_ALL:
+            case ConfirmationButton2::acceptAll:
                 progressDlg_->setOptionIgnoreErrors(true);
                 break;
 
-            case ConfirmationButton2::CANCEL:
+            case ConfirmationButton2::cancel:
                 userAbortProcessNow(); //throw AbortProcess
                 break;
         }
@@ -642,23 +621,12 @@ void StatusHandlerFloatingDialog::updateDataProcessed(int itemsDelta, int64_t by
     StatusHandler::updateDataProcessed(itemsDelta, bytesDelta);
 
     //note: this method should NOT throw in order to properly allow undoing setting of statistics!
-    if (progressDlg_) progressDlg_->notifyProgressChange(); //noexcept
+    progressDlg_->notifyProgressChange(); //noexcept
     //for "curveDataBytes_->addRecord()"
 }
 
 
 void StatusHandlerFloatingDialog::forceUiRefreshNoThrow()
 {
-    if (progressDlg_)
-        progressDlg_->updateGui();
-}
-
-
-void StatusHandlerFloatingDialog::onProgressDialogTerminate()
-{
-    //output parameters owned by SyncProgressDialog
-    if (progressDlg_)
-        autoCloseDialogOut_ = progressDlg_->getOptionAutoCloseDialog();
-
-    progressDlg_ = nullptr;
+    progressDlg_->updateGui();
 }
diff --git a/FreeFileSync/Source/ui/gui_status_handler.h b/FreeFileSync/Source/ui/gui_status_handler.h
index 0bd6dac4..dffd1783 100644
--- a/FreeFileSync/Source/ui/gui_status_handler.h
+++ b/FreeFileSync/Source/ui/gui_status_handler.h
@@ -93,9 +93,7 @@ public:
     Result reportFinalStatus(const Zstring& altLogFolderPathPhrase, int logfilesMaxAgeDays, const std::set<AbstractPath>& logFilePathsToKeep); //noexcept!!
 
 private:
-    void onProgressDialogTerminate();
-
-    SyncProgressDialog* progressDlg_; //managed to have shorter lifetime than this handler!
+    SyncProgressDialog* progressDlg_; //managed to have the same lifetime as this handler!
     zen::ErrorLog errorLog_;
     const size_t automaticRetryCount_;
     const std::chrono::seconds automaticRetryDelay_;
diff --git a/FreeFileSync/Source/ui/log_panel.cpp b/FreeFileSync/Source/ui/log_panel.cpp
index 34b0aa64..c0504291 100644
--- a/FreeFileSync/Source/ui/log_panel.cpp
+++ b/FreeFileSync/Source/ui/log_panel.cpp
@@ -561,6 +561,6 @@ void LogPanel::copySelectionToClipboard()
     }
     catch (const std::bad_alloc& e)
     {
-        showNotificationDialog(nullptr, DialogInfoType::ERROR2, PopupDialogCfg().setMainInstructions(_("Out of memory.") + L" " + utfTo<std::wstring>(e.what())));
+        showNotificationDialog(nullptr, DialogInfoType::error, PopupDialogCfg().setMainInstructions(_("Out of memory.") + L" " + utfTo<std::wstring>(e.what())));
     }
 }
diff --git a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp
index 5583cc79..d4f3aa5c 100644
--- a/FreeFileSync/Source/ui/main_dlg.cpp
+++ b/FreeFileSync/Source/ui/main_dlg.cpp
@@ -277,7 +277,7 @@ XmlGlobalSettings tryLoadGlobalConfig(const Zstring& globalConfigFilePath) //blo
         }
         catch (const FileError& e)
         {
-            showNotificationDialog(nullptr, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString())); //no parent window: main dialog not yet created!
+            showNotificationDialog(nullptr, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString())); //no parent window: main dialog not yet created!
         }
     }
     return globalCfg;
@@ -335,12 +335,12 @@ void MainDialog::create(const Zstring& globalConfigFilePath)
             readAnyConfig(cfgFilePaths, guiCfg, warningMsg); //throw FileError
 
             if (!warningMsg.empty())
-                showNotificationDialog(nullptr, DialogInfoType::WARNING, PopupDialogCfg().setDetailInstructions(warningMsg));
+                showNotificationDialog(nullptr, DialogInfoType::warning, PopupDialogCfg().setDetailInstructions(warningMsg));
             //what about showing as changed config on parsing errors????
         }
         catch (const FileError& e)
         {
-            showNotificationDialog(nullptr, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+            showNotificationDialog(nullptr, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
         }
 
     //------------------------------------------------------------------------------------------
@@ -364,7 +364,7 @@ void MainDialog::create(const Zstring& globalConfigFilePath,
     }
     catch (const FileError& e)
     {
-        showNotificationDialog(nullptr, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+        showNotificationDialog(nullptr, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
         //continue!
     }
 
@@ -419,8 +419,13 @@ MainDialog::MainDialog(const Zstring& globalConfigFilePath,
 
     initViewFilterButtons();
 
+    const wxBitmap& bmpFile = IconBuffer::genericFileIcon(IconBuffer::SIZE_SMALL);
+    const wxBitmap& bmpDir  = IconBuffer::genericDirIcon (IconBuffer::SIZE_SMALL);
+
     //init log panel
     setRelativeFontSize(*m_staticTextLogStatus, 1.5);
+    m_bitmapItemStat->SetBitmap(bmpFile);
+    m_bitmapTimeStat->SetBitmap(getResourceImage(L"cmp_file_time_sicon"));
 
     logPanel_ = new LogPanel(m_panelLog); //pass ownership
     bSizerLog->Add(logPanel_, 1, wxEXPAND);
@@ -580,15 +585,11 @@ MainDialog::MainDialog(const Zstring& globalConfigFilePath,
     m_bpButtonSyncContext->SetToolTip(m_bpButtonSyncConfig->GetToolTipText());
 
 
-    {
-        const wxBitmap& bmpFile = IconBuffer::genericFileIcon(IconBuffer::SIZE_SMALL);
-        const wxBitmap& bmpDir  = IconBuffer::genericDirIcon (IconBuffer::SIZE_SMALL);
+    m_bitmapSmallDirectoryLeft ->SetBitmap(bmpDir);
+    m_bitmapSmallFileLeft      ->SetBitmap(bmpFile);
+    m_bitmapSmallDirectoryRight->SetBitmap(bmpDir);
+    m_bitmapSmallFileRight     ->SetBitmap(bmpFile);
 
-        m_bitmapSmallDirectoryLeft ->SetBitmap(bmpDir);
-        m_bitmapSmallFileLeft      ->SetBitmap(bmpFile);
-        m_bitmapSmallDirectoryRight->SetBitmap(bmpDir);
-        m_bitmapSmallFileRight     ->SetBitmap(bmpFile);
-    }
 
     m_menuItemNew        ->SetBitmap(getResourceImage(L"file_new_sicon"));
     m_menuItemLoad       ->SetBitmap(getResourceImage(L"file_load_sicon"));
@@ -820,7 +821,7 @@ MainDialog::~MainDialog()
 
     //don't annoy users on read-only drives: it's enough to show a single error message when saving global config
     if (firstError)
-        showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(firstError->toString()));
+        showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(firstError->toString()));
 
     auiMgr_.UnInit();
 
@@ -875,37 +876,39 @@ void MainDialog::setGlobalCfgOnInit(const XmlGlobalSettings& globalSettings)
 {
     globalCfg_ = globalSettings;
 
-    //caveat set/get language asymmmetry! setLanguage(globalSettings.programLanguage); //throw FileError
+    //caveat: set/get language asymmmetry! setLanguage(globalSettings.programLanguage); //throw FileError
     //we need to set langugabe before creating this class!
 
     wxSize newSize(fastFromDIP(900), fastFromDIP(600)); //default window size
     std::optional<wxPoint> newPos;
     //set dialog size and position:
-    // - width/height are invalid if the window is minimized (eg x,y == -32000; height = 28, width = 160)
+    // - width/height are invalid if the window is minimized (eg x,y = -32000; width = 160, height = 28)
     // - multi-monitor setups: dialog may be placed on second monitor which is currently turned off
     if (globalSettings.gui.mainDlg.dlgSize.GetWidth () > 0 &&
         globalSettings.gui.mainDlg.dlgSize.GetHeight() > 0)
     {
-        newSize = globalSettings.gui.mainDlg.dlgSize;
-
         //calculate how much of the dialog will be visible on screen
-        const int dlgArea = newSize.GetWidth() * newSize.GetHeight();
+        const int dlgArea = globalSettings.gui.mainDlg.dlgSize.GetWidth() *
+                            globalSettings.gui.mainDlg.dlgSize.GetHeight();
         int dlgAreaMaxVisible = 0;
 
         const int monitorCount = wxDisplay::GetCount();
         for (int i = 0; i < monitorCount; ++i)
         {
-            wxRect intersection = wxDisplay(i).GetClientArea().Intersect(wxRect(globalSettings.gui.mainDlg.dlgPos, newSize));
+            wxRect intersection = wxDisplay(i).GetClientArea().Intersect(wxRect(globalSettings.gui.mainDlg.dlgPos, globalSettings.gui.mainDlg.dlgSize));
             dlgAreaMaxVisible = std::max(dlgAreaMaxVisible, intersection.GetWidth() * intersection.GetHeight());
         }
 
-        if (dlgAreaMaxVisible > 0.1 * dlgArea  //at least 10% of the dialog should be visible!
+        if (dlgAreaMaxVisible > 0.1 * dlgArea //at least 10% of the dialog should be visible!
            )
-            newPos = globalSettings.gui.mainDlg.dlgPos;
+        {
+            newSize = globalSettings.gui.mainDlg.dlgSize;
+            newPos  = globalSettings.gui.mainDlg.dlgPos;
+        }
     }
 
     //old comment: "wxGTK's wxWindow::SetSize seems unreliable and behaves like a wxWindow::SetClientSize
-    //              => use wxWindow::SetClientSize instead (for the record: no such issue on Windows/OS X)
+    //              => use wxWindow::SetClientSize instead (for the record: no such issue on Windows/macOS)
     //2018-10-15: Weird new problem on CentOS/Ubuntu: SetClientSize() + SetPosition() fail to set correct dialog *position*, but SetSize() + SetPosition() do!
     //              => old issues with SetSize() seem to be gone... => revert to SetSize()
     if (newPos)
@@ -963,20 +966,28 @@ void MainDialog::setGlobalCfgOnInit(const XmlGlobalSettings& globalSettings)
     m_checkBoxMatchCase->SetValue(globalCfg_.gui.mainDlg.textSearchRespectCase);
 
     //wxAuiManager erroneously loads panel captions, we don't want that
-    std::vector<std::pair<wxString, wxString>>captionNameMap;
-    const wxAuiPaneInfoArray& paneArray = auiMgr_.GetAllPanes();
+    std::vector<std::pair<wxAuiPaneInfo*, wxString>> paneCaptions;
+    wxAuiPaneInfoArray& paneArray = auiMgr_.GetAllPanes();
     for (size_t i = 0; i < paneArray.size(); ++i)
-        captionNameMap.emplace_back(paneArray[i].caption, paneArray[i].name);
+        paneCaptions.emplace_back(&paneArray[i], paneArray[i].caption);
+
+    //compare progress dialog minimum sizes are layout-dependent + can't be changed by user => don't load stale values from config
+    wxAuiPaneInfo& progPane = auiMgr_.GetPane(compareStatus_->getAsWindow());
+    const wxSize progPaneMinSizeOrig  = progPane.min_size;
+    const wxSize progPaneBestSizeOrig = progPane.best_size;
 
     auiMgr_.LoadPerspective(globalSettings.gui.mainDlg.guiPerspectiveLast);
 
     //restore original captions
-    for (const auto& [caption, name] : captionNameMap)
-        auiMgr_.GetPane(name).Caption(caption);
+    for (const auto& [paneInfo, caption] : paneCaptions)
+        paneInfo->Caption(caption);
+
+    progPane.min_size  = progPaneMinSizeOrig;
+    progPane.best_size = progPaneBestSizeOrig;
     //--------------------------------------------------------------------------------
 
     //if MainDialog::onQueryEndSession() is called while comparison is active, this panel is saved and restored as "visible"
-    auiMgr_.GetPane(compareStatus_->getAsWindow()).Hide();
+    progPane.Hide();
 
     auiMgr_.GetPane(m_panelSearch).Hide(); //no need to show it on startup
     auiMgr_.GetPane(m_panelLog   ).Hide(); //
@@ -1197,7 +1208,7 @@ void MainDialog::copySelectionToClipboard(const std::vector<const Grid*>& gridRe
     }
     catch (const std::bad_alloc& e)
     {
-        showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setMainInstructions(_("Out of memory.") + L" " + utfTo<std::wstring>(e.what())));
+        showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setMainInstructions(_("Out of memory.") + L" " + utfTo<std::wstring>(e.what())));
     }
 }
 
@@ -1464,7 +1475,7 @@ void MainDialog::openExternalApplication(const Zstring& commandLinePhrase, bool
             {
                     openWithDefaultApplication(utfTo<Zstring>(AFS::getDisplayPath(folderPath))); //throw FileError
             }
-            catch (const FileError& e) { showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString())); }
+            catch (const FileError& e) { showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString())); }
         };
 
         if (selectionLeft.empty() && selectionRight.empty())
@@ -1490,7 +1501,7 @@ void MainDialog::openExternalApplication(const Zstring& commandLinePhrase, bool
         if (globalCfg_.confirmDlgs.confirmCommandMassInvoke)
         {
             bool dontAskAgain = false;
-            switch (showConfirmationDialog(this, DialogInfoType::WARNING, PopupDialogCfg().
+            switch (showConfirmationDialog(this, DialogInfoType::warning, PopupDialogCfg().
                                            setTitle(_("Confirm")).
                                            setMainInstructions(replaceCpy(_P("Do you really want to execute the command %y for one item?",
                                                                              "Do you really want to execute the command %y for %x items?", invokeCount),
@@ -1498,10 +1509,10 @@ void MainDialog::openExternalApplication(const Zstring& commandLinePhrase, bool
                                            setCheckBox(dontAskAgain, _("&Don't show this warning again")),
                                            _("&Execute")))
             {
-                case ConfirmationButton::ACCEPT:
+                case ConfirmationButton::accept:
                     globalCfg_.confirmDlgs.confirmCommandMassInvoke = !dontAskAgain;
                     break;
-                case ConfirmationButton::CANCEL:
+                case ConfirmationButton::cancel:
                     return;
             }
         }
@@ -1545,7 +1556,7 @@ void MainDialog::openExternalApplication(const Zstring& commandLinePhrase, bool
 
         setLastOperationLog(r.summary, r.errorLog);
 
-        if (r.summary.finalStatus == SyncResult::ABORTED)
+        if (r.summary.finalStatus == SyncResult::aborted)
             return;
 
         //updateGui(); -> not needed
@@ -1559,53 +1570,10 @@ void MainDialog::openExternalApplication(const Zstring& commandLinePhrase, bool
         invokeCommandLine< LEFT_SIDE>(cmdExpanded, selectionLeft,  tempFileBuf_); //throw FileError
         invokeCommandLine<RIGHT_SIDE>(cmdExpanded, selectionRight, tempFileBuf_); //
     }
-    catch (const FileError& e) { showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString())); }
+    catch (const FileError& e) { showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString())); }
 }
 
 
-void MainDialog::setStatusBarFileStats(size_t fileCountLeft,
-                                       size_t folderCountLeft,
-                                       uint64_t bytesLeft,
-                                       size_t fileCountRight,
-                                       size_t folderCountRight,
-                                       uint64_t bytesRight)
-{
-
-    //select state
-    bSizerFileStatus->Show(true);
-    m_staticTextFullStatus->Hide();
-
-    //update status information
-    bSizerStatusLeftDirectories->Show(folderCountLeft > 0);
-    bSizerStatusLeftFiles      ->Show(fileCountLeft   > 0);
-
-    setText(*m_staticTextStatusLeftDirs,  _P("1 directory", "%x directories", folderCountLeft));
-    setText(*m_staticTextStatusLeftFiles, _P("1 file", "%x files", fileCountLeft));
-    setText(*m_staticTextStatusLeftBytes, L"(" + formatFilesizeShort(bytesLeft) + L")");
-    //------------------------------------------------------------------------------
-    bSizerStatusRightDirectories->Show(folderCountRight > 0);
-    bSizerStatusRightFiles      ->Show(fileCountRight   > 0);
-
-    setText(*m_staticTextStatusRightDirs,  _P("1 directory", "%x directories", folderCountRight));
-    setText(*m_staticTextStatusRightFiles, _P("1 file", "%x files", fileCountRight));
-    setText(*m_staticTextStatusRightBytes, L"(" + formatFilesizeShort(bytesRight) + L")");
-    //------------------------------------------------------------------------------
-    wxString statusCenterNew;
-    if (filegrid::getDataView(*m_gridMainC).rowsTotal() > 0)
-    {
-        statusCenterNew = _P("Showing %y of 1 row", "Showing %y of %x rows", filegrid::getDataView(*m_gridMainC).rowsTotal());
-        replace(statusCenterNew, L"%y", formatNumber(filegrid::getDataView(*m_gridMainC).rowsOnView())); //%x is already used as plural form placeholder!
-    }
-
-    //fill middle text (considering flashStatusInformation())
-    if (oldStatusMsgs_.empty())
-        setText(*m_staticTextStatusCenter, statusCenterNew);
-    else
-        oldStatusMsgs_.front() = statusCenterNew;
-
-    m_panelStatusBar->Layout();
-}
-
 
 void MainDialog::flashStatusInformation(const wxString& text)
 {
@@ -2619,14 +2587,6 @@ void MainDialog::onGridLabelContextRim(Grid& grid, ColumnTypeRim type, bool left
 }
 
 
-void MainDialog::resetLayout()
-{
-    m_splitterMain->setSashOffset(0);
-    auiMgr_.LoadPerspective(defaultPerspective_);
-    updateGuiForFolderPair();
-}
-
-
 void MainDialog::onOpenMenuTools(wxMenuEvent& event)
 {
     //each layout menu item is either shown and owned by m_menuTools OR detached from m_menuTools and owned by detachedMenuItems_:
@@ -2652,11 +2612,20 @@ void MainDialog::onOpenMenuTools(wxMenuEvent& event)
 }
 
 
+void MainDialog::resetLayout()
+{
+
+    m_splitterMain->setSashOffset(0);
+    auiMgr_.LoadPerspective(defaultPerspective_);
+    updateGuiForFolderPair();
+}
+
+
 void MainDialog::OnContextSetLayout(wxMouseEvent& event)
 {
     ContextMenu menu;
 
-    menu.addItem(replaceCpy(_("&Reset layout"), L"&", L""), [&] { resetLayout(); }); //reuse translation from gui builder
+    menu.addItem(replaceCpy(_("&Reset layout"), L"&", L""), [&] { resetLayout(); }); //reuse translation from GUI builder
     //----------------------------------------------------------------------------------------
 
     bool addedSeparator = false;
@@ -2848,22 +2817,22 @@ void MainDialog::OnConfigSave(wxCommandEvent& event)
         {
             switch (getXmlType(activeCfgFilePath)) //throw FileError
             {
-                case XmlType::GUI:
+                case XmlType::gui:
                     trySaveConfig(&activeCfgFilePath);
                     break;
-                case XmlType::BATCH:
+                case XmlType::batch:
                     trySaveBatchConfig(&activeCfgFilePath);
                     break;
-                case XmlType::GLOBAL:
-                case XmlType::OTHER:
-                    showNotificationDialog(this, DialogInfoType::ERROR2,
+                case XmlType::global:
+                case XmlType::other:
+                    showNotificationDialog(this, DialogInfoType::error,
                                            PopupDialogCfg().setDetailInstructions(replaceCpy(_("File %x does not contain a valid configuration."), L"%x", fmtPath(activeCfgFilePath))));
                     break;
             }
         }
         catch (const FileError& e)
         {
-            showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+            showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
         }
 }
 
@@ -2920,7 +2889,7 @@ bool MainDialog::trySaveConfig(const Zstring* guiCfgPath) //return true if saved
     }
     catch (const FileError& e)
     {
-        showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+        showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
         return false;
     }
 }
@@ -2940,7 +2909,7 @@ bool MainDialog::trySaveBatchConfig(const Zstring* batchCfgPath)
         if (batchCfgPath)
             referenceBatchFile = *batchCfgPath;
         else if (!activeCfgFilePath.empty())
-            if (getXmlType(activeCfgFilePath) == XmlType::BATCH) //throw FileError
+            if (getXmlType(activeCfgFilePath) == XmlType::batch) //throw FileError
                 referenceBatchFile = activeCfgFilePath;
 
         if (!referenceBatchFile.empty())
@@ -2955,7 +2924,7 @@ bool MainDialog::trySaveBatchConfig(const Zstring* batchCfgPath)
     }
     catch (const FileError& e)
     {
-        showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+        showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
         return false;
     }
 
@@ -3004,7 +2973,7 @@ bool MainDialog::trySaveBatchConfig(const Zstring* batchCfgPath)
     }
     catch (const FileError& e)
     {
-        showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+        showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
         return false;
     }
 }
@@ -3024,41 +2993,41 @@ bool MainDialog::saveOldConfig() //return false on user abort
                 //only if check is active and non-default config file loaded
             {
                 bool neverSaveChanges = false;
-                switch (showQuestionDialog(this, DialogInfoType::INFO, PopupDialogCfg().
+                switch (showQuestionDialog(this, DialogInfoType::info, PopupDialogCfg().
                                            setTitle(utfTo<wxString>(activeCfgFilePath)).
                                            setMainInstructions(replaceCpy(_("Do you want to save changes to %x?"), L"%x",
                                                                           fmtPath(afterLast(activeCfgFilePath, FILE_NAME_SEPARATOR, IF_MISSING_RETURN_ALL)))).
-                                           setCheckBox(neverSaveChanges, _("Never save &changes"), QuestionButton2::YES),
+                                           setCheckBox(neverSaveChanges, _("Never save &changes"), QuestionButton2::yes),
                                            _("&Save"), _("Do&n't save")))
                 {
-                    case QuestionButton2::YES: //save
+                    case QuestionButton2::yes: //save
                         try
                         {
                             switch (getXmlType(activeCfgFilePath)) //throw FileError
                             {
-                                case XmlType::GUI:
+                                case XmlType::gui:
                                     return trySaveConfig(&activeCfgFilePath);
-                                case XmlType::BATCH:
+                                case XmlType::batch:
                                     return trySaveBatchConfig(&activeCfgFilePath);
-                                case XmlType::GLOBAL:
-                                case XmlType::OTHER:
-                                    showNotificationDialog(this, DialogInfoType::ERROR2,
+                                case XmlType::global:
+                                case XmlType::other:
+                                    showNotificationDialog(this, DialogInfoType::error,
                                                            PopupDialogCfg().setDetailInstructions(replaceCpy(_("File %x does not contain a valid configuration."), L"%x", fmtPath(activeCfgFilePath))));
                                     return false;
                             }
                         }
                         catch (const FileError& e)
                         {
-                            showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+                            showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
                             return false;
                         }
                         break;
 
-                    case QuestionButton2::NO: //don't save
+                    case QuestionButton2::no: //don't save
                         globalCfg_.confirmDlgs.popupOnConfigChange = !neverSaveChanges;
                         break;
 
-                    case QuestionButton2::CANCEL:
+                    case QuestionButton2::cancel:
                         return false;
                 }
             }
@@ -3153,7 +3122,7 @@ bool MainDialog::loadConfiguration(const std::vector<Zstring>& filePaths)
 
             if (!warningMsg.empty())
             {
-                showNotificationDialog(this, DialogInfoType::WARNING, PopupDialogCfg().setDetailInstructions(warningMsg));
+                showNotificationDialog(this, DialogInfoType::warning, PopupDialogCfg().setDetailInstructions(warningMsg));
                 setConfig(newGuiCfg, filePaths);
                 setLastUsedConfig(XmlGuiConfig(), filePaths); //simulate changed config due to parsing errors
                 return true;
@@ -3161,7 +3130,7 @@ bool MainDialog::loadConfiguration(const std::vector<Zstring>& filePaths)
         }
         catch (const FileError& e)
         {
-            showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+            showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
             return false;
         }
 
@@ -3217,7 +3186,7 @@ void MainDialog::renameSelectedCfgHistoryItem()
             return;
 
         if (cfg->isLastRunCfg)
-            return showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(
+            return showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(
                                               replaceCpy(_("%x cannot be renamed."), L"%x", fmtPath(cfg->name))));
 
         const Zstring cfgPathOld = cfg->cfgItem.cfgFilePath;
@@ -3258,7 +3227,7 @@ void MainDialog::renameSelectedCfgHistoryItem()
 
             moveAndRenameItem(cfgPathOld, cfgPathNew, false /*replaceExisting*/); //throw FileError, (ErrorMoveUnsupported), ErrorTargetExisting
         }
-        catch (const FileError& e) { return showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString())); }
+        catch (const FileError& e) { return showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString())); }
 
         cfggrid::getDataView(*m_gridCfgHistory).removeItems({ cfgPathOld });
         m_gridCfgHistory->Refresh(); //grid size changed => clears selection!
@@ -3427,6 +3396,7 @@ void MainDialog::setLastUsedConfig(const XmlGuiConfig& guiConfig, const std::vec
 
 void MainDialog::setConfig(const XmlGuiConfig& newGuiCfg, const std::vector<Zstring>& referenceFiles)
 {
+
     currentCfg_ = newGuiCfg;
 
     //evaluate new settings...
@@ -3842,7 +3812,7 @@ void MainDialog::OnCompare(wxCommandEvent& event)
 
     setLastOperationLog(r.summary, r.errorLog);
 
-    if (r.summary.finalStatus == SyncResult::ABORTED)
+    if (r.summary.finalStatus == SyncResult::aborted)
         return updateGui(); //refresh grid in ANY case! (also on abort)
 
 
@@ -3858,8 +3828,13 @@ void MainDialog::OnCompare(wxCommandEvent& event)
 
     //play (optional) sound notification
     if (!globalCfg_.soundFileCompareFinished.empty() && fileAvailable(globalCfg_.soundFileCompareFinished))
+    {
+        //wxWidgets shows modal error dialog by default => NO!
+        wxLog* oldLogTarget = wxLog::SetActiveTarget(new wxLogStderr); //transfer and receive ownership!
+        ZEN_ON_SCOPE_EXIT(delete wxLog::SetActiveTarget(oldLogTarget));
+
         wxSound::Play(utfTo<wxString>(globalCfg_.soundFileCompareFinished), wxSOUND_ASYNC);
-    //warning: this may fail and show a wxWidgets error message! => must not play when running FFS without user interaction!
+    }
 
     if (!IsActive())
         RequestUserAttention();
@@ -3878,7 +3853,7 @@ void MainDialog::OnCompare(wxCommandEvent& event)
         flashStatusInformation(_("All files are in sync"));
 
         //update last sync date for selected cfg files https://freefilesync.org/forum/viewtopic.php?t=4991
-        if (r.summary.finalStatus == SyncResult::FINISHED_WITH_SUCCESS)
+        if (r.summary.finalStatus == SyncResult::finishedSuccess)
             updateConfigLastRunStats(std::chrono::system_clock::to_time_t(startTime), r.summary.finalStatus, getNullPath() /*logFilePath*/);
     }
 }
@@ -3886,6 +3861,7 @@ void MainDialog::OnCompare(wxCommandEvent& event)
 
 void MainDialog::updateGui()
 {
+
     updateGridViewData(); //update gridDataView and write status information
 
     updateStatistics();
@@ -4099,7 +4075,7 @@ void MainDialog::OnStartSync(wxCommandEvent& event)
                 shutdownSystem(); //throw FileError
                 terminateProcess(0 /*exitCode*/); //no point in continuing and saving cfg again in ~MainDialog()/onQueryEndSession() while the OS will kill us anytime!
             }
-            catch (const FileError& e) { showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString())); }
+            catch (const FileError& e) { showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString())); }
             //[!] ignores current error handling setting, BUT this is not a sync error!
             break;
     }
@@ -4279,13 +4255,13 @@ void MainDialog::setLastOperationLog(const ProcessSummary& summary, const std::s
     {
         switch (summary.finalStatus)
         {
-            case SyncResult::FINISHED_WITH_SUCCESS:
+            case SyncResult::finishedSuccess:
                 return getResourceImage(L"status_finished_success");
-            case SyncResult::FINISHED_WITH_WARNINGS:
+            case SyncResult::finishedWarning:
                 return getResourceImage(L"status_finished_warnings");
-            case SyncResult::FINISHED_WITH_ERROR:
+            case SyncResult::finishedError:
                 return getResourceImage(L"status_finished_errors");
-            case SyncResult::ABORTED:
+            case SyncResult::aborted:
                 return getResourceImage(L"status_aborted");
         }
         assert(false);
@@ -4296,12 +4272,12 @@ void MainDialog::setLastOperationLog(const ProcessSummary& summary, const std::s
     {
         switch (summary.finalStatus)
         {
-            case SyncResult::FINISHED_WITH_SUCCESS:
+            case SyncResult::finishedSuccess:
                 break;
-            case SyncResult::FINISHED_WITH_WARNINGS:
+            case SyncResult::finishedWarning:
                 return getResourceImage(L"msg_warning_sicon");
-            case SyncResult::FINISHED_WITH_ERROR:
-            case SyncResult::ABORTED:
+            case SyncResult::finishedError:
+            case SyncResult::aborted:
                 return getResourceImage(L"msg_error_sicon");
         }
         return wxNullBitmap;
@@ -4314,19 +4290,23 @@ void MainDialog::setLastOperationLog(const ProcessSummary& summary, const std::s
     m_staticTextItemsProcessed->SetLabel(formatNumber(summary.statsProcessed.items));
     m_staticTextBytesProcessed->SetLabel(L"(" + formatFilesizeShort(summary.statsProcessed.bytes) + L")");
 
-    if ((summary.statsTotal.items < 0 && summary.statsTotal.bytes < 0) || //no total items/bytes: e.g. for pure folder comparison
-        summary.statsProcessed == summary.statsTotal)  //...if everything was processed successfully
-        m_panelItemsRemaining->Hide();
-    else
+    const bool hideRemainingStats = (summary.statsTotal.items < 0 && summary.statsTotal.bytes < 0) || //no total items/bytes: e.g. for pure folder comparison
+                                    summary.statsProcessed == summary.statsTotal;  //...if everything was processed successfully
+
+    m_staticTextProcessed     ->Show(!hideRemainingStats);
+    m_staticTextRemaining     ->Show(!hideRemainingStats);
+    m_staticTextItemsRemaining->Show(!hideRemainingStats);
+    m_staticTextBytesRemaining->Show(!hideRemainingStats);
+
+    if (!hideRemainingStats)
     {
-        m_panelItemsRemaining->Show();
         m_staticTextItemsRemaining->SetLabel(              formatNumber(summary.statsTotal.items - summary.statsProcessed.items));
         m_staticTextBytesRemaining->SetLabel(L"(" + formatFilesizeShort(summary.statsTotal.bytes - summary.statsProcessed.bytes) + L")");
     }
 
     const int64_t totalTimeSec = std::chrono::duration_cast<std::chrono::seconds>(summary.totalTime).count();
 
-    m_staticTextTotalTime->SetLabel(wxTimeSpan::Seconds(totalTimeSec).Format(L"%H:%M:%S"));
+    m_staticTextTimeElapsed->SetLabel(wxTimeSpan::Seconds(totalTimeSec).Format(L"%H:%M:%S"));
     //totalTimeSec < 3600 ? wxTimeSpan::Seconds(totalTimeSec).Format(L"%M:%S") -> let's use full precision for max. clarity: https://freefilesync.org/forum/viewtopic.php?t=6308
 
     logPanel_->setLog(errorLog);
@@ -4513,7 +4493,7 @@ void MainDialog::OnSwapSides(wxCommandEvent& event)
     }
     catch (const FileError& e)
     {
-        showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+        showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
     }
 
     updateGui();
@@ -4674,6 +4654,49 @@ void MainDialog::updateGridViewData()
 }
 
 
+void MainDialog::setStatusBarFileStats(size_t fileCountLeft,
+                                       size_t folderCountLeft,
+                                       uint64_t bytesLeft,
+                                       size_t fileCountRight,
+                                       size_t folderCountRight,
+                                       uint64_t bytesRight)
+{
+    //select state
+    bSizerFileStatus->Show(true);
+    m_staticTextFullStatus->Hide();
+
+    //update status information
+    bSizerStatusLeftDirectories->Show(folderCountLeft > 0);
+    bSizerStatusLeftFiles      ->Show(fileCountLeft   > 0);
+
+    setText(*m_staticTextStatusLeftDirs,  _P("1 directory", "%x directories", folderCountLeft));
+    setText(*m_staticTextStatusLeftFiles, _P("1 file", "%x files", fileCountLeft));
+    setText(*m_staticTextStatusLeftBytes, L"(" + formatFilesizeShort(bytesLeft) + L")");
+    //------------------------------------------------------------------------------
+    bSizerStatusRightDirectories->Show(folderCountRight > 0);
+    bSizerStatusRightFiles      ->Show(fileCountRight   > 0);
+
+    setText(*m_staticTextStatusRightDirs,  _P("1 directory", "%x directories", folderCountRight));
+    setText(*m_staticTextStatusRightFiles, _P("1 file", "%x files", fileCountRight));
+    setText(*m_staticTextStatusRightBytes, L"(" + formatFilesizeShort(bytesRight) + L")");
+    //------------------------------------------------------------------------------
+    wxString statusCenterNew;
+    if (filegrid::getDataView(*m_gridMainC).rowsTotal() > 0)
+    {
+        statusCenterNew = _P("Showing %y of 1 row", "Showing %y of %x rows", filegrid::getDataView(*m_gridMainC).rowsTotal());
+        replace(statusCenterNew, L"%y", formatNumber(filegrid::getDataView(*m_gridMainC).rowsOnView())); //%x is already used as plural form placeholder!
+    }
+
+    //fill middle text (considering flashStatusInformation())
+    if (oldStatusMsgs_.empty())
+        setText(*m_staticTextStatusCenter, statusCenterNew);
+    else
+        oldStatusMsgs_.front() = statusCenterNew;
+
+    m_panelStatusBar->Layout();
+}
+
+
 void MainDialog::applyFilterConfig()
 {
     applyFiltering(folderCmp_, getConfig().mainCfg);
@@ -4691,7 +4714,7 @@ void MainDialog::applySyncDirections()
     }
     catch (const FileError& e)
     {
-        showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+        showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
     }
     updateGui();
 }
@@ -4793,7 +4816,7 @@ void MainDialog::startFindNext(bool searchAscending) //F3 or ENTER in m_textCtrl
         else
         {
             showFindPanel();
-            showNotificationDialog(this, DialogInfoType::INFO, PopupDialogCfg().
+            showNotificationDialog(this, DialogInfoType::info, PopupDialogCfg().
                                    setTitle(_("Find")).
                                    setMainInstructions(replaceCpy(_("Cannot find %x"), L"%x", fmtPath(searchString))));
         }
@@ -4959,7 +4982,6 @@ void MainDialog::onAddFolderPairKeyEvent(wxKeyEvent& event)
 
 void MainDialog::updateGuiForFolderPair()
 {
-
     recalcMaxFolderPairsVisible();
 
     //adapt delete top folder pair button
@@ -5129,7 +5151,6 @@ void MainDialog::removeAddFolderPair(size_t pos)
 
 void MainDialog::setAddFolderPairs(const std::vector<LocalPairConfig>& newPairs)
 {
-
     additionalFolderPairs_.clear();
     bSizerAddFolderPairs->Clear(true);
 
@@ -5163,7 +5184,7 @@ void MainDialog::OnMenuExportFileList(wxCommandEvent& event)
 
     const Zstring filePath = utfTo<Zstring>(filePicker.GetPath());
 
-    //http://en.wikipedia.org/wiki/Comma-separated_values
+    //https://en.wikipedia.org/wiki/Comma-separated_values
     const lconv* localInfo = ::localeconv(); //always bound according to doc
     const bool haveCommaAsDecimalSep = std::string(localInfo->decimal_point) == ",";
 
@@ -5272,7 +5293,7 @@ void MainDialog::OnMenuExportFileList(wxCommandEvent& event)
         }
         catch (const FileError& e)
         {
-            showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+            showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
         }
     }
 }
diff --git a/FreeFileSync/Source/ui/progress_indicator.cpp b/FreeFileSync/Source/ui/progress_indicator.cpp
index 8e07f890..f3339193 100644
--- a/FreeFileSync/Source/ui/progress_indicator.cpp
+++ b/FreeFileSync/Source/ui/progress_indicator.cpp
@@ -26,6 +26,7 @@
 #include "gui_generated.h"
 #include "../base/ffs_paths.h"
 #include "../base/perf_check.h"
+#include "../base/icon_buffer.h"
 #include "tray_icon.h"
 #include "taskbar.h"
 #include "log_panel.h"
@@ -180,12 +181,13 @@ CompareProgressDialog::Impl::Impl(wxFrame& parentWindow) :
     CompareProgressDlgGenerated(&parentWindow),
     parentWindow_(parentWindow)
 {
+    m_bitmapItemStat->SetBitmap(IconBuffer::genericFileIcon(IconBuffer::SIZE_SMALL));
+    m_bitmapTimeStat->SetBitmap(getResourceImage(L"cmp_file_time_sicon"));
+
     m_bitmapIgnoreErrors->SetBitmap(getResourceImage(L"error_ignore_active"));
     m_bitmapRetryErrors ->SetBitmap(getResourceImage(L"error_retry"));
 
-    //make sure that standard height matches PHASE_COMPARING_CONTENT statistics layout
-    m_staticTextItemsFoundLabel->Hide();
-    m_staticTextItemsFound     ->Hide();
+    //make sure that standard height matches PHASE_COMPARING_CONTENT statistics layout (== largest)
 
     //init graph
     m_panelProgressGraph->setAttributes(Graph2D::MainAttributes().setMinY(0).setMaxY(2).
@@ -200,7 +202,8 @@ CompareProgressDialog::Impl::Impl(wxFrame& parentWindow) :
     m_panelProgressGraph->addCurve(std::make_shared<CurveDataProgressSeparatorLine>(), Graph2D::CurveAttributes().setLineWidth(1).setColor(Graph2D::getBorderColor()));
 
     Layout();
-    m_panelStatistics->Layout();
+    m_panelItemStats->Layout();
+    m_panelTimeStats->Layout();
 
     GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize()
     //=> works like a charm for GTK2 with window resizing problems and title bar corruption; e.g. Debian!!!
@@ -218,22 +221,8 @@ void CompareProgressDialog::Impl::init(const Statistics& syncStat, bool ignoreEr
     }
     catch (const TaskbarNotAvailable&) {}
 
-    //initialize progress indicator
-    bSizerProgressGraph->Show(false);
-
-    perf_ = PerfCheck(WINDOW_REMAINING_TIME, WINDOW_BYTES_PER_SEC);
     stopWatch_.restart(); //measure total time
 
-    //initially hide status that's relevant for comparing bytewise only
-    m_staticTextItemsFoundLabel->Show();
-    m_staticTextItemsFound     ->Show();
-
-    m_staticTextItemsRemainingLabel->Hide();
-    bSizerItemsRemaining           ->Show(false);
-
-    m_staticTextTimeRemainingLabel->Hide();
-    m_staticTextTimeRemaining     ->Hide();
-
     setText(*m_staticTextRetryCount, std::wstring(L"(") + formatNumber(automaticRetryCount) + MULT_SIGN + L")");
     bSizerErrorsRetry->Show(automaticRetryCount > 0);
 
@@ -241,10 +230,8 @@ void CompareProgressDialog::Impl::init(const Statistics& syncStat, bool ignoreEr
     ignoreErrors_ = ignoreErrors;
 
     updateStaticGui();
-    updateProgressGui();
 
-    Layout();
-    m_panelStatistics->Layout();
+    initNewPhase();
 }
 
 
@@ -263,31 +250,23 @@ void CompareProgressDialog::Impl::initNewPhase()
     timeLastSpeedEstimate_ = std::chrono::seconds(-100); //make sure estimate is updated upon next check
     phaseStart_ = stopWatch_.elapsed();
 
-    switch (syncStat_->currentPhase())
-    {
-        case ProcessCallback::PHASE_NONE:
-            assert(false);
-        case ProcessCallback::PHASE_SCANNING:
-            break;
-
-        case ProcessCallback::PHASE_COMPARING_CONTENT:
-        case ProcessCallback::PHASE_SYNCHRONIZING:
-            bSizerProgressGraph->Show(true);
+    const int     itemsTotal = syncStat_->getStatsTotal(syncStat_->currentPhase()).items;
+    const int64_t bytesTotal = syncStat_->getStatsTotal(syncStat_->currentPhase()).bytes;
 
-            //show status for comparing bytewise
-            m_staticTextItemsFoundLabel->Hide();
-            m_staticTextItemsFound     ->Hide();
+    const bool haveTotalStats = itemsTotal >= 0 || bytesTotal >= 0;
 
-            m_staticTextItemsRemainingLabel->Show();
-            bSizerItemsRemaining           ->Show(true);
+    if (taskbar_.get()) taskbar_->setStatus(haveTotalStats ? Taskbar::STATUS_NORMAL : Taskbar::STATUS_INDETERMINATE);
 
-            m_staticTextTimeRemainingLabel->Show();
-            m_staticTextTimeRemaining     ->Show();
+    m_staticTextProcessed     ->Show(haveTotalStats);
+    m_staticTextRemaining     ->Show(haveTotalStats);
+    m_staticTextItemsRemaining->Show(haveTotalStats);
+    m_staticTextBytesRemaining->Show(haveTotalStats);
+    m_staticTextTimeRemaining ->Show(haveTotalStats);
+    bSizerProgressGraph       ->Show(haveTotalStats);
 
-            Layout();
-            m_panelStatistics->Layout();
-            break;
-    }
+    Layout();
+    m_panelItemStats->Layout();
+    m_panelTimeStats->Layout();
 
     updateProgressGui();
 }
@@ -320,86 +299,89 @@ void CompareProgressDialog::Impl::updateProgressGui()
     const int     itemsTotal   = syncStat_->getStatsTotal  (syncStat_->currentPhase()).items;
     const int64_t bytesTotal   = syncStat_->getStatsTotal  (syncStat_->currentPhase()).bytes;
 
+    const bool haveTotalStats = itemsTotal >= 0 || bytesTotal >= 0;
+
     //status texts
     setText(*m_staticTextStatus, replaceCpy(syncStat_->currentStatusText(), L'\n', L' ')); //no layout update for status texts!
 
-    //write status information to taskbar, parent title etc.
-    switch (syncStat_->currentPhase())
+    if (!haveTotalStats)
     {
-        case ProcessCallback::PHASE_NONE:
-        case ProcessCallback::PHASE_SCANNING:
-        {
-            const wxString& scannedObjects = formatNumber(itemsCurrent);
-
-            //dialog caption, taskbar
-            setTitle(scannedObjects + L" | " + getDialogPhaseText(*syncStat_, false /*paused*/));
-            if (taskbar_.get()) //support Windows 7 taskbar
-                taskbar_->setStatus(Taskbar::STATUS_INDETERMINATE);
+        //dialog caption, taskbar
+        setTitle(formatNumber(itemsCurrent) + L" | " + getDialogPhaseText(*syncStat_, false /*paused*/));
 
-            //nr of scanned objects
-            setText(*m_staticTextItemsFound, scannedObjects, &layoutChanged);
-        }
-        break;
-
-        case ProcessCallback::PHASE_SYNCHRONIZING:
-        case ProcessCallback::PHASE_COMPARING_CONTENT:
-        {
-            //add both bytes + item count, to handle "deletion-only" cases
-            const double fractionTotal = bytesTotal + itemsTotal == 0 ? 0 : 1.0 * (bytesCurrent + itemsCurrent) / (bytesTotal + itemsTotal);
-            const double fractionBytes = bytesTotal == 0 ? 0 : 1.0 * bytesCurrent / bytesTotal;
-            const double fractionItems = itemsTotal == 0 ? 0 : 1.0 * itemsCurrent / itemsTotal;
-
-            //dialog caption, taskbar
-            setTitle(formatFraction(fractionTotal) + L" | " + getDialogPhaseText(*syncStat_, false /*paused*/));
-            if (taskbar_.get())
-            {
-                taskbar_->setProgress(fractionTotal);
-                taskbar_->setStatus(Taskbar::STATUS_NORMAL);
-            }
-
-            //progress indicator, shown for binary comparison only
-            curveDataBytes_->setFraction(fractionBytes);
-            curveDataItems_->setFraction(fractionItems);
-
-            //remaining item and byte count
-            setText(*m_staticTextItemsRemaining, formatNumber(itemsTotal - itemsCurrent), &layoutChanged);
-            setText(*m_staticTextBytesRemaining, L"(" + formatFilesizeShort(bytesTotal - bytesCurrent) + L")", &layoutChanged);
+        //progress indicators
+        //taskbar_ already set to STATUS_INDETERMINATE within initNewPhase()
+    }
+    else
+    {
+        //add both bytes + item count, to handle "deletion-only" cases
+        const double fractionTotal = bytesTotal + itemsTotal == 0 ? 0 : 1.0 * (bytesCurrent + itemsCurrent) / (bytesTotal + itemsTotal);
+        const double fractionBytes = bytesTotal == 0 ? 0 : 1.0 * bytesCurrent / bytesTotal;
+        const double fractionItems = itemsTotal == 0 ? 0 : 1.0 * itemsCurrent / itemsTotal;
 
-            //remaining time and speed: only visible during binary comparison
-            if (numeric::dist(timeLastSpeedEstimate_, timeElapsed) >= SPEED_ESTIMATE_UPDATE_INTERVAL)
-            {
-                timeLastSpeedEstimate_ = timeElapsed;
+        //dialog caption, taskbar
+        setTitle(formatFraction(fractionTotal) + L" | " + getDialogPhaseText(*syncStat_, false /*paused*/));
 
-                if (numeric::dist(phaseStart_, timeElapsed) >= SPEED_ESTIMATE_SAMPLE_INTERVAL) //discard stats for first second: probably messy
-                    perf_.addSample(timeElapsed, itemsCurrent, bytesCurrent);
+        //progress indicators
+        if (taskbar_.get()) taskbar_->setProgress(fractionTotal);
 
-                //current speed -> Win 7 copy uses 1 sec update interval instead
-                std::optional<std::wstring> bps = perf_.getBytesPerSecond();
-                std::optional<std::wstring> ips = perf_.getItemsPerSecond();
-                m_panelProgressGraph->setAttributes(m_panelProgressGraph->getAttributes().setCornerText(bps ? *bps : L"", Graph2D::CORNER_TOP_LEFT));
-                m_panelProgressGraph->setAttributes(m_panelProgressGraph->getAttributes().setCornerText(ips ? *ips : L"", Graph2D::CORNER_BOTTOM_LEFT));
+        curveDataBytes_->setFraction(fractionBytes);
+        curveDataItems_->setFraction(fractionItems);
+    }
 
-                //remaining time: display with relative error of 10% - based on samples taken every 0.5 sec only
-                //-> call more often than once per second to correctly show last few seconds countdown, but don't call too often to avoid occasional jitter
-                std::optional<double> remTimeSec = perf_.getRemainingTimeSec(bytesTotal - bytesCurrent);
-                setText(*m_staticTextTimeRemaining, remTimeSec ? formatRemainingTime(*remTimeSec) : L"-", &layoutChanged);
-            }
+    //item and data stats
+    if (!haveTotalStats)
+    {
+        setText(*m_staticTextItemsProcessed, formatNumber(itemsCurrent), &layoutChanged);
+        setText(*m_staticTextBytesProcessed, L"", &layoutChanged);
+    }
+    else
+    {
+        setText(*m_staticTextItemsProcessed,               formatNumber(itemsCurrent), &layoutChanged);
+        setText(*m_staticTextBytesProcessed, L"(" + formatFilesizeShort(bytesCurrent) + L")", &layoutChanged);
 
-            m_panelProgressGraph->Refresh();
-        }
-        break;
+        setText(*m_staticTextItemsRemaining, formatNumber(itemsTotal - itemsCurrent), &layoutChanged);
+        setText(*m_staticTextBytesRemaining, L"(" + formatFilesizeShort(bytesTotal - bytesCurrent) + L")", &layoutChanged);
     }
 
+    //current time elapsed
     const int64_t timeElapSec = std::chrono::duration_cast<std::chrono::seconds>(timeElapsed).count();
 
     setText(*m_staticTextTimeElapsed, timeElapSec < 3600 ?
             wxTimeSpan::Seconds(timeElapSec).Format(   L"%M:%S") :
             wxTimeSpan::Seconds(timeElapSec).Format(L"%H:%M:%S"), &layoutChanged);
 
+    if (numeric::dist(timeLastSpeedEstimate_, timeElapsed) >= SPEED_ESTIMATE_UPDATE_INTERVAL)
+    {
+        if (haveTotalStats) //remaining time and speed: only visible during binary comparison
+        {
+            timeLastSpeedEstimate_ = timeElapsed;
+
+            if (numeric::dist(phaseStart_, timeElapsed) >= SPEED_ESTIMATE_SAMPLE_INTERVAL) //discard stats for first second: probably messy
+                perf_.addSample(timeElapsed, itemsCurrent, bytesCurrent);
+
+            //current speed -> Win 7 copy uses 1 sec update interval instead
+            std::optional<std::wstring> bps = perf_.getBytesPerSecond();
+            std::optional<std::wstring> ips = perf_.getItemsPerSecond();
+            m_panelProgressGraph->setAttributes(m_panelProgressGraph->getAttributes().setCornerText(bps ? *bps : L"", Graph2D::CORNER_TOP_LEFT));
+            m_panelProgressGraph->setAttributes(m_panelProgressGraph->getAttributes().setCornerText(ips ? *ips : L"", Graph2D::CORNER_BOTTOM_LEFT));
+
+            //remaining time: display with relative error of 10% - based on samples taken every 0.5 sec only
+            //-> call more often than once per second to correctly show last few seconds countdown, but don't call too often to avoid occasional jitter
+            std::optional<double> remTimeSec = perf_.getRemainingTimeSec(bytesTotal - bytesCurrent);
+            setText(*m_staticTextTimeRemaining, remTimeSec ? formatRemainingTime(*remTimeSec) : std::wstring(1, EM_DASH), &layoutChanged);
+        }
+    }
+
+    if (haveTotalStats)
+        m_panelProgressGraph->Refresh();
+
+    //adapt layout after content changes above
     if (layoutChanged)
     {
         Layout();
-        m_panelStatistics->Layout();
+        m_panelItemStats->Layout();
+        m_panelTimeStats->Layout();
     }
 
     //do the ui update
@@ -656,8 +638,7 @@ class SyncProgressDialogImpl : public TopLevelDialog, public SyncProgressDialog
 public:
     SyncProgressDialogImpl(long style, //wxFrame/wxDialog style
                            const std::function<wxFrame*(TopLevelDialog& progDlg)>& getTaskbarFrame,
-                           AbortCallback& abortCb,
-                           const std::function<void()>& notifyWindowTerminate,
+                           const std::function<void()>& userRequestAbort,
                            const Statistics& syncStat,
                            wxFrame* parentFrame,
                            bool showProgress,
@@ -668,11 +649,8 @@ public:
                            bool ignoreErrors,
                            size_t automaticRetryCount,
                            PostSyncAction2 postSyncAction);
-    ~SyncProgressDialogImpl() override;
 
-    //call this in StatusUpdater derived class destructor at the LATEST(!) to prevent access to currentStatusUpdater
-    void showSummary(SyncResult finalStatus, const std::shared_ptr<const ErrorLog>& log /*bound!*/) override;
-    void closeDirectly(bool restoreParentFrame) override;
+    Result destroy(bool autoClose, bool restoreParentFrame, SyncResult finalStatus, const std::shared_ptr<const zen::ErrorLog>& log /*bound!*/) override;
 
     wxWindow* getWindowIfVisible() override { return this->IsShown() ? this : nullptr; }
     //workaround OS X bug: if "this" is used as parent window for a modal dialog then this dialog will erroneously un-hide its parent!
@@ -710,6 +688,8 @@ private:
     void OnMinimizeToTray(wxCommandEvent& event) { minimizeToTray(); }
     //void OnToggleIgnoreErrors(wxCommandEvent& event) { updateStaticGui(); }
 
+    void showSummary(SyncResult finalStatus, const std::shared_ptr<const ErrorLog>& log /*bound!*/);
+
     void minimizeToTray();
     void resumeFromSystray();
 
@@ -727,14 +707,12 @@ private:
 
     wxFrame* parentFrame_; //optional
 
-    std::function<void()> notifyWindowTerminate_; //call once in OnClose(), NOT in destructor which is called far too late somewhere in wxWidgets main loop!
+    const std::function<void()> userRequestAbort_; //cancel button or dialog close
 
     //status variables
-    const Statistics* syncStat_;                  //
-    AbortCallback*    abortCb_;                   //valid only while sync is running
+    const Statistics* syncStat_; //valid only while sync is running
     bool paused_ = false;
-    const std::shared_ptr<int> lifeSign_ = std::make_shared<int>(42); //only bound while instance exists, see pause handling in updateProgressGui()
-    //wxWindow::Delete(), equals "delete this" on OS X!
+    bool okayPressed_ = false;
 
     //remaining time
     PerfCheck perf_{ WINDOW_REMAINING_TIME, WINDOW_BYTES_PER_SEC };
@@ -762,8 +740,7 @@ private:
 template <class TopLevelDialog>
 SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxFrame/wxDialog style
                                                                const std::function<wxFrame*(TopLevelDialog& progDlg)>& getTaskbarFrame,
-                                                               AbortCallback& abortCb,
-                                                               const std::function<void()>& notifyWindowTerminate,
+                                                               const std::function<void()>& userRequestAbort,
                                                                const Statistics& syncStat,
                                                                wxFrame* parentFrame,
                                                                bool showProgress,
@@ -780,9 +757,8 @@ SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxF
     jobName_  (jobName),
     soundFileSyncComplete_(soundFileSyncComplete),
     parentFrame_(parentFrame),
-    notifyWindowTerminate_(notifyWindowTerminate),
-    syncStat_ (&syncStat),
-    abortCb_  (&abortCb)
+    userRequestAbort_(userRequestAbort),
+    syncStat_(&syncStat)
 {
     static_assert(std::is_same_v<TopLevelDialog, wxFrame > ||
                   std::is_same_v<TopLevelDialog, wxDialog>);
@@ -829,15 +805,17 @@ SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxF
         }
         catch (const TaskbarNotAvailable&) {}
 
-    //hide "processed" statistics until end of process
+    //hide until end of process:
     pnl_.m_notebookResult     ->Hide();
-    pnl_.m_panelItemsProcessed->Hide();
     pnl_.m_buttonClose        ->Show(false);
     //set std order after button visibility was set
     setStandardButtonLayout(*pnl_.bSizerStdButtons, StdButtons().setAffirmative(pnl_.m_buttonPause).setCancel(pnl_.m_buttonStop));
 
     pnl_.m_bpButtonMinimizeToTray->SetBitmapLabel(getResourceImage(L"minimize_to_tray"));
 
+    pnl_.m_bitmapItemStat->SetBitmap(IconBuffer::genericFileIcon(IconBuffer::SIZE_SMALL));
+    pnl_.m_bitmapTimeStat->SetBitmap(getResourceImage(L"cmp_file_time_sicon"));
+
     pnl_.m_bitmapIgnoreErrors->SetBitmap(getResourceImage(L"error_ignore_active"));
     pnl_.m_bitmapRetryErrors ->SetBitmap(getResourceImage(L"error_retry"));
 
@@ -880,17 +858,20 @@ SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxF
     pnl_.m_bitmapGraphKeyBytes->SetBitmap(generateSquareBitmap(getColorBytes(), getColorBytesRim()));
     pnl_.m_bitmapGraphKeyItems->SetBitmap(generateSquareBitmap(getColorItems(), getColorItemsRim()));
 
+
+    pnl_.bSizerDynSpace->SetMinSize(yLabelWidth, -1); //ensure item/time stats are nicely centered
+
     setText(*pnl_.m_staticTextRetryCount, std::wstring(L"(") + formatNumber(automaticRetryCount) + MULT_SIGN + L")");
     pnl_.bSizerErrorsRetry->Show(automaticRetryCount > 0);
 
     //allow changing a few options dynamically during sync
     ignoreErrors_ = ignoreErrors;
 
-    enumPostSyncAction_.add(PostSyncAction2::NONE, L"");
+    enumPostSyncAction_.add(PostSyncAction2::none, L"");
     if (parentFrame_) //enable EXIT option for gui mode sync
-        enumPostSyncAction_.add(PostSyncAction2::EXIT, replaceCpy(_("E&xit"), L"&", L"")); //reuse translation
-    enumPostSyncAction_.add(PostSyncAction2::SLEEP,    _("System: Sleep"));
-    enumPostSyncAction_.add(PostSyncAction2::SHUTDOWN, _("System: Shut down"));
+        enumPostSyncAction_.add(PostSyncAction2::exit, replaceCpy(_("E&xit"), L"&", L"")); //reuse translation
+    enumPostSyncAction_.add(PostSyncAction2::sleep,    _("System: Sleep"));
+    enumPostSyncAction_.add(PostSyncAction2::shutdown, _("System: Shut down"));
 
     setEnumVal(enumPostSyncAction_, *pnl_.m_choicePostSyncAction, postSyncAction);
 
@@ -898,6 +879,8 @@ SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxF
 
     updateStaticGui(); //null-status will be shown while waiting for dir locks
 
+    //make sure that standard height matches PHASE_COMPARING_CONTENT statistics layout (== largest)
+
     this->GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize()
     pnl_.Layout();
     this->Center(); //call *after* dialog layout update and *before* wxWindow::Show()!
@@ -916,26 +899,6 @@ SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxF
 
 
 template <class TopLevelDialog>
-SyncProgressDialogImpl<TopLevelDialog>::~SyncProgressDialogImpl()
-{
-    if (parentFrame_)
-    {
-        parentFrame_->Disconnect(wxEVT_CHAR_HOOK, wxKeyEventHandler(SyncProgressDialogImpl::onParentKeyEvent), nullptr, this);
-
-        parentFrame_->SetTitle(parentTitleBackup_); //restore title text
-
-        //make sure main dialog is shown again if still "minimized to systray"! see SyncProgressDialog::closeDirectly()
-        parentFrame_->Show();
-        //if (parentFrame_->IsIconized()) //caveat: if window is maximized calling Iconize(false) will erroneously un-maximize!
-        //    parentFrame_->Iconize(false);
-    }
-    //else: don't call "TransformProcessType": consider "switch to main dialog" option during silent batch run
-
-    //our client is NOT expecting a second call via notifyWindowTerminate_()!
-}
-
-
-template <class TopLevelDialog>
 void SyncProgressDialogImpl<TopLevelDialog>::onLocalKeyEvent(wxKeyEvent& event)
 {
     switch (event.GetKeyCode())
@@ -1067,11 +1030,12 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateProgressGui(bool allowYield)
     const int     itemsTotal   = syncStat_->getStatsTotal  (syncStat_->currentPhase()).items;
     const int64_t bytesTotal   = syncStat_->getStatsTotal  (syncStat_->currentPhase()).bytes;
 
-    //sync status text
-    setText(*pnl_.m_staticTextStatus, replaceCpy(syncStat_->currentStatusText(), L'\n', L' ')); //no layout update for status texts!
+    const bool haveTotalStats = itemsTotal >= 0 || bytesTotal >= 0;
 
+    //status texts
+    setText(*pnl_.m_staticTextStatus, replaceCpy(syncStat_->currentStatusText(), L'\n', L' ')); //no layout update for status texts!
 
-    if (itemsTotal < 0 && bytesTotal < 0)
+    if (!haveTotalStats)
     {
         //dialog caption, taskbar, systray tooltip
         setExternalStatus(getDialogPhaseText(*syncStat_, paused_), formatNumber(itemsCurrent)); //status text may be "paused"!
@@ -1093,7 +1057,6 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateProgressGui(bool allowYield)
         if (trayIcon_.get()) trayIcon_->setProgress(fractionTotal);
         if (taskbar_ .get()) taskbar_ ->setProgress(fractionTotal);
 
-        //----------------------------------------------------------------------------------------------------
         const double timeTotalSecTentative = bytesCurrent == bytesTotal ? timeElapsedDouble : std::max(curveDataBytesTotal_->getValueX(), timeElapsedDouble);
 
         //constant line graph
@@ -1110,20 +1073,32 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateProgressGui(bool allowYield)
     curveDataBytes_->addRecord(timeElapsed, bytesCurrent);
     curveDataItems_->addRecord(timeElapsed, itemsCurrent);
 
-
-    //remaining objects and data
-    if (itemsTotal < 0 && bytesTotal < 0)
+    //item and data stats
+    if (!haveTotalStats)
     {
-        setText(*pnl_.m_staticTextItemsRemaining, L"-", &layoutChanged);
+        setText(*pnl_.m_staticTextItemsProcessed, formatNumber(itemsCurrent), &layoutChanged);
+        setText(*pnl_.m_staticTextBytesProcessed, L"", &layoutChanged);
+
+        setText(*pnl_.m_staticTextItemsRemaining, std::wstring(1, EM_DASH), &layoutChanged);
         setText(*pnl_.m_staticTextBytesRemaining, L"",  &layoutChanged);
     }
     else
     {
+        setText(*pnl_.m_staticTextItemsProcessed,               formatNumber(itemsCurrent), &layoutChanged);
+        setText(*pnl_.m_staticTextBytesProcessed, L"(" + formatFilesizeShort(bytesCurrent) + L")", &layoutChanged);
+
         setText(*pnl_.m_staticTextItemsRemaining,               formatNumber(itemsTotal - itemsCurrent), &layoutChanged);
         setText(*pnl_.m_staticTextBytesRemaining, L"(" + formatFilesizeShort(bytesTotal - bytesCurrent) + L")", &layoutChanged);
         //it's possible data remaining becomes shortly negative if last file synced has ADS data and the bytesTotal was not yet corrected!
     }
 
+    //current time elapsed
+    const int64_t timeElapSec = std::chrono::duration_cast<std::chrono::seconds>(timeElapsed).count();
+
+    setText(*pnl_.m_staticTextTimeElapsed, timeElapSec < 3600 ?
+            wxTimeSpan::Seconds(timeElapSec).Format(   L"%M:%S") :
+            wxTimeSpan::Seconds(timeElapSec).Format(L"%H:%M:%S"), &layoutChanged);
+
     //remaining time and speed
     if (numeric::dist(timeLastSpeedEstimate_, timeElapsed) >= SPEED_ESTIMATE_UPDATE_INTERVAL)
     {
@@ -1139,9 +1114,9 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateProgressGui(bool allowYield)
         pnl_.m_panelGraphItems->setAttributes(pnl_.m_panelGraphItems->getAttributes().setCornerText(ips ? *ips : L"", Graph2D::CORNER_TOP_LEFT));
 
         //remaining time
-        if (bytesTotal < 0)
+        if (!haveTotalStats)
         {
-            setText(*pnl_.m_staticTextTimeRemaining, L"-", &layoutChanged);
+            setText(*pnl_.m_staticTextTimeRemaining, std::wstring(1, EM_DASH), &layoutChanged);
             //ignore graphs: should already have been cleared in initNewPhase()
         }
         else
@@ -1149,7 +1124,7 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateProgressGui(bool allowYield)
             //remaining time: display with relative error of 10% - based on samples taken every 0.5 sec only
             //-> call more often than once per second to correctly show last few seconds countdown, but don't call too often to avoid occasional jitter
             std::optional<double> remTimeSec = perf_.getRemainingTimeSec(bytesTotal - bytesCurrent);
-            setText(*pnl_.m_staticTextTimeRemaining, remTimeSec ? formatRemainingTime(*remTimeSec) : L"-", &layoutChanged);
+            setText(*pnl_.m_staticTextTimeRemaining, remTimeSec ? formatRemainingTime(*remTimeSec) : std::wstring(1, EM_DASH), &layoutChanged);
 
             //update estimated total time marker with precision of "10% remaining time" only to avoid needless jumping around:
             const double timeRemainingSec = remTimeSec ? *remTimeSec : 0;
@@ -1165,48 +1140,31 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateProgressGui(bool allowYield)
         }
     }
 
-
     pnl_.m_panelGraphBytes->Refresh();
     pnl_.m_panelGraphItems->Refresh();
 
-    const int64_t timeElapSec = std::chrono::duration_cast<std::chrono::seconds>(timeElapsed).count();
-
-    setText(*pnl_.m_staticTextTimeElapsed, timeElapSec < 3600 ?
-            wxTimeSpan::Seconds(timeElapSec).Format(   L"%M:%S") :
-            wxTimeSpan::Seconds(timeElapSec).Format(L"%H:%M:%S"), &layoutChanged);
-
     //adapt layout after content changes above
     if (layoutChanged)
     {
         pnl_.m_panelProgress->Layout();
         //small statistics panels:
-        //pnl.m_panelItemsProcessed ->Layout(); -> hidden
-        pnl_.m_panelItemsRemaining->Layout();
-        pnl_.m_panelTimeRemaining ->Layout();
-        //pnl.m_panelTimeElapsed->Layout(); -> needed?
+        pnl_.m_panelItemStats->Layout();
+        pnl_.m_panelTimeStats->Layout();
     }
 
 
     if (allowYield)
     {
-        //support for pause button
-        if (paused_)
+        if (paused_) //support for pause button
         {
-            timerSetStatus(false /*active*/);
+            PauseTimers dummy(*this);
 
-            std::weak_ptr<int> lifeSignWeak(lifeSign_);
             while (paused_)
             {
-                wxTheApp->Yield(); //receive UI message that end pause OR forceful termination!
+                wxTheApp->Yield(); //receive UI message that ends pause
                 //*first* refresh GUI (removing flicker) before sleeping!
                 std::this_thread::sleep_for(UI_UPDATE_INTERVAL);
-
-                //after SyncProgressDialogImpl::OnClose() called wxWindow::Destroy() on OS X this instance is instantly toast!
-                if (!lifeSignWeak.lock())
-                    return; //GTFO and don't call this->timerSetStatus(); we're fine: https://isocpp.org/wiki/faq/freestore-mgmt#delete-this
             }
-
-            timerSetStatus(true /*active*/);
         }
         else
             /*
@@ -1254,25 +1212,20 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateStaticGui() //depends on "syn
     }();
     pnl_.m_bitmapStatus->SetBitmap(statusImage);
 
-
     //show status on Windows 7 taskbar
     if (taskbar_.get())
     {
         if (paused_)
             taskbar_->setStatus(Taskbar::STATUS_PAUSED);
         else
-            switch (syncStat_->currentPhase())
-            {
-                case ProcessCallback::PHASE_NONE:
-                case ProcessCallback::PHASE_SCANNING:
-                    taskbar_->setStatus(Taskbar::STATUS_INDETERMINATE);
-                    break;
-
-                case ProcessCallback::PHASE_COMPARING_CONTENT:
-                case ProcessCallback::PHASE_SYNCHRONIZING:
-                    taskbar_->setStatus(Taskbar::STATUS_NORMAL);
-                    break;
-            }
+        {
+            const int     itemsTotal = syncStat_->getStatsTotal(syncStat_->currentPhase()).items;
+            const int64_t bytesTotal = syncStat_->getStatsTotal(syncStat_->currentPhase()).bytes;
+
+            const bool haveTotalStats = itemsTotal >= 0 || bytesTotal >= 0;
+
+            taskbar_->setStatus(haveTotalStats ? Taskbar::STATUS_NORMAL : Taskbar::STATUS_INDETERMINATE);
+        }
     }
 
     //pause button
@@ -1287,31 +1240,9 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateStaticGui() //depends on "syn
 
 
 template <class TopLevelDialog>
-void SyncProgressDialogImpl<TopLevelDialog>::closeDirectly(bool restoreParentFrame) //this should really be called "do not call back + schedule deletion"
-{
-    assert(syncStat_ && abortCb_);
-
-    if (!restoreParentFrame)
-        parentFrame_ = nullptr; //avoid destructor calls like parentFrame_->Show(), ::TransformProcessType(&psn, kProcessTransformToForegroundApplication);
-
-    paused_ = false; //you never know?
-
-    //resumeFromSystray(); -> NO, instead ~SyncProgressDialogImpl() makes sure that main dialog is shown again! e.g. avoid calls to this/parentFrame_->Raise()
-
-    //ATTENTION: dialog may live a little longer, so watch callbacks!
-    //e.g. wxGTK calls OnIconize after wxWindow::Close() (better not ask why) and before physical destruction! => indirectly calls updateStaticGui(), which reads syncStat_!!!
-    syncStat_ = nullptr;
-    abortCb_  = nullptr;
-
-    this->Close(); //generate close event: do NOT destroy window unconditionally!
-}
-
-
-//essential to call this in StatusHandler derived class destructor
-template <class TopLevelDialog>
 void SyncProgressDialogImpl<TopLevelDialog>::showSummary(SyncResult finalStatus, const std::shared_ptr<const ErrorLog>& log /*bound!*/)
 {
-    assert(syncStat_ && abortCb_);
+    assert(syncStat_);
     //at the LATEST(!) to prevent access to currentStatusHandler
     //enable okay and close events; may be set in this method ONLY
 
@@ -1341,25 +1272,20 @@ void SyncProgressDialogImpl<TopLevelDialog>::showSummary(SyncResult finalStatus,
     pnl_.m_panelGraphBytes->setAttributes(pnl_.m_panelGraphBytes->getAttributes().setCornerText(overallBytesPerSecond, Graph2D::CORNER_TOP_LEFT));
     pnl_.m_panelGraphItems->setAttributes(pnl_.m_panelGraphItems->getAttributes().setCornerText(overallItemsPerSecond, Graph2D::CORNER_TOP_LEFT));
 
-
-    //show new info box "items processed"
-    pnl_.m_panelItemsProcessed->Show();
-    pnl_.m_staticTextItemsProcessed->SetLabel(              formatNumber(itemsProcessed));
-    pnl_.m_staticTextBytesProcessed->SetLabel(L"(" + formatFilesizeShort(bytesProcessed) + L")");
-
-
-    if ((itemsTotal < 0 && bytesTotal < 0) || //no total items/bytes: e.g. for pure folder comparison
-        (itemsProcessed == itemsTotal && //
-         bytesProcessed == bytesTotal))  //...if everything was processed successfully
-        pnl_.m_panelItemsRemaining->Hide();
-    else
+    //...if everything was processed successfully
+    if (itemsTotal >= 0 && bytesTotal >= 0 && //itemsTotal < 0 && bytesTotal < 0 => e.g. cancel during folder comparison
+        itemsProcessed == itemsTotal &&
+        bytesProcessed == bytesTotal)
     {
-        pnl_.m_staticTextItemsRemaining->SetLabel(              formatNumber(itemsTotal - itemsProcessed));
-        pnl_.m_staticTextBytesRemaining->SetLabel(L"(" + formatFilesizeShort(bytesTotal - bytesProcessed) + L")");
+        pnl_.m_staticTextProcessed     ->Hide();
+        pnl_.m_staticTextRemaining     ->Hide();
+        pnl_.m_staticTextItemsRemaining->Hide();
+        pnl_.m_staticTextBytesRemaining->Hide();
+        pnl_.m_staticTextTimeRemaining ->Hide();
     }
 
-    //hide remaining time
-    pnl_.m_panelTimeRemaining->Hide();
+    //generally not interesting anymore (e.g. items > 0 dur to skipped errors)
+    pnl_.m_staticTextTimeRemaining->Hide();
 
     const int64_t totalTimeSec = std::chrono::duration_cast<std::chrono::seconds>(stopWatch_.elapsed()).count();
     setText(*pnl_.m_staticTextTimeElapsed, wxTimeSpan::Seconds(totalTimeSec).Format(L"%H:%M:%S"));
@@ -1370,20 +1296,19 @@ void SyncProgressDialogImpl<TopLevelDialog>::showSummary(SyncResult finalStatus,
 
     //------- change class state -------
     syncStat_ = nullptr;
-    abortCb_  = nullptr;
     //----------------------------------
 
     const wxBitmap statusImage = [&]
     {
         switch (finalStatus)
         {
-            case SyncResult::FINISHED_WITH_SUCCESS:
+            case SyncResult::finishedSuccess:
                 return getResourceImage(L"status_finished_success");
-            case SyncResult::FINISHED_WITH_WARNINGS:
+            case SyncResult::finishedWarning:
                 return getResourceImage(L"status_finished_warnings");
-            case SyncResult::FINISHED_WITH_ERROR:
+            case SyncResult::finishedError:
                 return getResourceImage(L"status_finished_errors");
-            case SyncResult::ABORTED:
+            case SyncResult::aborted:
                 return getResourceImage(L"status_aborted");
         }
         assert(false);
@@ -1398,13 +1323,13 @@ void SyncProgressDialogImpl<TopLevelDialog>::showSummary(SyncResult finalStatus,
     if (taskbar_.get())
         switch (finalStatus)
         {
-            case SyncResult::FINISHED_WITH_SUCCESS:
-            case SyncResult::FINISHED_WITH_WARNINGS:
+            case SyncResult::finishedSuccess:
+            case SyncResult::finishedWarning:
                 taskbar_->setStatus(Taskbar::STATUS_NORMAL);
                 break;
 
-            case SyncResult::FINISHED_WITH_ERROR:
-            case SyncResult::ABORTED:
+            case SyncResult::finishedError:
+            case SyncResult::aborted:
                 taskbar_->setStatus(Taskbar::STATUS_ERROR);
                 break;
         }
@@ -1486,22 +1411,25 @@ void SyncProgressDialogImpl<TopLevelDialog>::showSummary(SyncResult finalStatus,
 
     pnl_.m_panelProgress->Layout();
     //small statistics panels:
-    pnl_.m_panelItemsProcessed->Layout();
-    pnl_.m_panelItemsRemaining->Layout();
-    //pnl.m_panelTimeRemaining->Layout(); -> hidden
-    //pnl.m_panelTimeElapsed->Layout(); -> needed?
+    pnl_.m_panelItemStats->Layout();
+    pnl_.m_panelTimeStats->Layout();
 
     //play (optional) sound notification after sync has completed -> only play when waiting on results dialog, seems to be pointless otherwise!
     switch (finalStatus)
     {
-        case SyncResult::ABORTED:
+        case SyncResult::aborted:
             break;
-        case SyncResult::FINISHED_WITH_ERROR:
-        case SyncResult::FINISHED_WITH_WARNINGS:
-        case SyncResult::FINISHED_WITH_SUCCESS:
+        case SyncResult::finishedError:
+        case SyncResult::finishedWarning:
+        case SyncResult::finishedSuccess:
             if (!soundFileSyncComplete_.empty() && fileAvailable(soundFileSyncComplete_))
+            {
+                //wxWidgets shows modal error dialog by default => NO!
+                wxLog* oldLogTarget = wxLog::SetActiveTarget(new wxLogStderr); //transfer and receive ownership!
+                ZEN_ON_SCOPE_EXIT(delete wxLog::SetActiveTarget(oldLogTarget));
+
                 wxSound::Play(utfTo<wxString>(soundFileSyncComplete_), wxSOUND_ASYNC);
-            //warning: this may fail and show a wxWidgets error message! => must not play when running FFS without user interaction!
+            }
 
             //if (::GetForegroundWindow() != GetHWND())
             //  RequestUserAttention(); -> probably too much since task bar is already colorized with Taskbar::STATUS_ERROR or STATUS_NORMAL
@@ -1513,16 +1441,86 @@ void SyncProgressDialogImpl<TopLevelDialog>::showSummary(SyncResult finalStatus,
 
 
 template <class TopLevelDialog>
+auto SyncProgressDialogImpl<TopLevelDialog>::destroy(bool autoClose, bool restoreParentFrame, SyncResult finalStatus, const std::shared_ptr<const zen::ErrorLog>& log /*bound!*/) -> Result
+{
+    if (autoClose)
+    {
+        assert(syncStat_);
+
+        //ATTENTION: dialog may live a little longer, so watch callbacks!
+        //e.g. wxGTK calls OnIconize after wxWindow::Close() (better not ask why) and before physical destruction! => indirectly calls updateStaticGui(), which reads syncStat_!!!
+        syncStat_ = nullptr;
+    }
+    else
+    {
+        showSummary(finalStatus, log);
+
+        //wait until user closes the dialog by pressing "okay"
+        while (!okayPressed_)
+        {
+            wxTheApp->Yield(); //*first* refresh GUI (removing flicker) before sleeping!
+            std::this_thread::sleep_for(UI_UPDATE_INTERVAL);
+        }
+        restoreParentFrame = true;
+    }
+    //------------------------------------------------------------------------
+
+    if (parentFrame_)
+    {
+        parentFrame_->Disconnect(wxEVT_CHAR_HOOK, wxKeyEventHandler(SyncProgressDialogImpl::onParentKeyEvent), nullptr, this);
+
+        parentFrame_->SetTitle(parentTitleBackup_); //restore title text
+
+        if (restoreParentFrame)
+        {
+            //make sure main dialog is shown again if still "minimized to systray"!
+            parentFrame_->Show();
+            //if (parentFrame_->IsIconized()) //caveat: if window is maximized calling Iconize(false) will erroneously un-maximize!
+            //    parentFrame_->Iconize(false);
+        }
+    }
+    //else: don't call "TransformProcessType": consider "switch to main dialog" option during silent batch run
+
+    //------------------------------------------------------------------------
+    const bool autoCloseDialog = getOptionAutoCloseDialog();
+
+    this->Destroy(); //wxWidgets macOS: simple "delete"!!!!!!!
+
+    return { autoCloseDialog };
+}
+
+
+template <class TopLevelDialog>
 void SyncProgressDialogImpl<TopLevelDialog>::OnOkay(wxCommandEvent& event)
 {
-    this->Close(); //generate close event: do NOT destroy window unconditionally!
+    okayPressed_ = true;
+}
+
+
+template <class TopLevelDialog>
+void SyncProgressDialogImpl<TopLevelDialog>::OnClose(wxCloseEvent& event)
+{
+    assert(event.CanVeto()); //this better be true: if "this" is parent of a modal error dialog, there is NO way (in hell) we allow destruction here!!!
+    //note: close cannot be prevented on Windows during system shutdown! => already handled via Application::onQueryEndSession()
+    event.Veto();
+
+    okayPressed_ = true; //"temporary" auto-close: preempt closing results dialog
+
+    if (syncStat_)
+    {
+        //user closing dialog => cancel sync + auto-close dialog
+        userRequestAbort_();
+
+        paused_ = false; //[!] we could be pausing here!
+        updateStaticGui(); //update status + pause button
+    }
 }
 
 
 template <class TopLevelDialog>
 void SyncProgressDialogImpl<TopLevelDialog>::OnCancel(wxCommandEvent& event)
 {
-    if (abortCb_) abortCb_->userRequestAbort();
+    userRequestAbort_();
 
     paused_ = false;
     updateStaticGui(); //update status + pause button
@@ -1539,26 +1537,6 @@ void SyncProgressDialogImpl<TopLevelDialog>::OnPause(wxCommandEvent& event)
 
 
 template <class TopLevelDialog>
-void SyncProgressDialogImpl<TopLevelDialog>::OnClose(wxCloseEvent& event)
-{
-    //this event handler may be called *during* sync!
-    //=> try to stop sync gracefully and cross fingers:
-    if (abortCb_) abortCb_->userRequestAbort();
-
-    notifyWindowTerminate_(); //don't wait until delayed "Destroy()" finally calls destructor -> avoid calls to showSummary()/closeDirectly()
-
-    paused_ = false; //[!] we could be pausing here!
-
-    //now that we notified window termination prematurely, and since showSummary()/closeDirectly() won't be called, make sure we don't call back, too!
-    //e.g. a second notifyWindowTerminate_() in ~SyncProgressDialogImpl()!!!
-    syncStat_ = nullptr;
-    abortCb_  = nullptr;
-
-    this->Destroy(); //wxWidgets OS X: simple "delete"!!!!!!!
-}
-
-
-template <class TopLevelDialog>
 void SyncProgressDialogImpl<TopLevelDialog>::OnIconize(wxIconizeEvent& event)
 {
     /*
@@ -1635,32 +1613,29 @@ void SyncProgressDialogImpl<TopLevelDialog>::resumeFromSystray()
 
 //########################################################################################
 
-SyncProgressDialog* fff::createProgressDialog(AbortCallback& abortCb,
-                                              const std::function<void()>& notifyWindowTerminate, //note: user closing window cannot be prevented on OS X! (And neither on Windows during system shutdown!)
-                                              const Statistics& syncStat,
-                                              wxFrame* parentWindow, //may be nullptr
-                                              bool showProgress,
-                                              bool autoCloseDialog,
-                                              const std::chrono::system_clock::time_point& syncStartTime,
-                                              const wxString& jobName,
-                                              const Zstring& soundFileSyncComplete,
-                                              bool ignoreErrors,
-                                              size_t automaticRetryCount,
-                                              PostSyncAction2 postSyncAction)
+SyncProgressDialog* SyncProgressDialog::create(const std::function<void()>& userRequestAbort,
+                                               const Statistics& syncStat,
+                                               wxFrame* parentWindow, //may be nullptr
+                                               bool showProgress,
+                                               bool autoCloseDialog,
+                                               const std::chrono::system_clock::time_point& syncStartTime,
+                                               const wxString& jobName,
+                                               const Zstring& soundFileSyncComplete,
+                                               bool ignoreErrors,
+                                               size_t automaticRetryCount,
+                                               PostSyncAction2 postSyncAction)
 {
     if (parentWindow) //sync from GUI
     {
         //due to usual "wxBugs", wxDialog on OS X does not float on its parent; wxFrame OTOH does => hack!
         //https://groups.google.com/forum/#!topic/wx-users/J5SjjLaBOQE
-        return new SyncProgressDialogImpl<wxDialog>(wxDEFAULT_DIALOG_STYLE | wxMAXIMIZE_BOX | wxMINIMIZE_BOX | wxRESIZE_BORDER,
-        [&](wxDialog& progDlg) { return parentWindow; },
-        abortCb, notifyWindowTerminate, syncStat, parentWindow, showProgress, autoCloseDialog, syncStartTime, jobName, soundFileSyncComplete, ignoreErrors, automaticRetryCount, postSyncAction);
+        return new SyncProgressDialogImpl<wxDialog>(wxDEFAULT_DIALOG_STYLE | wxMAXIMIZE_BOX | wxMINIMIZE_BOX | wxRESIZE_BORDER, [&](wxDialog& progDlg) { return parentWindow; },
+        userRequestAbort, syncStat, parentWindow, showProgress, autoCloseDialog, syncStartTime, jobName, soundFileSyncComplete, ignoreErrors, automaticRetryCount, postSyncAction);
     }
     else //FFS batch job
     {
-        auto dlg = new SyncProgressDialogImpl<wxFrame>(wxDEFAULT_FRAME_STYLE,
-        [](wxFrame& progDlg) { return &progDlg; },
-        abortCb, notifyWindowTerminate, syncStat, parentWindow, showProgress, autoCloseDialog, syncStartTime, jobName, soundFileSyncComplete, ignoreErrors, automaticRetryCount, postSyncAction);
+        auto dlg = new SyncProgressDialogImpl<wxFrame>(wxDEFAULT_FRAME_STYLE, [](wxFrame& progDlg) { return &progDlg; },
+        userRequestAbort, syncStat, parentWindow, showProgress, autoCloseDialog, syncStartTime, jobName, soundFileSyncComplete, ignoreErrors, automaticRetryCount, postSyncAction);
 
         //only top level windows should have an icon:
         dlg->SetIcon(getFfsIcon());
diff --git a/FreeFileSync/Source/ui/progress_indicator.h b/FreeFileSync/Source/ui/progress_indicator.h
index e2db0533..90f5ddcf 100644
--- a/FreeFileSync/Source/ui/progress_indicator.h
+++ b/FreeFileSync/Source/ui/progress_indicator.h
@@ -49,19 +49,27 @@ private:
 
 enum class PostSyncAction2
 {
-    NONE,
-    EXIT,
-    SLEEP,
-    SHUTDOWN
+    none,
+    exit,
+    sleep,
+    shutdown
 };
 
 struct SyncProgressDialog
 {
-    //essential to call one of these two methods in StatusUpdater derived class' destructor at the LATEST(!)
-    //to prevent access to callback to updater (e.g. request abort)
-    virtual void showSummary(SyncResult finalStatus, const std::shared_ptr<const zen::ErrorLog>& log /*bound!*/) = 0; //sync finished, still dialog may live on
-    virtual void closeDirectly(bool restoreParentFrame) = 0; //don't wait for user
-
+    static SyncProgressDialog* create(const std::function<void()>& userRequestAbort,
+                                      const Statistics& syncStat,
+                                      wxFrame* parentWindow, //may be nullptr
+                                      bool showProgress,
+                                      bool autoCloseDialog,
+                                      const std::chrono::system_clock::time_point& syncStartTime,
+                                      const wxString& jobName,
+                                      const Zstring& soundFileSyncComplete,
+                                      bool ignoreErrors,
+                                      size_t automaticRetryCount,
+                                      PostSyncAction2 postSyncAction);
+    struct Result { bool autoCloseDialog; };
+    virtual Result destroy(bool autoClose, bool restoreParentFrame, SyncResult finalStatus, const std::shared_ptr<const zen::ErrorLog>& log /*bound!*/) = 0;
     //---------------------------------------------------------------------------
 
     virtual wxWindow* getWindowIfVisible() = 0; //may be nullptr; don't abuse, use as parent for modal dialogs only!
@@ -84,21 +92,6 @@ protected:
 };
 
 
-SyncProgressDialog* createProgressDialog(AbortCallback& abortCb,
-                                         const std::function<void()>& notifyWindowTerminate, //note: user closing window cannot be prevented on OS X! (And neither on Windows during system shutdown!)
-                                         const Statistics& syncStat,
-                                         wxFrame* parentWindow, //may be nullptr
-                                         bool showProgress,
-                                         bool autoCloseDialog,
-                                         const std::chrono::system_clock::time_point& syncStartTime,
-                                         const wxString& jobName,
-                                         const Zstring& soundFileSyncComplete,
-                                         bool ignoreErrors,
-                                         size_t automaticRetryCount,
-                                         PostSyncAction2 postSyncAction);
-//DON'T delete the pointer! it will be deleted by the user clicking "OK/Cancel"/wxWindow::Destroy() after showSummary() or closeDirectly()
-
-
 template <class ProgressDlg>
 class PauseTimers
 {
diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
index 2108ea58..97942754 100644
--- a/FreeFileSync/Source/ui/small_dlgs.cpp
+++ b/FreeFileSync/Source/ui/small_dlgs.cpp
@@ -35,7 +35,7 @@
 #include "../base/help_provider.h"
 #include "../base/path_filter.h"
 #include "../base/status_handler.h" //updateUiIsAllowed()
-#include "../base/generate_logfile.h"
+#include "../base/log_file.h"
 #include "../base/icon_buffer.h"
 #include "../version/version.h"
 #include "../afs/concrete.h"
@@ -283,7 +283,7 @@ CloudSetupDlg::CloudSetupDlg(wxWindow* parent, Zstring& folderPathPhrase, size_t
     }
     catch (const FileError& e)
     {
-        showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+        showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
     }
     m_listBoxGdriveUsers->Append(googleUsers);
 
@@ -388,7 +388,7 @@ void CloudSetupDlg::OnGdriveUserAdd(wxCommandEvent& event)
     [this](const std::variant<Zstring, FileError>& result)
     {
         if (const FileError* e = std::get_if<FileError>(&result))
-            showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e->toString()));
+            showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e->toString()));
         else
         {
             const wxString googleUser = utfTo<wxString>(std::get<Zstring>(result));
@@ -413,10 +413,10 @@ void CloudSetupDlg::OnGdriveUserRemove(wxCommandEvent& event)
         try
         {
             const wxString googleUser = m_listBoxGdriveUsers->GetString(selIdx);
-            if (showConfirmationDialog(this, DialogInfoType::WARNING, PopupDialogCfg().
+            if (showConfirmationDialog(this, DialogInfoType::warning, PopupDialogCfg().
                                        setTitle(_("Confirm")).
                                        setMainInstructions(replaceCpy(_("Do you really want to disconnect from user account %x?"), L"%x", googleUser)),
-                                       _("&Disconnect")) != ConfirmationButton::ACCEPT)
+                                       _("&Disconnect")) != ConfirmationButton::accept)
                 return;
 
             googleRemoveUser(utfTo<Zstring>(googleUser)); //throw FileError
@@ -426,7 +426,7 @@ void CloudSetupDlg::OnGdriveUserRemove(wxCommandEvent& event)
         }
         catch (const FileError& e)
         {
-            showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+            showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
         }
 }
 
@@ -454,7 +454,7 @@ void CloudSetupDlg::OnDetectServerChannelLimit(wxCommandEvent& event)
     }
     catch (const FileError& e)
     {
-        showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+        showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
     }
 }
 
@@ -553,7 +553,7 @@ void CloudSetupDlg::updateGui()
                     break;
                 case SftpAuthType::KEY_FILE:
                     m_radioBtnKeyfile->SetValue(true);
-                    m_staticTextPassword->SetLabel(_("Key password:"));
+                    m_staticTextPassword->SetLabel(_("Key passphrase:"));
                     break;
                 case SftpAuthType::AGENT:
                     m_radioBtnAgent->SetValue(true);
@@ -634,7 +634,7 @@ void CloudSetupDlg::OnBrowseCloudFolder(wxCommandEvent& event)
         }
         catch (const FileError& e)
         {
-            showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+            showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
             return;
         }
 
@@ -649,7 +649,7 @@ void CloudSetupDlg::OnOkay(wxCommandEvent& event)
     if (type_ == CloudType::sftp && sftpAuthType_ == SftpAuthType::KEY_FILE)
         if (trimCpy(m_textCtrlKeyfilePath->GetValue()).empty())
         {
-            showNotificationDialog(this, DialogInfoType::INFO, PopupDialogCfg().setMainInstructions(_("Please enter a file path.")));
+            showNotificationDialog(this, DialogInfoType::info, PopupDialogCfg().setMainInstructions(_("Please enter a file path.")));
             //don't show error icon to follow "Windows' encouraging tone"
             m_textCtrlKeyfilePath->SetFocus();
             return;
@@ -773,7 +773,7 @@ void CopyToDialog::OnOK(wxCommandEvent& event)
     //------- parameter validation (BEFORE writing output!) -------
     if (trimCpy(targetFolder->getPath()).empty())
     {
-        showNotificationDialog(this, DialogInfoType::INFO, PopupDialogCfg().setMainInstructions(_("Please enter a target folder.")));
+        showNotificationDialog(this, DialogInfoType::info, PopupDialogCfg().setMainInstructions(_("Please enter a target folder.")));
         //don't show error icon to follow "Windows' encouraging tone"
         m_targetFolderPath->SetFocus();
         return;
@@ -1345,7 +1345,7 @@ void OptionsDlg::OnShowLogFolder(wxHyperlinkEvent& event)
     {
         openWithDefaultApplication(getDefaultLogFolderPath()); //throw FileError
     }
-    catch (const FileError& e) { showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString())); }
+    catch (const FileError& e) { showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString())); }
 }
 
 
diff --git a/FreeFileSync/Source/ui/sync_cfg.cpp b/FreeFileSync/Source/ui/sync_cfg.cpp
index 2fc1e694..1530cfbd 100644
--- a/FreeFileSync/Source/ui/sync_cfg.cpp
+++ b/FreeFileSync/Source/ui/sync_cfg.cpp
@@ -22,8 +22,8 @@
 #include "folder_selector.h"
 #include "../base/file_hierarchy.h"
 #include "../base/help_provider.h"
+#include "../base/log_file.h"
 #include "../base/norm_filter.h"
-#include "../base/generate_logfile.h"
 #include "../afs/concrete.h"
 
 
@@ -334,7 +334,7 @@ commandHistItemsMax_(commandHistItemsMax)
     //add(UnitTime::THIS_WEEK,   _("This week")).
     add(UnitTime::THIS_MONTH,  _("This month")).
     add(UnitTime::THIS_YEAR,   _("This year")).
-    add(UnitTime::LAST_X_DAYS, replaceCpy(_("Last x days:"), L":", L"")); //reuse translation
+    add(UnitTime::LAST_X_DAYS, _("Last x days:"));
 
     enumSizeDescr_.
     add(UnitSize::NONE, L"(" + _("None") + L")"). //meta options should be enclosed in parentheses
@@ -1364,7 +1364,7 @@ bool ConfigDialog::unselectFolderPairConfig()
         if (AFS::isNullPath(createAbstractPath(syncCfg->versioningFolderPhrase)))
         {
             m_notebook->ChangeSelection(static_cast<size_t>(SyncConfigPanel::SYNC));
-            showNotificationDialog(this, DialogInfoType::INFO, PopupDialogCfg().setMainInstructions(_("Please enter a target folder for versioning.")));
+            showNotificationDialog(this, DialogInfoType::info, PopupDialogCfg().setMainInstructions(_("Please enter a target folder for versioning.")));
             //don't show error icon to follow "Windows' encouraging tone"
             m_versioningFolderPath->SetFocus();
             return false;
@@ -1377,7 +1377,7 @@ bool ConfigDialog::unselectFolderPairConfig()
             syncCfg->versionCountMin >= syncCfg->versionCountMax)
         {
             m_notebook->ChangeSelection(static_cast<size_t>(SyncConfigPanel::SYNC));
-            showNotificationDialog(this, DialogInfoType::INFO, PopupDialogCfg().setMainInstructions(_("Minimum version count must be smaller than maximum count.")));
+            showNotificationDialog(this, DialogInfoType::info, PopupDialogCfg().setMainInstructions(_("Minimum version count must be smaller than maximum count.")));
             m_spinCtrlVersionCountMin->SetFocus();
             return false;
         }
diff --git a/FreeFileSync/Source/ui/taskbar.cpp b/FreeFileSync/Source/ui/taskbar.cpp
index f4e95212..519a1ce1 100644
--- a/FreeFileSync/Source/ui/taskbar.cpp
+++ b/FreeFileSync/Source/ui/taskbar.cpp
@@ -6,79 +6,18 @@
 
 #include "taskbar.h"
 
-#if   defined HAVE_UBUNTU_UNITY
-    #include <unity/unity/unity.h>
-
-#endif
 
 using namespace zen;
 using namespace fff;
 
 
-#if   defined HAVE_UBUNTU_UNITY //Ubuntu unity
-namespace
-{
-const char FFS_DESKTOP_FILE[] = "freefilesync.desktop";
-}
-
-class Taskbar::Impl //throw (TaskbarNotAvailable)
-{
-public:
-    Impl(const wxFrame& window) :
-        tbEntry_(unity_launcher_entry_get_for_desktop_id(FFS_DESKTOP_FILE))
-        //tbEntry_(unity_launcher_entry_get_for_app_uri("application://freefilesync.desktop"))
-    {
-        if (!tbEntry_)
-            throw TaskbarNotAvailable();
-    }
-
-    ~Impl() { setStatus(STATUS_INDETERMINATE); } //it seems UnityLauncherEntry* does not need destruction
-
-    void setStatus(Status status)
-    {
-        switch (status)
-        {
-            case Taskbar::STATUS_ERROR:
-                unity_launcher_entry_set_urgent(tbEntry_, true);
-                break;
-
-            case Taskbar::STATUS_INDETERMINATE:
-                unity_launcher_entry_set_urgent(tbEntry_, false);
-                unity_launcher_entry_set_progress_visible(tbEntry_, false);
-                break;
-
-            case Taskbar::STATUS_NORMAL:
-                unity_launcher_entry_set_urgent(tbEntry_, false);
-                unity_launcher_entry_set_progress_visible(tbEntry_, true);
-                break;
-
-            case Taskbar::STATUS_PAUSED:
-                unity_launcher_entry_set_urgent(tbEntry_, false);
-                break;
-        }
-    }
-
-    void setProgress(double fraction)
-    {
-        unity_launcher_entry_set_progress(tbEntry_, fraction);
-    }
-
-private:
-    Impl           (const Impl&) = delete;
-    Impl& operator=(const Impl&) = delete;
-
-    UnityLauncherEntry* const tbEntry_;
-};
-
-#else //no taskbar support
-class Taskbar::Impl //throw TaskbarNotAvailable
+class Taskbar::Impl
 {
 public:
     Impl(const wxFrame& window) { throw TaskbarNotAvailable(); }
     void setStatus(Status status) {}
     void setProgress(double fraction) {}
 };
-#endif
 
 //########################################################################################################
 
diff --git a/FreeFileSync/Source/ui/taskbar.h b/FreeFileSync/Source/ui/taskbar.h
index a731b9db..a8aca46b 100644
--- a/FreeFileSync/Source/ui/taskbar.h
+++ b/FreeFileSync/Source/ui/taskbar.h
@@ -10,15 +10,6 @@
 #include <memory>
 #include <wx/frame.h>
 
-/*
-Windows 7; show progress in Windows superbar via ITaskbarList3 Interface: https://docs.microsoft.com/de-de/windows/desktop/api/shobjidl_core/nn-shobjidl_core-itaskbarlist3
-
-Ubuntu: use Unity interface (optional)
-
-Define HAVE_UBUNTU_UNITY and set:
-    Compiler flag: `pkg-config --cflags unity`
-    Linker   flag: `pkg-config --libs unity`
-*/
 
 namespace fff
 {
diff --git a/FreeFileSync/Source/ui/tray_icon.h b/FreeFileSync/Source/ui/tray_icon.h
index d0aeaf78..240b8c45 100644
--- a/FreeFileSync/Source/ui/tray_icon.h
+++ b/FreeFileSync/Source/ui/tray_icon.h
@@ -17,10 +17,11 @@ show tray icon with progress during lifetime of this instance
 
 ATTENTION: wxWidgets never assumes that an object indirectly destroys itself while processing an event!
            this includes wxEvtHandler-derived objects!!!
-           it seems ProcessEvent() works (on Windows), but AddPendingEvent() will crash since it uses "this" after the event processing!
+           it seems wxTaskBarIcon::ProcessEvent() works (on Windows), but AddPendingEvent() will crash since it uses "this" after the event processing!
 
 => don't derive from wxEvtHandler or any other wxWidgets object here!!!!!!
-=> use simple std::function as callback instead => instance may now be safely deleted in callback!
+=> use simple std::function as callback instead => FfsTrayIcon instance may now be safely deleted in callback
+    while ~wxTaskBarIcon is delayed via wxPendingDelete
 */
 namespace fff
 {
diff --git a/FreeFileSync/Source/ui/triple_splitter.cpp b/FreeFileSync/Source/ui/triple_splitter.cpp
index 0797b807..6e193529 100644
--- a/FreeFileSync/Source/ui/triple_splitter.cpp
+++ b/FreeFileSync/Source/ui/triple_splitter.cpp
@@ -39,7 +39,7 @@ TripleSplitter::TripleSplitter(wxWindow* parent,
 {
     Connect(wxEVT_PAINT, wxPaintEventHandler(TripleSplitter::onPaintEvent), nullptr, this);
     Connect(wxEVT_SIZE,  wxSizeEventHandler (TripleSplitter::onSizeEvent ), nullptr, this);
-    Bind(wxEVT_ERASE_BACKGROUND, [](wxEraseEvent& event) {}); //http://wiki.wxwidgets.org/Flicker-Free_Drawing
+    Bind(wxEVT_ERASE_BACKGROUND, [](wxEraseEvent& event) {}); //https://wiki.wxwidgets.org/Flicker-Free_Drawing
 
     SetBackgroundStyle(wxBG_STYLE_PAINT);
 
diff --git a/FreeFileSync/Source/ui/version_check.cpp b/FreeFileSync/Source/ui/version_check.cpp
index 3434f83d..9d4ae8ef 100644
--- a/FreeFileSync/Source/ui/version_check.cpp
+++ b/FreeFileSync/Source/ui/version_check.cpp
@@ -168,17 +168,17 @@ void showUpdateAvailableDialog(wxWindow* parent, const std::string& onlineVersio
         updateDetailsMsg = e.toString() + L"\n\n\n" + updateDetailsMsg;
     }
 
-    switch (showConfirmationDialog(parent, DialogInfoType::INFO, PopupDialogCfg().
+    switch (showConfirmationDialog(parent, DialogInfoType::info, PopupDialogCfg().
                                    setIcon(getResourceImage(L"update_available")).
                                    setTitle(_("Check for Program Updates")).
                                    setMainInstructions(replaceCpy(_("FreeFileSync %x is available!"), L"%x", utfTo<std::wstring>(onlineVersion)) + L" " + _("Download now?")).
                                    setDetailInstructions(updateDetailsMsg),
                                    _("&Download")))
     {
-        case ConfirmationButton::ACCEPT:
+        case ConfirmationButton::accept:
                 wxLaunchDefaultBrowser(L"https://freefilesync.org/get_latest.php");
             break;
-        case ConfirmationButton::CANCEL:
+        case ConfirmationButton::cancel:
             break;
     }
 }
@@ -238,7 +238,7 @@ void fff::checkForUpdateNow(wxWindow* parent, std::string& lastOnlineVersion)
         if (haveNewerVersionOnline(onlineVersion))
             showUpdateAvailableDialog(parent, onlineVersion);
         else
-            showNotificationDialog(parent, DialogInfoType::INFO, PopupDialogCfg().
+            showNotificationDialog(parent, DialogInfoType::info, PopupDialogCfg().
                                    setIcon(getResourceImage(L"update_check")).
                                    setTitle(_("Check for Program Updates")).
                                    setMainInstructions(_("FreeFileSync is up to date.")));
@@ -249,31 +249,31 @@ void fff::checkForUpdateNow(wxWindow* parent, std::string& lastOnlineVersion)
         {
             lastOnlineVersion = "Unknown";
 
-            switch (showQuestionDialog(parent, DialogInfoType::ERROR2, PopupDialogCfg().
+            switch (showQuestionDialog(parent, DialogInfoType::error, PopupDialogCfg().
                                        setTitle(_("Check for Program Updates")).
                                        setMainInstructions(_("Cannot find current FreeFileSync version number online. A newer version is likely available. Check manually now?")).
                                        setDetailInstructions(e.toString()), _("&Check"), _("&Retry")))
             {
-                case QuestionButton2::YES:
+                case QuestionButton2::yes:
                     wxLaunchDefaultBrowser(L"https://freefilesync.org/get_latest.php");
                     break;
-                case QuestionButton2::NO: //retry
+                case QuestionButton2::no: //retry
                     checkForUpdateNow(parent, lastOnlineVersion); //note: retry via recursion!!!
                     break;
-                case QuestionButton2::CANCEL:
+                case QuestionButton2::cancel:
                     break;
             }
         }
         else
-            switch (showConfirmationDialog(parent, DialogInfoType::ERROR2, PopupDialogCfg().
+            switch (showConfirmationDialog(parent, DialogInfoType::error, PopupDialogCfg().
                                            setTitle(_("Check for Program Updates")).
                                            setMainInstructions(replaceCpy(_("Unable to connect to %x."), L"%x", L"freefilesync.org")).
                                            setDetailInstructions(e.toString()), _("&Retry")))
             {
-                case ConfirmationButton::ACCEPT: //retry
+                case ConfirmationButton::accept: //retry
                     checkForUpdateNow(parent, lastOnlineVersion); //note: retry via recursion!!!
                     break;
-                case ConfirmationButton::CANCEL:
+                case ConfirmationButton::cancel:
                     break;
             }
     }
@@ -337,19 +337,19 @@ void fff::automaticUpdateCheckEval(wxWindow* parent, time_t& lastUpdateCheck, st
         {
             lastOnlineVersion = "Unknown";
 
-                switch (showQuestionDialog(parent, DialogInfoType::ERROR2, PopupDialogCfg().
+                switch (showQuestionDialog(parent, DialogInfoType::error, PopupDialogCfg().
                                            setTitle(_("Check for Program Updates")).
                                            setMainInstructions(_("Cannot find current FreeFileSync version number online. A newer version is likely available. Check manually now?")).
                                            setDetailInstructions(result.error->toString()),
                                            _("&Check"), _("&Retry")))
                 {
-                    case QuestionButton2::YES:
+                    case QuestionButton2::yes:
                         wxLaunchDefaultBrowser(L"https://freefilesync.org/get_latest.php");
                         break;
-                    case QuestionButton2::NO: //retry
+                    case QuestionButton2::no: //retry
                         automaticUpdateCheckEval(parent, lastUpdateCheck, lastOnlineVersion, asyncResult); //note: retry via recursion!!!
                         break;
-                    case QuestionButton2::CANCEL:
+                    case QuestionButton2::cancel:
                         break;
                 }
         }
diff --git a/FreeFileSync/Source/version/version.h b/FreeFileSync/Source/version/version.h
index c00375d5..ad914ec1 100644
--- a/FreeFileSync/Source/version/version.h
+++ b/FreeFileSync/Source/version/version.h
@@ -3,7 +3,7 @@
 
 namespace fff
 {
-const char ffsVersion[] = "10.14"; //internal linkage!
+const char ffsVersion[] = "10.15"; //internal linkage!
 const char FFS_VERSION_SEPARATOR = '.';
 }
 
diff --git a/wx+/graph.cpp b/wx+/graph.cpp
index 41750a48..2440f77d 100644
--- a/wx+/graph.cpp
+++ b/wx+/graph.cpp
@@ -451,7 +451,7 @@ Graph2D::Graph2D(wxWindow* parent,
 {
     Connect(wxEVT_PAINT, wxPaintEventHandler(Graph2D::onPaintEvent), nullptr, this);
     Connect(wxEVT_SIZE,  wxSizeEventHandler (Graph2D::onSizeEvent ), nullptr, this);
-    Bind(wxEVT_ERASE_BACKGROUND, [](wxEraseEvent& event) {}); //http://wiki.wxwidgets.org/Flicker-Free_Drawing
+    Bind(wxEVT_ERASE_BACKGROUND, [](wxEraseEvent& event) {}); //https://wiki.wxwidgets.org/Flicker-Free_Drawing
 
     //SetDoubleBuffered(true); slow as hell!
 
diff --git a/wx+/grid.cpp b/wx+/grid.cpp
index 804c8fba..851146bc 100644
--- a/wx+/grid.cpp
+++ b/wx+/grid.cpp
@@ -272,7 +272,7 @@ public:
     {
         Connect(wxEVT_PAINT, wxPaintEventHandler(SubWindow::onPaintEvent), nullptr, this);
         Connect(wxEVT_SIZE,  wxSizeEventHandler (SubWindow::onSizeEvent),  nullptr, this);
-        Bind(wxEVT_ERASE_BACKGROUND, [](wxEraseEvent& event) {}); //http://wiki.wxwidgets.org/Flicker-Free_Drawing
+        Bind(wxEVT_ERASE_BACKGROUND, [](wxEraseEvent& event) {}); //https://wiki.wxwidgets.org/Flicker-Free_Drawing
 
         //SetDoubleBuffered(true); slow as hell!
 
@@ -1326,7 +1326,7 @@ Grid::Grid(wxWindow* parent,
 
     Connect(wxEVT_PAINT, wxPaintEventHandler(Grid::onPaintEvent), nullptr, this);
     Connect(wxEVT_SIZE,  wxSizeEventHandler (Grid::onSizeEvent ), nullptr, this);
-    Bind(wxEVT_ERASE_BACKGROUND, [](wxEraseEvent& event) {}); //http://wiki.wxwidgets.org/Flicker-Free_Drawing
+    Bind(wxEVT_ERASE_BACKGROUND, [](wxEraseEvent& event) {}); //https://wiki.wxwidgets.org/Flicker-Free_Drawing
 
     Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(Grid::onKeyDown), nullptr, this);
     Connect(wxEVT_KEY_UP,   wxKeyEventHandler(Grid::onKeyUp  ), nullptr, this);
diff --git a/wx+/image_tools.h b/wx+/image_tools.h
index b1df41e6..2a0dd0d4 100644
--- a/wx+/image_tools.h
+++ b/wx+/image_tools.h
@@ -213,7 +213,7 @@ wxColor gradient(const wxColor& from, const wxColor& to, double fraction)
 inline
 wxColor hsvColor(double h, double s, double v) //h within [0, 360), s, v within [0, 1]
 {
-    //http://de.wikipedia.org/wiki/HSV-Farbraum
+    //https://de.wikipedia.org/wiki/HSV-Farbraum
 
     //make input values fit into bounds
     if (h > 360)
diff --git a/wx+/popup_dlg.cpp b/wx+/popup_dlg.cpp
index 8ee44521..11c4511f 100644
--- a/wx+/popup_dlg.cpp
+++ b/wx+/popup_dlg.cpp
@@ -79,16 +79,16 @@ public:
         wxString titleTmp;
         switch (type)
         {
-            case DialogInfoType::INFO:
+            case DialogInfoType::info:
                 //"Information" is meaningless as caption text!
                 //confirmation doesn't use info icon
                 //iconTmp = getResourceImage(L"msg_info");
                 break;
-            case DialogInfoType::WARNING:
+            case DialogInfoType::warning:
                 iconTmp  = getResourceImage(L"msg_warning");
                 titleTmp = _("Warning");
                 break;
-            case DialogInfoType::ERROR2:
+            case DialogInfoType::error:
                 iconTmp  = getResourceImage(L"msg_error");
                 titleTmp = _("Error");
                 break;
@@ -204,28 +204,28 @@ public:
     }
 
 private:
-    void OnClose (wxCloseEvent&   event) override { EndModal(static_cast<int>(ConfirmationButton3::CANCEL)); }
-    void OnCancel(wxCommandEvent& event) override { EndModal(static_cast<int>(ConfirmationButton3::CANCEL)); }
+    void OnClose (wxCloseEvent&   event) override { EndModal(static_cast<int>(ConfirmationButton3::cancel)); }
+    void OnCancel(wxCommandEvent& event) override { EndModal(static_cast<int>(ConfirmationButton3::cancel)); }
 
     void OnButtonAccept(wxCommandEvent& event) override
     {
         if (checkBoxValue_)
             *checkBoxValue_ = m_checkBoxCustom->GetValue();
-        EndModal(static_cast<int>(ConfirmationButton3::ACCEPT));
+        EndModal(static_cast<int>(ConfirmationButton3::accept));
     }
 
     void OnButtonAcceptAll(wxCommandEvent& event) override
     {
         if (checkBoxValue_)
             *checkBoxValue_ = m_checkBoxCustom->GetValue();
-        EndModal(static_cast<int>(ConfirmationButton3::ACCEPT_ALL));
+        EndModal(static_cast<int>(ConfirmationButton3::acceptAll));
     }
 
     void OnButtonDecline(wxCommandEvent& event) override
     {
         if (checkBoxValue_)
             *checkBoxValue_ = m_checkBoxCustom->GetValue();
-        EndModal(static_cast<int>(ConfirmationButton3::DECLINE));
+        EndModal(static_cast<int>(ConfirmationButton3::decline));
     }
 
     void OnKeyPressed(wxKeyEvent& event)
@@ -241,7 +241,7 @@ private:
             }
 
             case WXK_ESCAPE: //handle case where cancel button is hidden!
-                EndModal(static_cast<int>(ConfirmationButton3::CANCEL));
+                EndModal(static_cast<int>(ConfirmationButton3::cancel));
                 return;
         }
         event.Skip();
@@ -253,14 +253,14 @@ private:
     {
         switch (buttonToDisableWhenChecked_)
         {
-            case QuestionButton2::YES:
+            case QuestionButton2::yes:
                 m_buttonAccept   ->Enable(!m_checkBoxCustom->GetValue());
                 m_buttonAcceptAll->Enable(!m_checkBoxCustom->GetValue());
                 break;
-            case QuestionButton2::NO:
+            case QuestionButton2::no:
                 m_buttonDecline->Enable(!m_checkBoxCustom->GetValue());
                 break;
-            case QuestionButton2::CANCEL:
+            case QuestionButton2::cancel:
                 break;
         }
     }
diff --git a/wx+/popup_dlg.h b/wx+/popup_dlg.h
index 0acd2a95..1e0a1656 100644
--- a/wx+/popup_dlg.h
+++ b/wx+/popup_dlg.h
@@ -21,34 +21,34 @@ struct PopupDialogCfg;
 
 enum class DialogInfoType
 {
-    INFO,
-    WARNING,
-    ERROR2, //fuck the ERROR macro in WinGDI.h!
+    info,
+    warning,
+    error,
 };
 
 enum class ConfirmationButton3
 {
-    ACCEPT,
-    ACCEPT_ALL,
-    DECLINE,
-    CANCEL,
+    accept,
+    acceptAll,
+    decline,
+    cancel,
 };
 enum class ConfirmationButton
 {
-    ACCEPT = static_cast<int>(ConfirmationButton3::ACCEPT), //[!] Clang requires a "static_cast"
-    CANCEL = static_cast<int>(ConfirmationButton3::CANCEL), //
+    accept = static_cast<int>(ConfirmationButton3::accept), //[!] Clang requires a "static_cast"
+    cancel = static_cast<int>(ConfirmationButton3::cancel), //
 };
 enum class ConfirmationButton2
 {
-    ACCEPT     = static_cast<int>(ConfirmationButton3::ACCEPT),
-    ACCEPT_ALL = static_cast<int>(ConfirmationButton3::ACCEPT_ALL),
-    CANCEL     = static_cast<int>(ConfirmationButton3::CANCEL),
+    accept    = static_cast<int>(ConfirmationButton3::accept),
+    acceptAll = static_cast<int>(ConfirmationButton3::acceptAll),
+    cancel    = static_cast<int>(ConfirmationButton3::cancel),
 };
 enum class QuestionButton2
 {
-    YES    = static_cast<int>(ConfirmationButton3::ACCEPT),
-    NO     = static_cast<int>(ConfirmationButton3::DECLINE),
-    CANCEL = static_cast<int>(ConfirmationButton3::CANCEL),
+    yes    = static_cast<int>(ConfirmationButton3::accept),
+    no     = static_cast<int>(ConfirmationButton3::decline),
+    cancel = static_cast<int>(ConfirmationButton3::cancel),
 };
 
 void                showNotificationDialog(wxWindow* parent, DialogInfoType type, const PopupDialogCfg& cfg);
@@ -66,7 +66,7 @@ struct PopupDialogCfg
     PopupDialogCfg& setTitle             (const wxString& label) { title      = label; return *this; }
     PopupDialogCfg& setMainInstructions  (const wxString& label) { textMain   = label; return *this; } //set at least one of these!
     PopupDialogCfg& setDetailInstructions(const wxString& label) { textDetail = label; return *this; } //
-    PopupDialogCfg& setCheckBox(bool& value, const wxString& label, QuestionButton2 disableWhenChecked = QuestionButton2::CANCEL)
+    PopupDialogCfg& setCheckBox(bool& value, const wxString& label, QuestionButton2 disableWhenChecked = QuestionButton2::cancel)
     {
         checkBoxValue = &value;
         checkBoxLabel = label;
@@ -83,7 +83,7 @@ private:
     wxString textDetail;
     bool* checkBoxValue = nullptr; //in/out
     wxString checkBoxLabel;
-    QuestionButton2 buttonToDisableWhenChecked = QuestionButton2::CANCEL;
+    QuestionButton2 buttonToDisableWhenChecked = QuestionButton2::cancel;
 };
 }
 
diff --git a/wx+/rtl.h b/wx+/rtl.h
index 16fde699..0cae9bac 100644
--- a/wx+/rtl.h
+++ b/wx+/rtl.h
@@ -21,7 +21,7 @@ void drawBitmapRtlNoMirror(wxDC& dc, const wxBitmap& bmp, const wxRect& rect, in
 
 wxBitmap mirrorIfRtl(const wxBitmap& bmp);
 
-//manual text flow correction: http://www.w3.org/International/articles/inline-bidi-markup/
+//manual text flow correction: https://www.w3.org/International/articles/inline-bidi-markup/
 
 
 
diff --git a/wx+/tooltip.cpp b/wx+/tooltip.cpp
index 142c9b7f..42fb058a 100644
--- a/wx+/tooltip.cpp
+++ b/wx+/tooltip.cpp
@@ -13,6 +13,7 @@
 #include <wx/app.h>
 #include "image_tools.h"
 #include "dc.h"
+    #include <gtk/gtk.h>
 
 using namespace zen;
 
@@ -48,8 +49,8 @@ public:
 
     }
 
-    wxStaticText* staticTextMain_;
-    wxStaticBitmap* bitmapLeft_;
+    wxStaticText* staticTextMain_ = nullptr;
+    wxStaticBitmap* bitmapLeft_   = nullptr;
 };
 
 
@@ -80,7 +81,7 @@ void Tooltip::show(const wxString& text, wxPoint mousePos, const wxBitmap* bmp)
                            mousePos + wxPoint(fastFromDIP(TIP_WINDOW_OFFSET_DIP),                                    0);
 
     if (newPos != tipWindow_->GetScreenPosition())
-        tipWindow_->SetSize(newPos.x, newPos.y, wxDefaultCoord, wxDefaultCoord);
+        tipWindow_->Move(newPos);
     //attention!!! possible endless loop: mouse pointer must NOT be within tipWindow!
     //else it will trigger a wxEVT_LEAVE_WINDOW on middle grid which will hide the window, causing the window to be shown again via this method, etc.
 
@@ -93,8 +94,15 @@ void Tooltip::hide()
 {
     if (tipWindow_)
     {
-        //on wxGTK the tooltip is sometimes not shown again after it was hidden: e.g. drag-selection on middle grid
+#if GTK_MAJOR_VERSION == 2 //the tooltip sometimes turns blank or is not shown again after it was hidden: e.g. drag-selection on middle grid
         tipWindow_->Destroy(); //apply brute force:
         tipWindow_ = nullptr;  //
+
+#elif GTK_MAJOR_VERSION == 3
+        tipWindow_->Hide();
+#else
+#error unknown GTK version!
+#endif
+
     }
 }
diff --git a/xBRZ/src/xbrz.cpp b/xBRZ/src/xbrz.cpp
index 71c0ec8f..0bf9db17 100644
--- a/xBRZ/src/xbrz.cpp
+++ b/xBRZ/src/xbrz.cpp
@@ -27,7 +27,7 @@ using namespace xbrz;
 namespace
 {
 template <unsigned int M, unsigned int N> inline
-uint32_t gradientRGB(uint32_t pixFront, uint32_t pixBack) //blend front color with opacity M / N over opaque background: http://en.wikipedia.org/wiki/Alpha_compositing#Alpha_blending
+uint32_t gradientRGB(uint32_t pixFront, uint32_t pixBack) //blend front color with opacity M / N over opaque background: https://en.wikipedia.org/wiki/Alpha_compositing#Alpha_blending
 {
     static_assert(0 < M && M < N && N <= 1000);
 
@@ -151,7 +151,7 @@ double distRGB(uint32_t pix1, uint32_t pix2)
 inline
 double distYCbCr(uint32_t pix1, uint32_t pix2, double lumaWeight)
 {
-    //http://en.wikipedia.org/wiki/YCbCr#ITU-R_BT.601_conversion
+    //https://en.wikipedia.org/wiki/YCbCr#ITU-R_BT.601_conversion
     //YCbCr conversion is a matrix multiplication => take advantage of linearity by subtracting first!
     const int r_diff = static_cast<int>(getRed  (pix1)) - getRed  (pix2); //we may delay division by 255 to after matrix multiplication
     const int g_diff = static_cast<int>(getGreen(pix1)) - getGreen(pix2); //
diff --git a/zen/base64.h b/zen/base64.h
index 54a0a98b..623f8f7f 100644
--- a/zen/base64.h
+++ b/zen/base64.h
@@ -13,7 +13,7 @@
 
 namespace zen
 {
-//http://en.wikipedia.org/wiki/Base64
+//https://en.wikipedia.org/wiki/Base64
 /*
 Usage:
     const std::string input = "Sample text";
diff --git a/zen/basic_math.h b/zen/basic_math.h
index 75f5d3b8..b9be28be 100644
--- a/zen/basic_math.h
+++ b/zen/basic_math.h
@@ -254,7 +254,7 @@ double median(RandomAccessIterator first, RandomAccessIterator last) //note: inv
 template <class RandomAccessIterator> inline
 double mad(RandomAccessIterator first, RandomAccessIterator last) //note: invalidates input range!
 {
-    //http://en.wikipedia.org/wiki/Median_absolute_deviation
+    //https://en.wikipedia.org/wiki/Median_absolute_deviation
     const size_t n = last - first;
     if (n == 0)
         return 0;
@@ -277,7 +277,7 @@ double mad(RandomAccessIterator first, RandomAccessIterator last) //note: invali
 template <class InputIterator> inline
 double stdDeviation(InputIterator first, InputIterator last, double* arithMean)
 {
-    //implementation minimizing rounding errors, see: http://en.wikipedia.org/wiki/Standard_deviation
+    //implementation minimizing rounding errors, see: https://en.wikipedia.org/wiki/Standard_deviation
     //combined with technique avoiding overflow, see: http://www.netlib.org/blas/dnrm2.f -> only 10% performance degradation
 
     size_t n     = 0;
diff --git a/zen/dir_watcher.h b/zen/dir_watcher.h
index f552e2b2..875a0098 100644
--- a/zen/dir_watcher.h
+++ b/zen/dir_watcher.h
@@ -17,8 +17,8 @@
 namespace zen
 {
 //Windows: ReadDirectoryChangesW https://msdn.microsoft.com/en-us/library/aa365465
-//Linux:   inotify               http://linux.die.net/man/7/inotify
-//OS X:    kqueue                http://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man2/kqueue.2.html
+//Linux:   inotify               https://linux.die.net/man/7/inotify
+//OS X:    kqueue                https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man2/kqueue.2.html
 
 //watch directory including subdirectories
 /*
diff --git a/zen/guid.h b/zen/guid.h
index c89e8082..657ed07a 100644
--- a/zen/guid.h
+++ b/zen/guid.h
@@ -8,7 +8,7 @@
 #define GUID_H_80425780237502345
 
     #include <fcntl.h> //open
-    #include <unistd.h> //close
+    #include <unistd.h> //close, getentropy
     #include <zen/sys_error.h>
     //#include <uuid/uuid.h> -> uuid_generate(), uuid_unparse(); avoid additional dependency for "sudo apt-get install uuid-dev"
 
@@ -19,6 +19,11 @@ inline
 std::string generateGUID() //creates a 16-byte GUID
 {
     std::string guid(16, '\0');
+
+#ifndef __GLIBC__
+#error Where is GLIB?
+#endif
+
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 25) //getentropy() requires glibc 2.25 (ldd --version) PS: CentOS 7 is on 2.17
     if (::getentropy(&guid[0], guid.size()) != 0)  //"The maximum permitted value for the length argument is 256"
         throw std::runtime_error(std::string(__FILE__) + "[" + numberTo<std::string>(__LINE__) + "] Failed to generate GUID." +
diff --git a/zen/http.cpp b/zen/http.cpp
index 43c9dcbf..d4c30741 100644
--- a/zen/http.cpp
+++ b/zen/http.cpp
@@ -46,9 +46,9 @@ public:
         else //HTTP default port: 80, see %WINDIR%\system32\drivers\etc\services
             socket_ = std::make_unique<Socket>(server, Zstr("http")); //throw SysError
 
-		//we don't support "chunked transfer encoding" => HTTP 1.0
+		//we don't support "chunked and gzip transfer encoding" => HTTP 1.0
         std::map<std::string, std::string, LessAsciiNoCase> headers;
-        headers["Host"      ] = utfTo<std::string>(server); //only required for HTTP/1.1
+        headers["Host"      ] = utfTo<std::string>(server); //only required for HTTP/1.1 but a few servers expect it even for HTTP/1.0
         headers["User-Agent"] = utfTo<std::string>(userAgent);
         headers["Accept"    ] = "*/*"; //won't hurt?
 
@@ -234,7 +234,7 @@ std::unique_ptr<HttpInputStream::Impl> sendHttpRequestImpl(const Zstring& url,
     {
         auto response = std::make_unique<HttpInputStream::Impl>(urlRed, postParams, false /*disableGetCache*/, userAgent, caCertFilePath, notifyUnbufferedIO); //throw SysError
 
-        //http://en.wikipedia.org/wiki/List_of_HTTP_status_codes#3xx_Redirection
+        //https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#3xx_Redirection
         const int statusCode = response->getStatusCode();
         if (statusCode / 100 == 3) //e.g. 301, 302, 303, 307... we're not too greedy since we check location, too!
         {
@@ -271,11 +271,10 @@ std::string urlencode(const std::string& str)
             out += c;
         else
         {
-            const std::pair<char, char> hex = hexify(c);
-
+			const auto [high, low] = hexify(c);
             out += '%';
-            out += hex.first;
-            out += hex.second;
+            out += high;
+            out += low;
         }
     return out;
 }
diff --git a/zen/json.h b/zen/json.h
index 374a3f14..9b85ccb9 100644
--- a/zen/json.h
+++ b/zen/json.h
@@ -104,10 +104,10 @@ std::string jsonEscape(const std::string& str)
 
         else if (static_cast<unsigned char>(c) < 32)
         {
-            const auto hexDigits = hexify(c);
+			const auto [high, low] = hexify(c);
             output += "\\u00";
-            output += hexDigits.first;
-            output += hexDigits.second;
+            output += high;
+            output += low;
         }
         else
             output += c;
diff --git a/zen/open_ssl.cpp b/zen/open_ssl.cpp
index 0f07e5e3..f3fd7219 100644
--- a/zen/open_ssl.cpp
+++ b/zen/open_ssl.cpp
@@ -12,8 +12,44 @@
 using namespace zen;
 
 
+#ifndef OPENSSL_THREADS
+    #error FFS, we are royally screwed!
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+    #error OpenSSL version too old
+#endif
+
+
+void zen::openSslInit()
+{
+    //official Wiki:           https://wiki.openssl.org/index.php/Library_Initialization
+    //see apps_shutdown():     https://github.com/openssl/openssl/blob/master/apps/openssl.c
+    //see Curl_ossl_cleanup(): https://github.com/curl/curl/blob/master/lib/vtls/openssl.c
+
+    //excplicitly init OpenSSL on main thread: seems to initialize atomically! But it still might help to avoid issues:
+    [[maybe_unused]] const int rv = ::OPENSSL_init_ssl(OPENSSL_INIT_SSL_DEFAULT, nullptr);
+    assert(rv == 1); //https://www.openssl.org/docs/man1.1.0/ssl/OPENSSL_init_ssl.html
+}
+
+
+void zen::openSslTearDown() {}
+//OpenSSL 1.1.0+ deprecates all clean up functions
+//=> so much the theory, in practice it leaks, of course: https://github.com/openssl/openssl/issues/6283
+//=> OpenSslThreadCleanUp
+
 namespace
 {
+struct OpenSslThreadCleanUp
+{
+    ~OpenSslThreadCleanUp()
+    {
+        ::OPENSSL_thread_stop();
+    }
+};
+thread_local OpenSslThreadCleanUp tearDownOpenSslThreadData;
+
+
 /*  Sign a file using SHA-256:
         openssl dgst -sha256 -sign private.pem -out file.sig file.txt
 
@@ -468,7 +504,7 @@ public:
             throw SysError(formatLastOpenSSLError(L"BIO_up_ref"));
         ::SSL_set0_wbio(ssl_, bio); //pass ownership
 
-		assert(::SSL_get_mode(ssl_) == SSL_MODE_AUTO_RETRY); //verify OpenSSL default
+        assert(::SSL_get_mode(ssl_) == SSL_MODE_AUTO_RETRY); //verify OpenSSL default
         ::SSL_set_mode(ssl_, SSL_MODE_ENABLE_PARTIAL_WRITE);
 
         if (::SSL_set_tlsext_host_name(ssl_, server.c_str()) != 1) //enable SNI (Server Name Indication)
diff --git a/zen/open_ssl.h b/zen/open_ssl.h
index 5bf4e9ce..350e3776 100644
--- a/zen/open_ssl.h
+++ b/zen/open_ssl.h
@@ -11,8 +11,13 @@
 #include <zen/sys_error.h>
 
 
-namespace zen //init OpenSSL before use!
+namespace zen
 {
+//init OpenSSL before use!
+void openSslInit();
+void openSslTearDown();
+
+
 enum class RsaStreamType
 {
     pkix,  //base-64-encoded SubjectPublicKeyInfo structure ("BEGIN PUBLIC KEY")
diff --git a/zen/process_priority.cpp b/zen/process_priority.cpp
index e925f142..f80dd022 100644
--- a/zen/process_priority.cpp
+++ b/zen/process_priority.cpp
@@ -24,7 +24,7 @@ ScheduleForBackgroundProcessing::~ScheduleForBackgroundProcessing() {};
 /*
 struct ScheduleForBackgroundProcessing
 {
-    - required functions ioprio_get/ioprio_set are not part of glibc: http://linux.die.net/man/2/ioprio_set
+    - required functions ioprio_get/ioprio_set are not part of glibc: https://linux.die.net/man/2/ioprio_set
     - and probably never will: http://sourceware.org/bugzilla/show_bug.cgi?id=4464
     - /usr/include/linux/ioprio.h not available on Ubuntu, so we can't use it instead
 
diff --git a/zen/shell_execute.h b/zen/shell_execute.h
index 19945a0b..4875a039 100644
--- a/zen/shell_execute.h
+++ b/zen/shell_execute.h
@@ -41,7 +41,7 @@ void shellExecute(const Zstring& command, ExecutionType type, bool hideConsole)
         const int rv = ::system(command.c_str()); //do NOT use std::system as its documentation says nothing about "WEXITSTATUS(rv)", etc...
         if (rv == -1 || WEXITSTATUS(rv) == 127)
             throw FileError(_("Incorrect command line:") + L"\n" + utfTo<std::wstring>(command));
-        //http://linux.die.net/man/3/system "In case /bin/sh could not be executed, the exit status will be that of a command that does exit(127)"
+        //https://linux.die.net/man/3/system "In case /bin/sh could not be executed, the exit status will be that of a command that does exit(127)"
         //Bonus: For an incorrect command line /bin/sh also returns with 127!
     }
     else
diff --git a/zen/stl_tools.h b/zen/stl_tools.h
index f1ab7c16..15e7f7ca 100644
--- a/zen/stl_tools.h
+++ b/zen/stl_tools.h
@@ -283,7 +283,7 @@ void mergeTraversal(Iterator first1, Iterator last1,
 }
 
 
-//FNV-1a: http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+//FNV-1a: https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
 template <class Num, class ByteIterator> inline
 Num hashBytes(ByteIterator first, ByteIterator last)
 {
diff --git a/zen/type_traits.h b/zen/type_traits.h
index 8783cb6a..9823bb44 100644
--- a/zen/type_traits.h
+++ b/zen/type_traits.h
@@ -9,7 +9,7 @@
 
 #include <type_traits>
 
-//http://en.cppreference.com/w/cpp/header/type_traits
+//https://en.cppreference.com/w/cpp/header/type_traits
 
 namespace zen
 {
@@ -43,7 +43,7 @@ constexpr S arrayAccumulate(T (&arr)[N])
     return sum;
 }
 
-//Herb Sutter's signedness conversion helpers: http://herbsutter.com/2013/06/13/gotw-93-solution-auto-variables-part-2/
+//Herb Sutter's signedness conversion helpers: https://herbsutter.com/2013/06/13/gotw-93-solution-auto-variables-part-2/
 template<class T> inline auto makeSigned  (T t) { return static_cast<std::make_signed_t  <T>>(t); }
 template<class T> inline auto makeUnsigned(T t) { return static_cast<std::make_unsigned_t<T>>(t); }
 
diff --git a/zen/utf.h b/zen/utf.h
index 37a866ab..75bf7424 100644
--- a/zen/utf.h
+++ b/zen/utf.h
@@ -58,7 +58,7 @@ static_assert(LEAD_SURROGATE + TRAIL_SURROGATE + TRAIL_SURROGATE_MAX + REPLACEME
 template <class Function> inline
 void codePointToUtf16(CodePoint cp, Function writeOutput) //"writeOutput" is a unary function taking a Char16
 {
-    //http://en.wikipedia.org/wiki/UTF-16
+    //https://en.wikipedia.org/wiki/UTF-16
     if (cp < LEAD_SURROGATE)
         writeOutput(static_cast<Char16>(cp));
     else if (cp <= TRAIL_SURROGATE_MAX) //invalid code point
@@ -141,7 +141,7 @@ private:
 template <class Function> inline
 void codePointToUtf8(CodePoint cp, Function writeOutput) //"writeOutput" is a unary function taking a Char8
 {
-    //http://en.wikipedia.org/wiki/UTF-8
+    //https://en.wikipedia.org/wiki/UTF-8
     //assert(cp < LEAD_SURROGATE || TRAIL_SURROGATE_MAX < cp); //code points [0xd800, 0xdfff] are reserved for UTF-16 and *should* not be encoded in UTF-8
 
     if (cp < 0x80)
diff --git a/zen/zstring.cpp b/zen/zstring.cpp
index 3b33a21b..ad736d04 100644
--- a/zen/zstring.cpp
+++ b/zen/zstring.cpp
@@ -8,7 +8,7 @@
 #include <stdexcept>
 #include "utf.h"
 
-    #include <gtk/gtk.h>
+#include <glib.h>
     #include "sys_error.h"
 
 using namespace zen;
diff --git a/zenXml/zenxml/parser.h b/zenXml/zenxml/parser.h
index 70bf6654..f7604ebf 100644
--- a/zenXml/zenxml/parser.h
+++ b/zenXml/zenxml/parser.h
@@ -82,7 +82,7 @@ std::string normalize(const std::string& str, Predicate pred) //pred: unary func
     {
         if (c == '&')      //
             output += "&amp;";
-        else if (c == '<') //normalization mandatory: http://www.w3.org/TR/xml/#syntax
+        else if (c == '<') //normalization mandatory: https://www.w3.org/TR/xml/#syntax
             output += "&lt;";
         else if (c == '>') //
             output += "&gt;";
@@ -95,9 +95,9 @@ std::string normalize(const std::string& str, Predicate pred) //pred: unary func
             else
             {
                 output += "&#x";
-                const auto hexDigits = hexify(c);
-                output += hexDigits.first;
-                output += hexDigits.second;
+				const auto [high, low] = hexify(c);
+                output += high;
+                output += low;
                 output += ';';
             }
         }
@@ -176,7 +176,7 @@ std::string denormalize(const std::string& str)
             else
                 output += c; //unexpected char!
         }
-        else if (c == '\r') //map all end-of-line characters to \n http://www.w3.org/TR/xml/#sec-line-ends
+        else if (c == '\r') //map all end-of-line characters to \n https://www.w3.org/TR/xml/#sec-line-ends
         {
             auto itNext = it + 1;
             if (itNext != str.end() && *itNext == '\n')
diff --git a/zenXml/zenxml/xml.h b/zenXml/zenxml/xml.h
index 15d635bd..80b60730 100644
--- a/zenXml/zenxml/xml.h
+++ b/zenXml/zenxml/xml.h
@@ -368,8 +368,10 @@ public:
     std::vector<String> getErrorsAs() const
     {
         std::vector<String> output;
-        const auto& elements = log_.ref().elementList();
-        std::transform(elements.begin(), elements.end(), std::back_inserter(output), [](const std::string& str) { return utfTo<String>(str); });
+
+		for (const std::string& str : log_.ref().elementList())
+			output.push_back(utfTo<String>(str));
+
         return output;
     }
author	B Stack <bgstack15@gmail.com>	2019-09-03 20:50:36 +0000
committer	B Stack <bgstack15@gmail.com>	2019-09-03 20:50:36 +0000
commit	89b5c8eb6012b7b4560958ad3c1aa5b187dafc94 (patch)
tree	afc54ec004ab863262f5621fbf282c42fdff29cc
parent	Merge branch '10.14' into 'master' (diff)
parent	add upstream 10.15 (diff)
download	FreeFileSync-10.15.tar.gz FreeFileSync-10.15.tar.bz2 FreeFileSync-10.15.zip