5.15

30 files changed, 3709 insertions, 4108 deletions

diff --git a/BUILD/Languages/arabic.lng b/BUILD/Languages/arabic.lng
index 5be24fe3..668ee713 100644
--- a/BUILD/Languages/arabic.lng
+++ b/BUILD/Languages/arabic.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>مجموع الوقت:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target></target>
+
 <source>Show in Explorer</source>
 <target>إظهار في المستكشف</target>
 
@@ -61,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>مسح إعدادات عامل التصفية</target>
 
+<source>Copy</source>
+<target>نسخ</target>
+
+<source>Paste</source>
+<target></target>
+
 <source>Save as batch job</source>
 <target>حفظ كمهمة دفعية</target>
 
@@ -164,9 +173,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>في انتظار تأمين قفل للمسار (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>لا يمكن تعيين قفل للمسار %x.</target>
-
 <source>Creating file %x</source>
 <target>إنشاء الملف %x</target>
 
@@ -208,9 +214,6 @@
 <source>/sec</source>
 <target>\ثانية</target>
 
-<source>Cannot find file %x.</source>
-<target>لا يمكن العثور على الملف  %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>لا يحتوي الملف %x تكويناً صحيحاً.</target>
 
@@ -235,6 +238,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>لا يمكن قراءة عناصر XML التالية:</target>
 
+<source>Cannot find file %x.</source>
+<target>لا يمكن العثور على الملف  %x.</target>
+
 <source>&Open...</source>
 <target>&فتح...</target>
 
@@ -468,8 +474,14 @@ The command is triggered if:
 <source>&Advanced</source>
 <target>&متقدم</target>
 
-<source>&Check for new version</source>
-<target>&التحقق من وجود إصدار جديد</target>
+<source>&Check now</source>
+<target></target>
+
+<source>Check &automatically once a week</source>
+<target></target>
+
+<source>Check for new version</source>
+<target></target>
 
 <source>Compare</source>
 <target>قارن</target>
@@ -615,8 +627,8 @@ is the same
 <source><- Two way -></source>
 <target><- بالاتجاهين -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>تحديد التغييرات في كلا الجانبين باستخدام قواعد بيانات. حيث يتم الكشف عن عمليات الحذف وإعادة التسمية والاختلافات بشكل تلقائي.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target></target>
 
 <source>Mirror ->></source>
 <target>انعكاس ->></target>
@@ -654,15 +666,12 @@ is the same
 <source>Versioning</source>
 <target>الوسم برقم الإصدار</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>نقل الملفات المحددة بختم زمني إلى المجلد المحدد</target>
+<source>Move files to user-defined folder</source>
+<target></target>
 
 <source>Naming convention:</source>
 <target>اصطلاح التسمية:</target>
 
-<source>Configuration</source>
-<target>التكوين</target>
-
 <source>Item exists on left side only</source>
 <target>العنصر موجود على الجانب الأيسر فقط</target>
 
@@ -741,8 +750,8 @@ Note: File names must be relative to base directories!
 <source>Maximum</source>
 <target>الحد الأقصى</target>
 
-<source>&Default</source>
-<target>&الافتراضي</target>
+<source>&Clear</source>
+<target></target>
 
 <source>Fail-safe file copy</source>
 <target>نسخ ملفات آمن من الفشل</target>
@@ -771,6 +780,9 @@ Note: File names must be relative to base directories!
 <source>Description</source>
 <target>الوصف</target>
 
+<source>&Default</source>
+<target>&الافتراضي</target>
+
 <source>Start synchronization</source>
 <target>بدء المزامنة</target>
 
@@ -804,6 +816,9 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>نظرة عامة</target>
 
+<source>Configuration</source>
+<target>التكوين</target>
+
 <source>Filter files</source>
 <target>تصفية الملفات</target>
 
@@ -888,87 +903,45 @@ Note: File names must be relative to base directories!
 <source>Configuration loaded!</source>
 <target>تم فتح التكوين!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>إخفاء الملفات الموجودة في الجانب الأيسر فقط</target>
-
 <source>Show files that exist on left side only</source>
 <target>إظهار الملفات الموجودة في الجانب الأيسر فقط</target>
 
-<source>Hide files that exist on right side only</source>
-<target>إخفاء الملفات الموجودة في الجانب الأيمن فقط</target>
-
 <source>Show files that exist on right side only</source>
 <target>إظهار الملفات الموجودة في الجانب الأيمن فقط</target>
 
-<source>Hide files that are newer on left</source>
-<target>إخفاء الملفات الأحدث في اليسار</target>
-
 <source>Show files that are newer on left</source>
 <target>إظهار الملفات الأحدث في اليسار</target>
 
-<source>Hide files that are newer on right</source>
-<target>إخفاء الملفات الأحدث في اليمين</target>
-
 <source>Show files that are newer on right</source>
 <target>إظهار الملفات الأحدث في اليمين</target>
 
-<source>Hide files that are equal</source>
-<target>إخفاء الملفات المتماثلة على الطرفين</target>
-
 <source>Show files that are equal</source>
 <target>إظهار الملفات المتماثلة على الطرفين</target>
 
-<source>Hide files that are different</source>
-<target>إخفاء الملفات المختلفة على الطرفين</target>
-
 <source>Show files that are different</source>
 <target>إظهار الملفات المختلفة على الطرفين</target>
 
-<source>Hide conflicts</source>
-<target>إخفاء الاختلافات</target>
-
 <source>Show conflicts</source>
 <target>إظهار الاختلافات</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>إخفاء الملفات التي سيتم إنشاؤها في الجانب الأيسر</target>
-
 <source>Show files that will be created on the left side</source>
 <target>إظهار الملفات التي سيتم إنشاؤها في الجانب الأيسر</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>إخفاء الملفات التي سيتم إنشاؤها في الجانب الأيمن</target>
-
 <source>Show files that will be created on the right side</source>
 <target>إظهار الملفات التي سيتم إنشاؤها في الجانب الأيمن</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>إخفاء الملفات التي سيتم حذفها من الجانب الأيسر</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>إظهار الملفات التي سيتم حذفها من من الجانب الأيسر</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>إخفاء الملفات التي سيتم حذفها من الجانب الأيمن</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>إظهار الملفات التي سيتم حذفها من الجانب الأيمن</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>إخفاء الملفات التي سيتم الكتابة فوقها في الجانب الأيسر</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>إظهار الملفات التي سيتم الكتابة فوقها في الجانب الأيسر</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>إخفاء الملفات التي سيتم الكتابة فوقها في الجانب الأيمن</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>إظهار الملفات التي سيتم الكتابة فوقها في الجانب الأيمن</target>
 
-<source>Hide files that won't be copied</source>
-<target>إخفاء الملفات التي لن يتم نسخها</target>
-
 <source>Show files that won't be copied</source>
 <target>إظهار الملفات التي لن يتم نسخها</target>
 
@@ -987,6 +960,9 @@ Note: File names must be relative to base directories!
 <source>File list exported!</source>
 <target>تم تصدير قائمة الملفات!</target>
 
+<source>Searching for program updates...</source>
+<target></target>
+
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
@@ -1032,6 +1008,9 @@ Note: File names must be relative to base directories!
 <source>&Ignore</source>
 <target>&تجاهل</target>
 
+<source>Don't show this warning again</source>
+<target></target>
+
 <source>&Switch</source>
 <target>&تبديل</target>
 
@@ -1050,9 +1029,6 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>مقارنة المحتوى...</target>
 
-<source>Copy</source>
-<target>نسخ</target>
-
 <source>Paused</source>
 <target>تم الإيقاف مؤقتاً</target>
 
@@ -1135,34 +1111,23 @@ Note: File names must be relative to base directories!
 <target>جعل التحذيرات و نوافذ الحوارات المخفية مرئية من جديد؟</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
-<target>
-<pluralform>هل تريد حقاً نقل ولا ملف</pluralform>
-<pluralform>هل تريد حقاً نقل هذا الملف ؟</pluralform>
-<pluralform>هل تريد حقاً نقل هذين الملفين ؟</pluralform>
-<pluralform>هل تريد حقاً نقل هذه الـ %x ملفاً ؟</pluralform>
-<pluralform>هل تريد حقاً نقل هذه الـ %x ملفاً ؟</pluralform>
-<pluralform>هل تريد حقاً نقل هذه الـ %x ملفاً ؟</pluralform>
-</target>
+<target></target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>هل تريد حقاً حذف ولا ملف</pluralform>
-<pluralform>هل تريد حقاً حذف هذا الملف ؟</pluralform>
-<pluralform>هل تريد حقاً حذف هذين الملفين ؟</pluralform>
-<pluralform>هل تريد حقاً حذف هذه الـ %x ملفاً ؟</pluralform>
-<pluralform>هل تريد حقاً حذف هذه الـ %x ملفاً ؟</pluralform>
-<pluralform>هل تريد حقاً حذف هذه الـ %x ملفاً ؟</pluralform>
-</target>
+<target></target>
 
 <source>Leave as unresolved conflict</source>
 <target>ترك كاختلافات من دون حل</target>
 
+<source>Time stamp</source>
+<target></target>
+
 <source>Append a timestamp to each file name</source>
 <target>إلحاق طابع زمني اسم كل ملف</target>
 
@@ -1346,20 +1311,23 @@ Note: File names must be relative to base directories!
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>سلة المهملات غير متوفر للمسارات التالية! سيتم حذف الملفات بشكل دائم بدلاً من ذلك:</target>
 
-<source>You can ignore this error to consider each folder as empty.</source>
-<target>بإمكانك تجاهل هذا الخطأ باعتبالا كل مجلد و كأنه فارغ</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target></target>
 
 <source>Cannot find the following folders:</source>
 <target>تعذر العثور على المجلدات التالية:</target>
 
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>بإمكانك تجاهل هذا الخطأ باعتبالا كل مجلد و كأنه فارغ</target>
+
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>المسارات تلعية! كن حذراً عند إعداد قواعد المزامنة:</target>
 
 <source>Start comparison</source>
 <target>ابدأ المقارنة</target>
 
-<source>Preparing synchronization...</source>
-<target>تهيئة المزامنة...</target>
+<source>Calculating sync directions...</source>
+<target></target>
 
 <source>Conflict detected:</source>
 <target>تم الكشف عن تعارض:</target>
@@ -1502,6 +1470,9 @@ Note: File names must be relative to base directories!
 <source>Generating database...</source>
 <target>إنشاء قاعدة بيانات...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target></target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>خطأ تحقق بيانات: للملف المصدر والملف الهدف محتويات مختلفة!</target>
 
diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index 5c431691..3d0f0d25 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>总共时间:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target></target>
+
 <source>Show in Explorer</source>
 <target>在Explorer中显示</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>错误</target>
 
+<source>Selected variant:</source>
+<target></target>
+
 <source>Select alternate comparison settings</source>
 <target>选择替换的比较设置</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>清除过滤器设置</target>
 
+<source>Copy</source>
+<target>复制</target>
+
+<source>Paste</source>
+<target></target>
+
 <source>Save as batch job</source>
 <target>另存为批处理作业</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>致命错误</target>
 
-<source>Windows Error Code %x:</source>
-<target>Windows错误代码 %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux错误代码 %x:</target>
+<source>Error Code %x:</source>
+<target></target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>无法解决符号连接 %x.</target>
@@ -159,8 +168,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>由于目录已锁定而正在等待(%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>无法设置目录锁定 %x .</target>
+<source>Creating file %x</source>
+<target>正在创建文件 %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -190,9 +199,6 @@
 <source>/sec</source>
 <target>/秒</target>
 
-<source>Cannot find file %x.</source>
-<target>无法找到文件 %x .</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>文件 %x 并未包含合法的配置.</target>
 
@@ -217,6 +223,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>无法读取如下XML元素:</target>
 
+<source>Cannot find file %x.</source>
+<target>无法找到文件 %x .</target>
+
 <source>&Open...</source>
 <target>打开(&O)...</target>
 
@@ -450,24 +459,21 @@ The command is triggered if:
 <source>&Advanced</source>
 <target>高级(&A)</target>
 
-<source>&Check for new version</source>
-<target>检查更新(&C)</target>
+<source>&Check now</source>
+<target></target>
 
-<source>Compare</source>
-<target>比较</target>
+<source>Check &automatically once a week</source>
+<target></target>
 
-<source>Compare both sides</source>
-<target>比较两侧</target>
+<source>Check for new version</source>
+<target></target>
 
-<source>&Abort</source>
-<target>取消(&A)</target>
+<source>Compare</source>
+<target>比较</target>
 
 <source>Synchronize</source>
 <target>同步</target>
 
-<source>Start synchronization</source>
-<target>开始同步</target>
-
 <source>Add folder pair</source>
 <target>添加成对文件夹</target>
 
@@ -477,15 +483,6 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>两侧互换</target>
 
-<source>Open</source>
-<target>打开</target>
-
-<source>Save</source>
-<target>保存</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>最后使用的配置(按DEL键将其从列表中移除)</target>
-
 <source>Hide excluded items</source>
 <target>隐藏排除项目</target>
 
@@ -516,6 +513,18 @@ The command is triggered if:
 <source>Time elapsed:</source>
 <target>已用时间:</target>
 
+<source>Synchronizing...</source>
+<target>同步中...</target>
+
+<source>On completion</source>
+<target>在完成时</target>
+
+<source>Close</source>
+<target></target>
+
+<source>&Pause</source>
+<target>暂停(&P)</target>
+
 <source>Batch job</source>
 <target>批处理作业</target>
 
@@ -546,9 +555,6 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>在第一个错误时中止同步</target>
 
-<source>On completion</source>
-<target>在完成时</target>
-
 <source>Show progress dialog</source>
 <target>显示进度对话框</target>
 
@@ -606,8 +612,8 @@ is the same
 <source><- Two way -></source>
 <target><-双向-></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>使用一个数据库来识别和传播两边的改变. 删除，重命名和冲突会自动检测.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target></target>
 
 <source>Mirror ->></source>
 <target>镜像 ->></target>
@@ -645,15 +651,12 @@ is the same
 <source>Versioning</source>
 <target>保留历史版本</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>移动时间标记文件到指定的文件夹</target>
+<source>Move files to user-defined folder</source>
+<target></target>
 
 <source>Naming convention:</source>
 <target>命名规则:</target>
 
-<source>Configuration</source>
-<target>配置</target>
-
 <source>Item exists on left side only</source>
 <target>项目仅存在于左侧</target>
 
@@ -672,12 +675,6 @@ is the same
 <source>Conflict/item cannot be categorized</source>
 <target>冲突/项目未能被分类</target>
 
-<source>Synchronizing...</source>
-<target>同步中...</target>
-
-<source>&Pause</source>
-<target>暂停(&P)</target>
-
 <source>Source code written in C++ using:</source>
 <target>源代码用如下C++工具写成:</target>
 
@@ -738,8 +735,8 @@ Note: File names must be relative to base directories!
 <source>Maximum</source>
 <target>最大</target>
 
-<source>&Default</source>
-<target>默认(&D)</target>
+<source>&Clear</source>
+<target></target>
 
 <source>Fail-safe file copy</source>
 <target>无风险的文件复制</target>
@@ -768,6 +765,12 @@ Note: File names must be relative to base directories!
 <source>Description</source>
 <target>描述</target>
 
+<source>&Default</source>
+<target>默认(&D)</target>
+
+<source>Start synchronization</source>
+<target>开始同步</target>
+
 <source>Variant</source>
 <target>变化</target>
 
@@ -798,12 +801,24 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>摘要</target>
 
+<source>Configuration</source>
+<target>配置</target>
+
 <source>Filter files</source>
 <target>过滤器文件</target>
 
 <source>Select view</source>
 <target>选择视图</target>
 
+<source>Open...</source>
+<target></target>
+
+<source>Save</source>
+<target>保存</target>
+
+<source>Compare both sides</source>
+<target>比较两侧</target>
+
 <source>Set direction:</source>
 <target>设置方向:</target>
 
@@ -861,102 +876,63 @@ Note: File names must be relative to base directories!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync批处理文件</target>
 
-<source>Never save changes</source>
-<target>永不保存更改</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>是否要保存修改到 %x ?</target>
 
 <source>Do&n't save</source>
 <target>不保存(&N)</target>
 
+<source>Never save changes</source>
+<target>永不保存更改</target>
+
 <source>Configuration loaded!</source>
 <target>配置已加载!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>隐藏仅在左侧的文件</target>
-
 <source>Show files that exist on left side only</source>
 <target>显示仅存在左侧的文件</target>
 
-<source>Hide files that exist on right side only</source>
-<target>隐藏仅在右侧的文件</target>
-
 <source>Show files that exist on right side only</source>
 <target>显示仅存在右侧的文件</target>
 
-<source>Hide files that are newer on left</source>
-<target>隐藏左侧较新的文件</target>
-
 <source>Show files that are newer on left</source>
 <target>显示左侧较新的文件</target>
 
-<source>Hide files that are newer on right</source>
-<target>隐藏右侧较新的文件</target>
-
 <source>Show files that are newer on right</source>
 <target>显示右侧较新的文件</target>
 
-<source>Hide files that are equal</source>
-<target>隐藏相同的文件</target>
-
 <source>Show files that are equal</source>
 <target>显示相同的文件</target>
 
-<source>Hide files that are different</source>
-<target>隐藏不同的文件</target>
-
 <source>Show files that are different</source>
 <target>显示不同的文件</target>
 
-<source>Hide conflicts</source>
-<target>隐藏冲突</target>
-
 <source>Show conflicts</source>
 <target>显示冲突</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>隐藏将在左侧被建立的文件</target>
-
 <source>Show files that will be created on the left side</source>
 <target>显示将在左侧被建立的文件</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>隐藏将在右侧被建立的文件</target>
-
 <source>Show files that will be created on the right side</source>
 <target>显示将在右侧被建立的文件</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>隐藏将在左侧被删除的文件</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>显示将在左侧被删除的文件</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>隐藏将在右侧被删除的文件</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>显示将在右侧被删除的文件</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>隐藏将在左侧被覆盖的文件</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>显示将在左侧被覆盖的文件</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>隐藏将在右侧被覆盖的文件</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>显示将在右侧被覆盖的文件</target>
 
-<source>Hide files that won't be copied</source>
-<target>隐藏将不会被复制的文件</target>
-
 <source>Show files that won't be copied</source>
 <target>显示将不被复制的文件</target>
 
+<source>Set as default</source>
+<target></target>
+
 <source>All folders are in sync!</source>
 <target>所有文件夹都是同步的!</target>
 
@@ -969,13 +945,8 @@ Note: File names must be relative to base directories!
 <source>File list exported!</source>
 <target>文件清单已经导出!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>%x 个对象被成功删除!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target></target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1007,6 +978,9 @@ Note: File names must be relative to base directories!
 <source>&Ignore</source>
 <target>忽略(&I)</target>
 
+<source>Don't show this warning again</source>
+<target></target>
+
 <source>&Switch</source>
 <target>切换(&S)</target>
 
@@ -1025,9 +999,6 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>正在比较文件内容...</target>
 
-<source>Copy</source>
-<target>复制</target>
-
 <source>Paused</source>
 <target>已暂停</target>
 
@@ -1110,33 +1081,32 @@ Note: File names must be relative to base directories!
 <target>重新让已经隐藏的警告和对话框变为可见?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
-<target>
-<pluralform>你是否真的要移动如下 %x 个对象到回收站?</pluralform>
-</target>
+<target></target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>你是否真的要删除如下 %x 个对象?</pluralform>
-</target>
+<target></target>
 
 <source>Leave as unresolved conflict</source>
 <target>遗留为未解决的冲突</target>
 
+<source>Time stamp</source>
+<target></target>
+
+<source>Append a timestamp to each file name</source>
+<target>附加时间戳到每一个文件名</target>
+
 <source>Replace</source>
 <target>替换</target>
 
 <source>Move files and replace if existing</source>
 <target>移动文件, 若文件已存在则替换</target>
 
-<source>Append a timestamp to each file name</source>
-<target>附加时间戳到每一个文件名</target>
-
 <source>Folder</source>
 <target>文件夹</target>
 
@@ -1248,6 +1218,12 @@ Note: File names must be relative to base directories!
 <source>Cannot set privilege %x.</source>
 <target>无法设置 %x 的特权.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target></target>
+
+<source>Cannot change process I/O priorities.</source>
+<target></target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>无法移动 %x 到回收站!</target>
 
@@ -1266,14 +1242,38 @@ Note: File names must be relative to base directories!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>设置默认的同步方向:旧文件会被新文件覆盖.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target></target>
+
+<source>Moving file %x to recycle bin</source>
+<target>正在移动文件 %x 到回收站</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>正在移动文件夹 %x 到回收站</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>正在移动符号连接 %x 到回收站</target>
+
+<source>Deleting file %x</source>
+<target>正删除文件 %x</target>
+
+<source>Deleting folder %x</source>
+<target>正删除文件夹 %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>正在删除符号连接 %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>如下路径的回收站不可用! 文件会被永久删除:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>你可以忽略这个错误而认为文件夹是空的.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target></target>
+
+<source>Cannot find the following folders:</source>
+<target></target>
 
-<source>Cannot find folder %x.</source>
-<target>无法找到文件夹 %x</target>
+<source>You can ignore this error to consider each folder as empty.</source>
+<target></target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>目录有依赖性！在设立同步规则时请小心:</target>
@@ -1281,8 +1281,8 @@ Note: File names must be relative to base directories!
 <source>Start comparison</source>
 <target>开始比较</target>
 
-<source>Preparing synchronization...</source>
-<target>正在准备同步...</target>
+<source>Calculating sync directions...</source>
+<target></target>
 
 <source>Conflict detected:</source>
 <target>检测到的冲突:</target>
@@ -1347,24 +1347,6 @@ Note: File names must be relative to base directories!
 <source>Multiple...</source>
 <target>并联...</target>
 
-<source>Deleting file %x</source>
-<target>正删除文件 %x</target>
-
-<source>Deleting folder %x</source>
-<target>正删除文件夹 %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>正在删除符号连接 %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>正在移动文件 %x 到回收站</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>正在移动文件夹 %x 到回收站</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>正在移动符号连接 %x 到回收站</target>
-
 <source>Moving file %x to %y</source>
 <target>正在移动文件 %x 到 %y</target>
 
@@ -1377,9 +1359,6 @@ Note: File names must be relative to base directories!
 <source>Removing old versions...</source>
 <target>移除旧版本</target>
 
-<source>Creating file %x</source>
-<target>正在创建文件 %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>正在创建符号连接 %x</target>
 
@@ -1398,6 +1377,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>更新 %x 的属性</target>
 
+<source>Cannot find %x.</source>
+<target></target>
+
 <source>Target folder %x already existing.</source>
 <target>目标文件夹 %x 已经存在.</target>
 
@@ -1443,6 +1425,9 @@ Note: File names must be relative to base directories!
 <source>Generating database...</source>
 <target>正在生成数据库...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target></target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>数据校验错误:源文件和目标文件内容不同!</target>
 
diff --git a/BUILD/Languages/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng
index 56f832e7..2a63530b 100644
--- a/BUILD/Languages/chinese_traditional.lng
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>全部時間：</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>無法對 %x 設定目錄鎖。</target>
+
 <source>Show in Explorer</source>
 <target>在資源管理器中顯示</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>錯誤</target>
 
+<source>Selected variant:</source>
+<target>選取的變數：</target>
+
 <source>Select alternate comparison settings</source>
 <target>選擇替代的比對設定</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>清除篩選器設定</target>
 
+<source>Copy</source>
+<target>複製</target>
+
+<source>Paste</source>
+<target>貼上</target>
+
 <source>Save as batch job</source>
 <target>另存為批次處理作業</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>嚴重錯誤</target>
 
-<source>Windows Error Code %x:</source>
-<target>Windows錯誤代碼 %x：</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux錯誤代碼 %x：</target>
+<source>Error Code %x:</source>
+<target>錯誤代碼 %x：</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>無法解析符號連結 %X。</target>
@@ -159,8 +168,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>等待同時目錄被鎖定(%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>無法設定目錄鎖 %x。</target>
+<source>Creating file %x</source>
+<target>正在新建檔案 %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -190,9 +199,6 @@
 <source>/sec</source>
 <target>/秒</target>
 
-<source>Cannot find file %x.</source>
-<target>找不到檔案 %x。</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>檔案 %x 不包含一個有效的配置。</target>
 
@@ -217,6 +223,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>無法讀取下列XML元素：</target>
 
+<source>Cannot find file %x.</source>
+<target>找不到檔案 %x。</target>
+
 <source>&Open...</source>
 <target>開啟(&O)...</target>
 
@@ -358,7 +367,7 @@ The command is triggered if:
 <target>無法連接到sourceforge.net！</target>
 
 <source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
-<target>目前FreeFileSync版本號碼連線未找到！是否要手動檢查？</target>
+<target>目前連線未找到FreeFileSync版號！是否要手動檢查？</target>
 
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>要每週自動檢查更新FreeFileSync嗎？</target>
@@ -450,24 +459,21 @@ The command is triggered if:
 <source>&Advanced</source>
 <target>進階(&A)</target>
 
-<source>&Check for new version</source>
-<target>檢查是否有新版本(&C)</target>
+<source>&Check now</source>
+<target>現在檢查(&C)</target>
 
-<source>Compare</source>
-<target>比對</target>
+<source>Check &automatically once a week</source>
+<target>一週自動檢查一次(&a)</target>
 
-<source>Compare both sides</source>
-<target>比對兩邊</target>
+<source>Check for new version</source>
+<target>檢查新版本</target>
 
-<source>&Abort</source>
-<target>取消(&A)</target>
+<source>Compare</source>
+<target>比對</target>
 
 <source>Synchronize</source>
 <target>同步</target>
 
-<source>Start synchronization</source>
-<target>開始同步</target>
-
 <source>Add folder pair</source>
 <target>新增配對資料夾</target>
 
@@ -477,15 +483,6 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>兩邊交換</target>
 
-<source>Open</source>
-<target>開啟</target>
-
-<source>Save</source>
-<target>儲存</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>上次使用的配置(按DEL鍵，從清單中移除)</target>
-
 <source>Hide excluded items</source>
 <target>隱藏排除項目</target>
 
@@ -516,11 +513,23 @@ The command is triggered if:
 <source>Time elapsed:</source>
 <target>經過時間：</target>
 
+<source>Synchronizing...</source>
+<target>正在同步...</target>
+
+<source>On completion</source>
+<target>完成後</target>
+
+<source>Close</source>
+<target>關閉</target>
+
+<source>&Pause</source>
+<target>暫停(&P)</target>
+
 <source>Batch job</source>
 <target>批次處理作業</target>
 
 <source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
-<target>新建一個批次檔來自動執行同步。 按兩下此檔案或安排在您的系統任務計畫表： FreeFileSync.exe <工作名稱>.ffs_batch</target>
+<target>新建一個批次檔來自動執行同步。按兩下此檔案或安排在您的系統任務計畫表：FreeFileSync.exe <工作名稱>.ffs_batch</target>
 
 <source>Help</source>
 <target>說明</target>
@@ -546,9 +555,6 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>在第一個錯誤出現即中止同步</target>
 
-<source>On completion</source>
-<target>完成後</target>
-
 <source>Show progress dialog</source>
 <target>顯示進度對話框</target>
 
@@ -597,14 +603,14 @@ is the same
 <source><- Two way -></source>
 <target><- 雙向 -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>對兩邊使用同一個資料庫來識別和傳送變更。 自動檢測刪除、重新命名和衝突部份。</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>識別和傳播兩邊的變更。自動檢測刪除、移動和衝突使用的資料庫。</target>
 
 <source>Mirror ->></source>
 <target>鏡像 ->></target>
 
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>鏡像備份的左邊的資料夾。 同步後，右邊的資料夾進行修改以完全相配左邊的資料夾。</target>
+<target>鏡像備份的左邊的資料夾。同步後，右邊的資料夾進行修改以完全相配左邊的資料夾。</target>
 
 <source>Update -></source>
 <target>更新 -></target>
@@ -636,15 +642,12 @@ is the same
 <source>Versioning</source>
 <target>版本控制</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>將時間戳記檔案移動到指定的資料夾</target>
+<source>Move files to user-defined folder</source>
+<target>將檔案移動到使用者自訂的資料夾</target>
 
 <source>Naming convention:</source>
 <target>命名慣例：</target>
 
-<source>Configuration</source>
-<target>配置</target>
-
 <source>Item exists on left side only</source>
 <target>只存在於左邊的項目</target>
 
@@ -663,12 +666,6 @@ is the same
 <source>Conflict/item cannot be categorized</source>
 <target>衝突/項目不能被分類</target>
 
-<source>Synchronizing...</source>
-<target>正在同步...</target>
-
-<source>&Pause</source>
-<target>暫停(&P)</target>
-
 <source>Source code written in C++ using:</source>
 <target>使用C++編寫的原始碼</target>
 
@@ -729,14 +726,14 @@ Note: File names must be relative to base directories!
 <source>Maximum</source>
 <target>最大</target>
 
-<source>&Default</source>
-<target>預設(&D)</target>
+<source>&Clear</source>
+<target>清除(&C)</target>
 
 <source>Fail-safe file copy</source>
 <target>故障保護檔案複製</target>
 
 <source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
-<target>第一次將檔寫入到一個暫存(*.ffs_tmp)，順便將它們重新命名。 即使在嚴重錯誤的情況下，還可確保一致的狀態。</target>
+<target>第一次將檔寫入到一個暫存(*.ffs_tmp)，順便將它們重新命名。即使在嚴重錯誤的情況下，還可確保一致的狀態。</target>
 
 <source>Copy locked files</source>
 <target>複製被鎖定的檔案</target>
@@ -759,6 +756,12 @@ Note: File names must be relative to base directories!
 <source>Description</source>
 <target>描述</target>
 
+<source>&Default</source>
+<target>預設(&D)</target>
+
+<source>Start synchronization</source>
+<target>開始同步</target>
+
 <source>Variant</source>
 <target>變數</target>
 
@@ -766,7 +769,7 @@ Note: File names must be relative to base directories!
 <target>統計</target>
 
 <source>Don't show this dialog again</source>
-<target>不要再顯示此對話框</target>
+<target>不再顯示此對話框</target>
 
 <source>Find what:</source>
 <target>尋找內容：</target>
@@ -789,12 +792,24 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>摘要</target>
 
+<source>Configuration</source>
+<target>配置</target>
+
 <source>Filter files</source>
 <target>篩選檔案</target>
 
 <source>Select view</source>
 <target>選擇檢視</target>
 
+<source>Open...</source>
+<target>開啟...</target>
+
+<source>Save</source>
+<target>儲存</target>
+
+<source>Compare both sides</source>
+<target>比對兩邊</target>
+
 <source>Set direction:</source>
 <target>設定方向：</target>
 
@@ -852,102 +867,63 @@ Note: File names must be relative to base directories!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync批次處理</target>
 
-<source>Never save changes</source>
-<target>不要儲存變更</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>是否要儲存變更到 %x？</target>
 
 <source>Do&n't save</source>
 <target>不儲存(&N)</target>
 
+<source>Never save changes</source>
+<target>不要儲存變更</target>
+
 <source>Configuration loaded!</source>
 <target>配置已載入！</target>
 
-<source>Hide files that exist on left side only</source>
-<target>隱藏只存在於左邊的檔案</target>
-
 <source>Show files that exist on left side only</source>
 <target>顯示只存在於左邊的檔案</target>
 
-<source>Hide files that exist on right side only</source>
-<target>隱藏只存在於右邊的檔案</target>
-
 <source>Show files that exist on right side only</source>
 <target>顯示只存在於右邊的檔案</target>
 
-<source>Hide files that are newer on left</source>
-<target>隱藏左邊較新的檔案</target>
-
 <source>Show files that are newer on left</source>
 <target>顯示左邊較新的檔案</target>
 
-<source>Hide files that are newer on right</source>
-<target>隱藏右邊較新的檔案</target>
-
 <source>Show files that are newer on right</source>
 <target>顯示右邊較新的檔案</target>
 
-<source>Hide files that are equal</source>
-<target>隱藏相同的檔案</target>
-
 <source>Show files that are equal</source>
 <target>顯示相同的檔案</target>
 
-<source>Hide files that are different</source>
-<target>隱藏不同的檔案</target>
-
 <source>Show files that are different</source>
 <target>顯示不同的檔案</target>
 
-<source>Hide conflicts</source>
-<target>隱藏衝突</target>
-
 <source>Show conflicts</source>
 <target>顯示衝突</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>隱藏左邊將被新建的檔案</target>
-
 <source>Show files that will be created on the left side</source>
 <target>顯示左邊將被新建的檔案</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>隱藏右邊將被新建的檔案</target>
-
 <source>Show files that will be created on the right side</source>
 <target>顯示右邊將被新建的檔案</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>隱藏左邊將被刪除的檔案</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>顯示左邊將被刪除的檔案</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>隱藏右邊將被刪除的檔案</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>顯示右邊將被刪除的檔案</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>隱藏左邊將被覆蓋的檔案</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>顯示左邊將被覆蓋的檔案</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>隱藏右邊將被覆蓋的檔案</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>顯示右邊將被覆蓋的檔案</target>
 
-<source>Hide files that won't be copied</source>
-<target>隱藏將不會被複製的檔案</target>
-
 <source>Show files that won't be copied</source>
 <target>顯示將不會被複製的檔案</target>
 
+<source>Set as default</source>
+<target>設為預設值</target>
+
 <source>All folders are in sync!</source>
 <target>所有資料夾都是同步的！</target>
 
@@ -960,13 +936,8 @@ Note: File names must be relative to base directories!
 <source>File list exported!</source>
 <target>檔案清單已匯出！</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>%x 物件已成功刪除！</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>正在搜尋程式更新...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -998,6 +969,9 @@ Note: File names must be relative to base directories!
 <source>&Ignore</source>
 <target>忽略(&I)</target>
 
+<source>Don't show this warning again</source>
+<target>不再顯示此警告</target>
+
 <source>&Switch</source>
 <target>切換(&S)</target>
 
@@ -1016,9 +990,6 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>正在比對内容...</target>
 
-<source>Copy</source>
-<target>複製</target>
-
 <source>Paused</source>
 <target>已暫停</target>
 
@@ -1083,7 +1054,7 @@ Note: File names must be relative to base directories!
 <target>複製NTFS權限</target>
 
 <source>Integrate external applications into context menu. The following macros are available:</source>
-<target>整合上下文功能表中的外部應用程式。 可以使用下面的巨集：</target>
+<target>整合上下文功能表中的外部應用程式。可以使用下面的巨集：</target>
 
 <source>- full file or folder name</source>
 <target>- 完整檔案或資料夾名稱</target>
@@ -1101,33 +1072,36 @@ Note: File names must be relative to base directories!
 <target>使隱藏的警告和對話框再次可見？</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>確定要將下列 %x 物件移動到資源回收筒嗎？</pluralform>
+<pluralform>您確定要將下列 %x 項目移動到資源回收筒嗎？</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>您確定要刪除下列的 %x 物件嗎？</pluralform>
+<pluralform>您確定要將下列 %x 項目刪除嗎？</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>保留給未解決的衝突</target>
 
+<source>Time stamp</source>
+<target>時間戳記</target>
+
+<source>Append a timestamp to each file name</source>
+<target>將時間戳記附加到每個檔案名稱上</target>
+
 <source>Replace</source>
 <target>取代</target>
 
 <source>Move files and replace if existing</source>
 <target>如果存在，移動檔案並取代</target>
 
-<source>Append a timestamp to each file name</source>
-<target>將時間戳記附加到每個檔案名稱上</target>
-
 <source>Folder</source>
 <target>資料夾</target>
 
@@ -1239,6 +1213,12 @@ Note: File names must be relative to base directories!
 <source>Cannot set privilege %x.</source>
 <target>無法設定權限 %x。</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>中止系統睡眠模式失敗。</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>無法更改 I/O 處理優先順序。</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>無法將 %x 移動到資源回收筒！</target>
 
@@ -1257,14 +1237,38 @@ Note: File names must be relative to base directories!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>設定預設同步方向：舊檔案會被較新的檔案覆蓋。</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>正在檢查資源回收筒的可用性資料夾 %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>正在移動檔案 %x 到資源回收筒</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>正在移動資料夾 %x 到資源回收筒</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>正在移動符號連結 %x 到資源回收筒</target>
+
+<source>Deleting file %x</source>
+<target>正在刪除檔案 %x</target>
+
+<source>Deleting folder %x</source>
+<target>正在刪除資料夾 %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>正在刪除符號連結 %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>資源回收筒不可用於以下路徑！相反的，檔案將永遠被刪除：</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>您可以忽略此錯誤，考慮到空的資料夾。</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>對應的資料夾將視為空的。</target>
 
-<source>Cannot find folder %x.</source>
-<target>找不到資料夾 %x。</target>
+<source>Cannot find the following folders:</source>
+<target>找不到下列資料夾：</target>
+
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>您可以忽略將每個資料夾視為空的錯誤。</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>目錄有依靠性！請小心設定同步規則：</target>
@@ -1272,8 +1276,8 @@ Note: File names must be relative to base directories!
 <source>Start comparison</source>
 <target>開始比對</target>
 
-<source>Preparing synchronization...</source>
-<target>正在準備同步...</target>
+<source>Calculating sync directions...</source>
+<target>正在計算同步方向...</target>
 
 <source>Conflict detected:</source>
 <target>檢測到衝突：</target>
@@ -1338,24 +1342,6 @@ Note: File names must be relative to base directories!
 <source>Multiple...</source>
 <target>多個...</target>
 
-<source>Deleting file %x</source>
-<target>正在刪除檔案 %x</target>
-
-<source>Deleting folder %x</source>
-<target>正在刪除資料夾 %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>正在刪除符號連結 %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>正在移動檔案 %x 到資源回收筒</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>正在移動資料夾 %x 到資源回收筒</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>正在移動符號連結 %x 到資源回收筒</target>
-
 <source>Moving file %x to %y</source>
 <target>正在移動檔案 %x 到 %y</target>
 
@@ -1368,9 +1354,6 @@ Note: File names must be relative to base directories!
 <source>Removing old versions...</source>
 <target>正在刪除舊版本...</target>
 
-<source>Creating file %x</source>
-<target>正在新建檔案 %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>正在新建符號連結 %x</target>
 
@@ -1389,6 +1372,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>正在更新 %x 個屬性</target>
 
+<source>Cannot find %x.</source>
+<target>找不到 %x。</target>
+
 <source>Target folder %x already existing.</source>
 <target>目標資料夾 %x 已存在。</target>
 
@@ -1420,7 +1406,7 @@ Note: File names must be relative to base directories!
 <target>可用：</target>
 
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
-<target>一個將被修改的資料夾，是多個配對資料夾的一部分。 請檢查同步設定。</target>
+<target>一個將被修改的資料夾，是多個配對資料夾的一部分。請檢查同步設定。</target>
 
 <source>Left</source>
 <target>左邊</target>
@@ -1434,6 +1420,9 @@ Note: File names must be relative to base directories!
 <source>Generating database...</source>
 <target>正在產生資料庫...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>正在新建卷影複製為 %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>資料驗證錯誤：來源和目標檔案內容不同！</target>
 
diff --git a/BUILD/Languages/croatian.lng b/BUILD/Languages/croatian.lng
index fc01bb29..766107d6 100644
--- a/BUILD/Languages/croatian.lng
+++ b/BUILD/Languages/croatian.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Ukupno vrijeme:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Ne mogu zaključiti mapu %x.</target>
+
 <source>Show in Explorer</source>
 <target>Prikaži u Exploreru</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Greška</target>
 
+<source>Selected variant:</source>
+<target>Odaberite način</target>
+
 <source>Select alternate comparison settings</source>
 <target>Izaberite alternativne postavke usporedbe</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Počisti postavke filtera</target>
 
+<source>Copy</source>
+<target>Kopiraj</target>
+
+<source>Paste</source>
+<target>Zalijepi</target>
+
 <source>Save as batch job</source>
 <target>Spremi kao slijedni zadatak</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Kritična greška</target>
 
-<source>Windows Error Code %x:</source>
-<target>Windows greška %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux greška %x:</target>
+<source>Error Code %x:</source>
+<target>Pogreška broj %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Ne mogu riješiti simboličnu poveznicu</target>
@@ -161,8 +170,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Čekam dok se direktorij zaključava (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Ne mogu zaključati direktorij %x.</target>
+<source>Creating file %x</source>
+<target>Izrađujem datoteku %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -196,9 +205,6 @@
 <source>/sec</source>
 <target>/sek</target>
 
-<source>Cannot find file %x.</source>
-<target>Ne mogu pronaći datoteku %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Datoteka %x ne sadrži valjanu konfiguraciju</target>
 
@@ -223,6 +229,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Ne mogu čitati slijedeće XML elemente</target>
 
+<source>Cannot find file %x.</source>
+<target>Ne mogu pronaći datoteku %x.</target>
+
 <source>&Open...</source>
 <target>&Otvori...</target>
 
@@ -456,24 +465,21 @@ Naredba će biti pokrenuta ako se:
 <source>&Advanced</source>
 <target>&Napredno</target>
 
-<source>&Check for new version</source>
-<target>&Provjeri za novu verziju</target>
+<source>&Check now</source>
+<target>&Provjeri sada</target>
 
-<source>Compare</source>
-<target>Usporedi</target>
+<source>Check &automatically once a week</source>
+<target>Provjeri &automatski jednom tjedno</target>
 
-<source>Compare both sides</source>
-<target>Usporedi obje strane</target>
+<source>Check for new version</source>
+<target>Potraži noviju verziju</target>
 
-<source>&Abort</source>
-<target>&Odustani</target>
+<source>Compare</source>
+<target>Usporedi</target>
 
 <source>Synchronize</source>
 <target>Sinkroniziraj</target>
 
-<source>Start synchronization</source>
-<target>Započni sinkronizaciju</target>
-
 <source>Add folder pair</source>
 <target>Dodaj mapu</target>
 
@@ -483,15 +489,6 @@ Naredba će biti pokrenuta ako se:
 <source>Swap sides</source>
 <target>Zamjeni strane</target>
 
-<source>Open</source>
-<target>Otvori</target>
-
-<source>Save</source>
-<target>Spremi</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Zadnje korištene postavke (pretisite DEL za ukloniti s liste)</target>
-
 <source>Hide excluded items</source>
 <target>Sakrij isključene stavke</target>
 
@@ -522,6 +519,18 @@ Naredba će biti pokrenuta ako se:
 <source>Time elapsed:</source>
 <target>Proteklo vremena:</target>
 
+<source>Synchronizing...</source>
+<target>Sinkroniziram...</target>
+
+<source>On completion</source>
+<target>Pri završetku</target>
+
+<source>Close</source>
+<target>Zatvori</target>
+
+<source>&Pause</source>
+<target>&Pauziraj</target>
+
 <source>Batch job</source>
 <target>Slijedni zadatak</target>
 
@@ -552,9 +561,6 @@ Naredba će biti pokrenuta ako se:
 <source>Abort synchronization on first error</source>
 <target>Prekini sinkronizaciju pri prvoj pogrešci</target>
 
-<source>On completion</source>
-<target>Pri završetku</target>
-
 <source>Show progress dialog</source>
 <target>Prikaži napredak</target>
 
@@ -612,8 +618,8 @@ jednak
 <source><- Two way -></source>
 <target>Dvosmjerno</target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identificiraj i izvedi promjene na obje strane koristeći bazu podataka. Brisanja, preimenovanja i sukobi se automatski detektiraju</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Pronađi i izvrši izmjene na obje strane. Izbrisano, premješteno te sukobe se otkrije automatski pomoću baze.</target>
 
 <source>Mirror ->></source>
 <target>Zrcalno ->></target>
@@ -651,15 +657,12 @@ jednak
 <source>Versioning</source>
 <target>Označi</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Premjesti vremenski-označene datoteke u određenu mapu</target>
+<source>Move files to user-defined folder</source>
+<target>Premjesti datoteke u određenu mapu</target>
 
 <source>Naming convention:</source>
 <target>Pravilo imena:</target>
 
-<source>Configuration</source>
-<target>Postavke</target>
-
 <source>Item exists on left side only</source>
 <target>Stavka postoji samo na lijevoj strani</target>
 
@@ -678,12 +681,6 @@ jednak
 <source>Conflict/item cannot be categorized</source>
 <target>Sukob/stavka ne može biti razvrstana</target>
 
-<source>Synchronizing...</source>
-<target>Sinkroniziram...</target>
-
-<source>&Pause</source>
-<target>&Pauziraj</target>
-
 <source>Source code written in C++ using:</source>
 <target>Izvorni kod napisan u C++ uz korištenje:</target>
 
@@ -744,8 +741,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Maximum</source>
 <target>Maksimum</target>
 
-<source>&Default</source>
-<target>&Zadano</target>
+<source>&Clear</source>
+<target>&Brisati</target>
 
 <source>Fail-safe file copy</source>
 <target>Kopiranje zaštićeno od grešaka</target>
@@ -774,6 +771,12 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Description</source>
 <target>Opis</target>
 
+<source>&Default</source>
+<target>&Zadano</target>
+
+<source>Start synchronization</source>
+<target>Započni sinkronizaciju</target>
+
 <source>Variant</source>
 <target>Način</target>
 
@@ -804,12 +807,24 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Overview</source>
 <target>Pregled</target>
 
+<source>Configuration</source>
+<target>Postavke</target>
+
 <source>Filter files</source>
 <target>Filtriraj datoteke</target>
 
 <source>Select view</source>
 <target>Izaberite pogled</target>
 
+<source>Open...</source>
+<target>Otvori...</target>
+
+<source>Save</source>
+<target>Spremi</target>
+
+<source>Compare both sides</source>
+<target>Usporedi obje strane</target>
+
 <source>Set direction:</source>
 <target>Odaberi smijer:</target>
 
@@ -867,102 +882,63 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync slijedni zadatak</target>
 
-<source>Never save changes</source>
-<target>Nikad ne spremaj promjene</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Da li želite spremiti izmjene za %x?</target>
 
 <source>Do&n't save</source>
 <target>Ne spremaj</target>
 
+<source>Never save changes</source>
+<target>Nikad ne spremaj promjene</target>
+
 <source>Configuration loaded!</source>
 <target>Postavke učitane!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Sakrij datoteke koje postoje samo na lijevoj strani</target>
-
 <source>Show files that exist on left side only</source>
 <target>Prikaži datoteke koje postoje samo na lijevoj strani</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Sakrij datoteke koje koje postoje samo na desnoj strani</target>
-
 <source>Show files that exist on right side only</source>
 <target>Prikaži datoteke koje postoje samo na desnoj strani</target>
 
-<source>Hide files that are newer on left</source>
-<target>Sakrij datoteke koje su novije lijevo</target>
-
 <source>Show files that are newer on left</source>
 <target>Prikaži datoteke koje su novije lijevo</target>
 
-<source>Hide files that are newer on right</source>
-<target>Skrij datoteke koje su novije desno</target>
-
 <source>Show files that are newer on right</source>
 <target>Prikaži datoteke koje su novije desno</target>
 
-<source>Hide files that are equal</source>
-<target>Skrij jednake datoteke</target>
-
 <source>Show files that are equal</source>
 <target>Prikaži jednake datoteke</target>
 
-<source>Hide files that are different</source>
-<target>Sakrij datoteke koje su različite</target>
-
 <source>Show files that are different</source>
 <target>Prikaži datoteke koje su različite</target>
 
-<source>Hide conflicts</source>
-<target>Sakrij sukobe</target>
-
 <source>Show conflicts</source>
 <target>Prikaži spore</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Sakrij datoteke koje će biti napravljene na lijevoj strani</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Prikaži datoteke koje će biti napravljene na lijevoj strani</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Sakrij datoteke koje će biti napravljene na desnoj strani</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Prikaži datoteke koje će biti napravljene na desnoj strani</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Sakrij datoteke koje će biti izbrisane na lijevoj strani</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Prikaži datoteke koje će biti izbrisane na lijevoj strani</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Skrij datoteke koje će biti izbrisane na desnoj strani</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Prikaži datoteke koje će biti izbrisane na desnoj strani</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Skrij datoteke koje će biti prepisane na lijevoj strani</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Prikaži datoteke koje će biti prepisane na lijevoj strani</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Skrij datoteke koje će biti prepisane na desnoj strani</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Prikaži datoteke koje će biti prepisane na desnoj strani</target>
 
-<source>Hide files that won't be copied</source>
-<target>Sakrij datoteke koje neće biti kopirane</target>
-
 <source>Show files that won't be copied</source>
 <target>Prikaži datoteke koje neće biti kopirane</target>
 
+<source>Set as default</source>
+<target>Postavi kao zadano</target>
+
 <source>All folders are in sync!</source>
 <target>Sve mape su u sinkronizaciji!</target>
 
@@ -975,15 +951,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>File list exported!</source>
 <target>Datotečna lista izvezena!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>%x Objekt uspješno izbrisan!</pluralform>
-<pluralform>%x objekta uspješno izbrisana!</pluralform>
-<pluralform>%x objekata uspješno izbrisano!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>Pretražujem ažuriranja programa...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1021,6 +990,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>&Ignore</source>
 <target>&Ignoriraj</target>
 
+<source>Don't show this warning again</source>
+<target>Ne prikazuj ovo upozorenje ponovno</target>
+
 <source>&Switch</source>
 <target>&Zamjeni</target>
 
@@ -1039,9 +1011,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Comparing content...</source>
 <target>Uspoređujem sadržaj...</target>
 
-<source>Copy</source>
-<target>Kopiraj</target>
-
 <source>Paused</source>
 <target>Pauzirano</target>
 
@@ -1124,37 +1093,32 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <target>Vrati skrivena upozorenja i dijaloški okvir ponovno vidljivim?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
-<target>
-<pluralform>Dali zaista želite prebaciti navedeni %x objekt u Koš za smeće?</pluralform>
-<pluralform>Dali zaista želite prebaciti navedena %x objekta u Koš za smeće?</pluralform>
-<pluralform>Dali zaista želite prebaciti navedenih %x objekata u Koš za smeće?</pluralform>
-</target>
+<target></target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Dali zaista želite izbrisati navedeni %x objekt?</pluralform>
-<pluralform>Dali zaista želite izbrisati navedena %x objekta?</pluralform>
-<pluralform>Dali zaista želite izbrisati navedenih %x objekata?</pluralform>
-</target>
+<target></target>
 
 <source>Leave as unresolved conflict</source>
 <target>Ostavi kao neriješeni sukob</target>
 
+<source>Time stamp</source>
+<target>Vremenska oznaka</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Dodaj vremensku oznaku svakom imenu datoteke</target>
+
 <source>Replace</source>
 <target>Zamjeni</target>
 
 <source>Move files and replace if existing</source>
 <target>Premjesti datoteke i zamjeni ako već postoji</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Dodaj vremensku oznaku svakom imenu datoteke</target>
-
 <source>Folder</source>
 <target>Mapa</target>
 
@@ -1167,6 +1131,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Files</source>
 <target>Datoteke</target>
 
+<source>Items</source>
+<target></target>
+
 <source>Percentage</source>
 <target>Postotak</target>
 
@@ -1272,6 +1239,12 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Cannot set privilege %x.</source>
 <target>Ne mogu postaviti prava za %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Nije moguće odgoditi mod spavanja računala</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Ne može se promjeniti proces I/O prioriteta</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Nije moguće prebaciti u Koš za smeće</target>
 
@@ -1290,14 +1263,38 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Postavljam zadani sinkronizacijski smijer: Stare datoteke će biti prepisane novim datotekama.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Provjeravam dosupnost koša za smeće za mapu %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Premještam datoteku %x u Koš za smeće</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Premještam mapu %x u Koš za smeće</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Premještam simboličnu poveznicu %x u Koš za smeće</target>
+
+<source>Deleting file %x</source>
+<target>Brisanje datoteke %x</target>
+
+<source>Deleting folder %x</source>
+<target>Brisanje mape %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Brisanje simboličnih poveznica %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Koš za smeće nije dostupan za navedene putanje! Umjesto toga datoteke će biti trajno izbrisane:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Možete ignorirati ovu pogrešku i smatrati mapu praznom</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>Odgovarajuća mapa će se smatrati prazna.</target>
+
+<source>Cannot find the following folders:</source>
+<target>Ne mogu pronaći slijedeće mape:</target>
 
-<source>Cannot find folder %x.</source>
-<target>Ne mogu pronaći mapu %x.</target>
+<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target></target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Direktoriji su u ovisnosti! Budite oprezni pri postavljanju sinkronizacijskih pravila:</target>
@@ -1305,8 +1302,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Start comparison</source>
 <target>Započni usporedbu</target>
 
-<source>Preparing synchronization...</source>
-<target>Pripremam sinkronizaciju</target>
+<source>Calculating sync directions...</source>
+<target>Izračunavam smjerove sinkronizacije...</target>
 
 <source>Conflict detected:</source>
 <target>Sukob pronađen:</target>
@@ -1371,24 +1368,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Multiple...</source>
 <target>Mnogostruko...</target>
 
-<source>Deleting file %x</source>
-<target>Brisanje datoteke %x</target>
-
-<source>Deleting folder %x</source>
-<target>Brisanje mape %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Brisanje simboličnih poveznica %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Premještam datoteku %x u Koš za smeće</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Premještam mapu %x u Koš za smeće</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Premještam simboličnu poveznicu %x u Koš za smeće</target>
-
 <source>Moving file %x to %y</source>
 <target>Premještam datoteku %x u %y</target>
 
@@ -1401,9 +1380,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Removing old versions...</source>
 <target>Uklanjam starije verzije...</target>
 
-<source>Creating file %x</source>
-<target>Izrađujem datoteku %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Izrađujem simboličnu poveznicu %x</target>
 
@@ -1422,6 +1398,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Updating attributes of %x</source>
 <target>Obnavljam atribute od %x</target>
 
+<source>Cannot find %x.</source>
+<target>Ne mogu pronaći %x.</target>
+
 <source>Target folder %x already existing.</source>
 <target>Odredišna mapa %x već postoji.</target>
 
@@ -1467,6 +1446,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Generating database...</source>
 <target>Izrađujem bazu podataka...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Izrađujem Volume Shadow Kopiju za %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Greška pri provjeravanju podataka: Izvorna i ciljna datoteka imaju različit sadržaj!</target>
 
diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng
index dc0ee886..092ed55d 100644
--- a/BUILD/Languages/czech.lng
+++ b/BUILD/Languages/czech.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Celkový čas:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Nelze nastavit zámek adresáře %x.</target>
+
 <source>Show in Explorer</source>
 <target>Zobrazit v Průzkumníkovi</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Chyba</target>
 
+<source>Selected variant:</source>
+<target>Vybraná varianta:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Změnit nastavení porovnání</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Zrušit nastavení filtru</target>
 
+<source>Copy</source>
+<target>Kopírovat</target>
+
+<source>Paste</source>
+<target>Vložit</target>
+
 <source>Save as batch job</source>
 <target>Uložit jako dávku</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Závažná chyba</target>
 
-<source>Windows Error Code %x:</source>
-<target>Chybový kód Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Chybový kód Linux %x:</target>
+<source>Error Code %x:</source>
+<target>Chybový kód %x</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Nelze najít odkaz zástupce %x.</target>
@@ -161,8 +170,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Čekání na uzamčení adresáře (%x)</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Nelze nastavit zámek adresáře %x.</target>
+<source>Creating file %x</source>
+<target>Vytváření souboru %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -196,9 +205,6 @@
 <source>/sec</source>
 <target>/s</target>
 
-<source>Cannot find file %x.</source>
-<target>Nelze najít soubor %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Soubor %x neobsahuje platnou konfiguraci.</target>
 
@@ -206,10 +212,10 @@
 <target>Konfigurace ze souboru %x byla načtena jen částečně.</target>
 
 <source>Cannot access Volume Shadow Copy Service.</source>
-<target>Nepodařil se přístup ke službě Volume Shadow Copy Service.</target>
+<target>Nepodařil se přístup ke službě Stínové kopie.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
-<target>Prosím použijte FreeFileSync 64-bitovou verzi pro použití služby Volume Shadow Copy.</target>
+<target>Prosím použijte FreeFileSync 64-bitovou verzi pro použití služby Stínové kopie.</target>
 
 <source>Cannot load file %x.</source>
 <target>Nelze načíst soubor %x.</target>
@@ -223,6 +229,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Nelze načíst následující XML elementy:</target>
 
+<source>Cannot find file %x.</source>
+<target>Nelze najít soubor %x.</target>
+
 <source>&Open...</source>
 <target>&Otevřít...</target>
 
@@ -456,24 +465,21 @@ Příkaz je spuštěn když:
 <source>&Advanced</source>
 <target>&Upřesnit</target>
 
-<source>&Check for new version</source>
-<target>Zkontrolovat &aktualizace</target>
+<source>&Check now</source>
+<target>Zkontrolovat &nyní</target>
 
-<source>Compare</source>
-<target>Porovnání</target>
+<source>Check &automatically once a week</source>
+<target>Kontrolovat &automaticky jendou týdně</target>
 
-<source>Compare both sides</source>
-<target>Porovnat obě strany</target>
+<source>Check for new version</source>
+<target>&Zkontrolovat aktualizace</target>
 
-<source>&Abort</source>
-<target>&Ukončit</target>
+<source>Compare</source>
+<target>Porovnání</target>
 
 <source>Synchronize</source>
 <target>Synchronizace</target>
 
-<source>Start synchronization</source>
-<target>Start synchronizace</target>
-
 <source>Add folder pair</source>
 <target>Přidat adresář pro porovnání</target>
 
@@ -483,15 +489,6 @@ Příkaz je spuštěn když:
 <source>Swap sides</source>
 <target>Změna stran</target>
 
-<source>Open</source>
-<target>Načíst</target>
-
-<source>Save</source>
-<target>Uložit</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Posledně použité konfigurace (pomocí DEL můžete položku smazat)</target>
-
 <source>Hide excluded items</source>
 <target>Skrýt vynechané položky</target>
 
@@ -522,6 +519,18 @@ Příkaz je spuštěn když:
 <source>Time elapsed:</source>
 <target>Uplynulý čas:</target>
 
+<source>Synchronizing...</source>
+<target>Synchronizuji...</target>
+
+<source>On completion</source>
+<target>Po dokončení</target>
+
+<source>Close</source>
+<target>Zavřít</target>
+
+<source>&Pause</source>
+<target>&Pauza</target>
+
 <source>Batch job</source>
 <target>Dávkový soubor</target>
 
@@ -552,9 +561,6 @@ Příkaz je spuštěn když:
 <source>Abort synchronization on first error</source>
 <target>Ukončit synchronizaci při první chybě</target>
 
-<source>On completion</source>
-<target>Po dokončení</target>
-
 <source>Show progress dialog</source>
 <target>Zobrazit průběh zpracování</target>
 
@@ -612,8 +618,8 @@ je stejný
 <source><- Two way -></source>
 <target><- Databáze -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Rozpoznat a provést změny na obou stranách pomocí databáze. Odstraněné nebo přejmenované soubory a konflikty budou detekovány automaticky.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Rozpoznat a provést změny na obou stranách. Odstraněné, přesunuté nebo přejmenované soubory a konflikty budou detekovány automaticky pomocí databáze.</target>
 
 <source>Mirror ->></source>
 <target>Zrcadlení ->></target>
@@ -651,15 +657,12 @@ je stejný
 <source>Versioning</source>
 <target>Verzování</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Přesunout časově označení soubory do zvláštního adresáře</target>
+<source>Move files to user-defined folder</source>
+<target>Přesunout soubory do uživatelského adresáře</target>
 
 <source>Naming convention:</source>
 <target>Pojmenování:</target>
 
-<source>Configuration</source>
-<target>Konfigurace</target>
-
 <source>Item exists on left side only</source>
 <target>Položky existující pouze vlevo</target>
 
@@ -678,12 +681,6 @@ je stejný
 <source>Conflict/item cannot be categorized</source>
 <target>Konflikty/položky které nelze zařadit</target>
 
-<source>Synchronizing...</source>
-<target>Synchronizuji...</target>
-
-<source>&Pause</source>
-<target>&Pauza</target>
-
 <source>Source code written in C++ using:</source>
 <target>Zdrojový kód byl napsán kompletně v C++ pomocí:</target>
 
@@ -744,8 +741,8 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Maximum</source>
 <target>Do</target>
 
-<source>&Default</source>
-<target>&Předdefinované</target>
+<source>&Clear</source>
+<target>&Smazat</target>
 
 <source>Fail-safe file copy</source>
 <target>Bezpečné kopírování souborů</target>
@@ -757,7 +754,7 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <target>Kopírovat zamčené soubory</target>
 
 <source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Kopírovat sdílené nebo zamčené soubory pomocí Volume Shadow Copy Service (Vyžaduje administrátorské oprávnění)</target>
+<target>Kopírovat sdílené nebo zamčené soubory pomocí služby Stínové kopie (Vyžaduje administrátorské oprávnění)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopírovat přístupová oprávnění k souborům</target>
@@ -774,6 +771,12 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Description</source>
 <target>Popis</target>
 
+<source>&Default</source>
+<target>&Předdefinované</target>
+
+<source>Start synchronization</source>
+<target>Start synchronizace</target>
+
 <source>Variant</source>
 <target>Varianta</target>
 
@@ -804,12 +807,24 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Overview</source>
 <target>Přehled</target>
 
+<source>Configuration</source>
+<target>Konfigurace</target>
+
 <source>Filter files</source>
 <target>Filtr souborů</target>
 
 <source>Select view</source>
 <target>Vyberte zobrazení</target>
 
+<source>Open...</source>
+<target>Otevřít...</target>
+
+<source>Save</source>
+<target>Uložit</target>
+
+<source>Compare both sides</source>
+<target>Porovnat obě strany</target>
+
 <source>Set direction:</source>
 <target>Nastavit adresář:</target>
 
@@ -867,102 +882,63 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>FreeFileSync batch</source>
 <target>FreeFileSync dávka</target>
 
-<source>Never save changes</source>
-<target>Nikdy neukládat změny</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Uložit změny do %x?</target>
 
 <source>Do&n't save</source>
 <target>Neukládat</target>
 
+<source>Never save changes</source>
+<target>Nikdy neukládat změny</target>
+
 <source>Configuration loaded!</source>
 <target>Konfigurace načtena.</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Skrýt soubory existující pouze vlevo</target>
-
 <source>Show files that exist on left side only</source>
 <target>Zobrazit soubory existující pouze vlevo</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Skrýt soubory existující pouze vpravo</target>
-
 <source>Show files that exist on right side only</source>
 <target>Zobrazit soubory existující pouze vpravo</target>
 
-<source>Hide files that are newer on left</source>
-<target>Skrýt novější zleva</target>
-
 <source>Show files that are newer on left</source>
 <target>Zobrazit soubory novější vlevo</target>
 
-<source>Hide files that are newer on right</source>
-<target>Skrýt novější zprava</target>
-
 <source>Show files that are newer on right</source>
 <target>Zobrazit soubory novější vpravo</target>
 
-<source>Hide files that are equal</source>
-<target>Skrýt shodné soubory</target>
-
 <source>Show files that are equal</source>
 <target>Zobrazit shodné soubory</target>
 
-<source>Hide files that are different</source>
-<target>Skrýt rozdílné soubory</target>
-
 <source>Show files that are different</source>
 <target>Zobrazit rozdílené soubory</target>
 
-<source>Hide conflicts</source>
-<target>Skrýt konflikty</target>
-
 <source>Show conflicts</source>
 <target>Zobrazit konflikty</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Skrýt soubory, které budou vlevo vytvořeny</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Zobrazit soubory, které budou vlevo vytvořeny</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Skrýt soubory, které budou vpravo vytvořeny</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Zobrazit soubory, které budou vpravo vytvořeny</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Skrýt soubory, které budou vlevo smazány</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Zobrazit soubory, které budou vlevo smazány</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Skrýt soubory, které budou vpravo smazány</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Zobrazit soubory, které budou vpravo smazány</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Skrýt soubory, které budou vlevo přepsány</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Zobrazit soubory, které budou vlevo přepsány</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Skrýt soubory, které budou vpravo přepsány</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Zobrazit soubory, které budou vpravo přepsány</target>
 
-<source>Hide files that won't be copied</source>
-<target>Skrýt soubory, které nebudou kopírovány</target>
-
 <source>Show files that won't be copied</source>
 <target>Zobrazit soubory, které nebudou kopírovány</target>
 
+<source>Set as default</source>
+<target>Nastavit jako výchozí</target>
+
 <source>All folders are in sync!</source>
 <target>Všechny složky jsou synchronizovány!</target>
 
@@ -975,15 +951,8 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>File list exported!</source>
 <target>Seznam souborů exportován!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Objekt úspěšně smazán!</pluralform>
-<pluralform>%x objekty úspěšně smazány!</pluralform>
-<pluralform>%x objektů úspěšně smazáno!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>Hledání aktualizací programu ...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1021,6 +990,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>&Ignore</source>
 <target>&Pokračovat</target>
 
+<source>Don't show this warning again</source>
+<target>Nezobrazovat již příště toto varování</target>
+
 <source>&Switch</source>
 <target>&Přepnout</target>
 
@@ -1039,9 +1011,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Comparing content...</source>
 <target>Porovnávání obsahu...</target>
 
-<source>Copy</source>
-<target>Kopírovat</target>
-
 <source>Paused</source>
 <target>Pauza</target>
 
@@ -1124,37 +1093,40 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <target>Povolit opět zobrazování skrytých dialogů a hlášení?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Opravdu chcete přesunout následující objekt?</pluralform>
-<pluralform>Opravdu chcete přesunout následující %x objekty?</pluralform>
-<pluralform>Opravdu chcete přesunout následujících %x objektů?</pluralform>
+<pluralform>Opravdu chcete přesunout následující položku do Koše?</pluralform>
+<pluralform>Opravdu chcete přesunout následující %x položky do Koše?</pluralform>
+<pluralform>Opravdu chcete přesunout následujících %x položek do Koše?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Opravdu chcete smazat následující objekt?</pluralform>
-<pluralform>Opravdu chcete smazat následující %x objekty?</pluralform>
-<pluralform>Opravdu chcete smazat následujících %x objektů?</pluralform>
+<pluralform>Opravdu chcete smazat následující položku?</pluralform>
+<pluralform>Opravdu chcete smazat následující %x položky?</pluralform>
+<pluralform>Opravdu chcete smazat následujících %x položek?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Ponechat jako nevyřešený konflikt</target>
 
+<source>Time stamp</source>
+<target>Časová značka</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Přidat časovou značku ke jménu souboru</target>
+
 <source>Replace</source>
 <target>Nahradit</target>
 
 <source>Move files and replace if existing</source>
 <target>Přesunout a nahradit pokud soubory existují</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Přidat časovou značku ke jménu souboru</target>
-
 <source>Folder</source>
 <target>Složka</target>
 
@@ -1167,6 +1139,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Files</source>
 <target>Soubory</target>
 
+<source>Items</source>
+<target></target>
+
 <source>Percentage</source>
 <target>Procentní podíl</target>
 
@@ -1272,6 +1247,12 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Cannot set privilege %x.</source>
 <target>Nelze nastavit práva pro %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Nepodařilo se uspat systém</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Nelze nastavit priority procesu.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Není možné přesunout %x do Koše!</target>
 
@@ -1290,14 +1271,38 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Nastaven výchozí způsob synchronizace: Staré soubory budou nahrazeny novými.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Kontrola Koše na složku %x ...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Přesouvání souboru %x do Koše</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Přesouvání afresáře %x do Koše</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Přesouvání symbolického odkazu %x do Koše</target>
+
+<source>Deleting file %x</source>
+<target>Mazání souboru %x</target>
+
+<source>Deleting folder %x</source>
+<target>Mazání adresáře %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Mazání symbolického odkazu %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Nelze použít Koš pro následující umístění! Soubory budou odstraněny trvale:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Tuto chybu můžete přeskočit a považovat neexistující složku jako prázdnou.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>Odpovídající složku bude považován za prázdný.</target>
 
-<source>Cannot find folder %x.</source>
-<target>>Nelze najít složku %x.</target>
+<source>Cannot find the following folders:</source>
+<target>Nelze najít následující složky:</target>
+
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Tuto chybu můžete přeskočit a považovat neexistující složku jako prázdnou.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Adresáře jsou závislé! Buďte opatrní s definicí synchronizačních pravidel:</target>
@@ -1305,8 +1310,8 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Start comparison</source>
 <target>Spustit porovnání</target>
 
-<source>Preparing synchronization...</source>
-<target>Příprava synchronizace...</target>
+<source>Calculating sync directions...</source>
+<target>Příprava adresářů synchronizace...</target>
 
 <source>Conflict detected:</source>
 <target>Zaznamenán konflikt:</target>
@@ -1371,24 +1376,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Multiple...</source>
 <target>Různé...</target>
 
-<source>Deleting file %x</source>
-<target>Mazání souboru %x</target>
-
-<source>Deleting folder %x</source>
-<target>Mazání adresáře %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Mazání symbolického odkazu %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Přesouvání souboru %x do Koše</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Přesouvání afresáře %x do Koše</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Přesouvání symbolického odkazu %x do Koše</target>
-
 <source>Moving file %x to %y</source>
 <target>Přesouvání souboru %x do %y</target>
 
@@ -1401,9 +1388,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Removing old versions...</source>
 <target>Odstraňování starých verzí...</target>
 
-<source>Creating file %x</source>
-<target>Vytváření souboru %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Vytváření symbolického odkazu %x</target>
 
@@ -1422,6 +1406,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Updating attributes of %x</source>
 <target>Aktualizace atributů souboru %x</target>
 
+<source>Cannot find %x.</source>
+<target>Nelze najít %x.</target>
+
 <source>Target folder %x already existing.</source>
 <target>Cílova složka %x již existuje.</target>
 
@@ -1467,6 +1454,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Generating database...</source>
 <target>Vytváření databáze...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Vytváření Stínové kopie pro %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Nezdařila se verifikace dat: Zdrojový a cílový soubor mají rozdílný obsah!</target>
 
diff --git a/BUILD/Languages/danish.lng b/BUILD/Languages/danish.lng
index 5fcf5ec0..43e5de24 100644
--- a/BUILD/Languages/danish.lng
+++ b/BUILD/Languages/danish.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Samlet tid:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Kan ikke låse mappen %x.</target>
+
 <source>Show in Explorer</source>
 <target>Åben filplacering</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Fejl</target>
 
+<source>Selected variant:</source>
+<target>Valgt variant:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Tilpas analyse</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Nulstil filter</target>
 
+<source>Copy</source>
+<target>Kopiér</target>
+
+<source>Paste</source>
+<target>Indsæt</target>
+
 <source>Save as batch job</source>
 <target>Gem som batchfil</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Fatal fejl</target>
 
-<source>Windows Error Code %x:</source>
-<target>Windows fejlkode %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux fejlkode %x:</target>
+<source>Error Code %x:</source>
+<target>Fejlkode %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Kan ikke følge symlinket %x.</target>
@@ -121,7 +130,7 @@
 </source>
 <target>
 <pluralform>1 byte</pluralform>
-<pluralform>%x bytes</pluralform>
+<pluralform>%x byte</pluralform>
 </target>
 
 <source>Database file %x is incompatible.</source>
@@ -160,8 +169,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Venter mens mappe låses (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Kan ikke låse mappen %x.</target>
+<source>Creating file %x</source>
+<target>Opretter filen %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -193,9 +202,6 @@
 <source>/sec</source>
 <target>/sek</target>
 
-<source>Cannot find file %x.</source>
-<target>Kan ikke finde filen %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>%x indeholder ikke gyldige indstillinger.</target>
 
@@ -220,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Kan ikke læse følgende XML emner:</target>
 
+<source>Cannot find file %x.</source>
+<target>Kan ikke finde filen %x.</target>
+
 <source>&Open...</source>
 <target>Åben...</target>
 
@@ -453,24 +462,21 @@ Kommandoen udføres hvis:
 <source>&Advanced</source>
 <target>Indstillinger</target>
 
-<source>&Check for new version</source>
+<source>&Check now</source>
+<target>Søg nu</target>
+
+<source>Check &automatically once a week</source>
+<target>Søg automatisk en gang om ugen</target>
+
+<source>Check for new version</source>
 <target>Søg efter opdatering</target>
 
 <source>Compare</source>
 <target>Analyser</target>
 
-<source>Compare both sides</source>
-<target>Analyser begge sider</target>
-
-<source>&Abort</source>
-<target>Afbryd</target>
-
 <source>Synchronize</source>
 <target>Synkroniser</target>
 
-<source>Start synchronization</source>
-<target>Start synkronisering</target>
-
 <source>Add folder pair</source>
 <target>Tilføj mappepar</target>
 
@@ -480,15 +486,6 @@ Kommandoen udføres hvis:
 <source>Swap sides</source>
 <target>Byt side</target>
 
-<source>Open</source>
-<target>Åben</target>
-
-<source>Save</source>
-<target>Gem job</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Senest brugte konfigurationer (tast DEL for at slette)</target>
-
 <source>Hide excluded items</source>
 <target>Skjul ekskluderede emner</target>
 
@@ -519,6 +516,18 @@ Kommandoen udføres hvis:
 <source>Time elapsed:</source>
 <target>Brugt tid:</target>
 
+<source>Synchronizing...</source>
+<target>Synkroniserer...</target>
+
+<source>On completion</source>
+<target>Ved gennemført</target>
+
+<source>Close</source>
+<target>Luk</target>
+
+<source>&Pause</source>
+<target>Pause</target>
+
 <source>Batch job</source>
 <target>Batchfil</target>
 
@@ -549,9 +558,6 @@ Kommandoen udføres hvis:
 <source>Abort synchronization on first error</source>
 <target>Stop synkronisering ved første fejl</target>
 
-<source>On completion</source>
-<target>Ved gennemført</target>
-
 <source>Show progress dialog</source>
 <target>Vis fremskridt</target>
 
@@ -609,8 +615,8 @@ er identisk
 <source><- Two way -></source>
 <target>< Tovejs ></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Find og udbred ændringer på begge sider via en database. Sletninger, omdøbninger og konflikter opdages automatisk.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Find og udbred ændringer på begge sider. Sletninger, omdøbninger og konflikter findes automatisk i en database.</target>
 
 <source>Mirror ->></source>
 <target>Spejling >></target>
@@ -648,15 +654,12 @@ er identisk
 <source>Versioning</source>
 <target>Versionering</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Flyt tidsstemplede filer til valgte mappe</target>
+<source>Move files to user-defined folder</source>
+<target>Flyt filer til valgt mappe</target>
 
 <source>Naming convention:</source>
 <target>Navneregler:</target>
 
-<source>Configuration</source>
-<target>Indstilling</target>
-
 <source>Item exists on left side only</source>
 <target>Emnet findes kun på venstre side</target>
 
@@ -675,12 +678,6 @@ er identisk
 <source>Conflict/item cannot be categorized</source>
 <target>Konflikt/ukendt emne</target>
 
-<source>Synchronizing...</source>
-<target>Synkroniserer...</target>
-
-<source>&Pause</source>
-<target>Pause</target>
-
 <source>Source code written in C++ using:</source>
 <target>Kildekoden er skrevet i C++ med hjælp fra:</target>
 
@@ -741,8 +738,8 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Maximum</source>
 <target>Maksimum</target>
 
-<source>&Default</source>
-<target>Standard</target>
+<source>&Clear</source>
+<target>Ryd</target>
 
 <source>Fail-safe file copy</source>
 <target>Sikker filkopiering</target>
@@ -771,6 +768,12 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Description</source>
 <target>Beskrivelse</target>
 
+<source>&Default</source>
+<target>Standard</target>
+
+<source>Start synchronization</source>
+<target>Start synkronisering</target>
+
 <source>Variant</source>
 <target>Jobtype</target>
 
@@ -801,12 +804,24 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Overview</source>
 <target>Oversigt</target>
 
+<source>Configuration</source>
+<target>Indstilling</target>
+
 <source>Filter files</source>
-<target>Filtre</target>
+<target>Filtrer filer</target>
 
 <source>Select view</source>
 <target>Tilpas visning</target>
 
+<source>Open...</source>
+<target>Åben...</target>
+
+<source>Save</source>
+<target>Gem</target>
+
+<source>Compare both sides</source>
+<target>Analyser begge sider</target>
+
 <source>Set direction:</source>
 <target>Retning:</target>
 
@@ -864,102 +879,63 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync batchfil</target>
 
-<source>Never save changes</source>
-<target>Gem aldrig</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Vil du gemme ændringer i %x?</target>
 
 <source>Do&n't save</source>
 <target>Gem ikke</target>
 
+<source>Never save changes</source>
+<target>Gem aldrig</target>
+
 <source>Configuration loaded!</source>
 <target>Indstillinger indlæst!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Skjul filer der kun findes på venstre side</target>
-
 <source>Show files that exist on left side only</source>
 <target>Vis filer der kun findes på venstre side</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Skjul filer der kun findes på højre side</target>
-
 <source>Show files that exist on right side only</source>
 <target>Vis filer der kun findes på højre side</target>
 
-<source>Hide files that are newer on left</source>
-<target>Skjul nyere filer på venstre side</target>
-
 <source>Show files that are newer on left</source>
 <target>Vis nyere filer på venstre side</target>
 
-<source>Hide files that are newer on right</source>
-<target>Skjul nyere filer på højre side</target>
-
 <source>Show files that are newer on right</source>
 <target>Vis nyere filer på højre side</target>
 
-<source>Hide files that are equal</source>
-<target>Skjul ens filer</target>
-
 <source>Show files that are equal</source>
 <target>Vis ens filer</target>
 
-<source>Hide files that are different</source>
-<target>Skjul uens filer</target>
-
 <source>Show files that are different</source>
 <target>Vis uens filer</target>
 
-<source>Hide conflicts</source>
-<target>Skjul konflikter</target>
-
 <source>Show conflicts</source>
 <target>Vis konflikter</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Skjul filer der oprettes på venstre side</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Vis filer der oprettes på venstre side</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Skjul filer der oprettes på højre side</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Vis filer der oprettes på højre side</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Skjul filer der slettes på venstre side</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Vis filer der slettes på venstre side</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Skjul filer der slettes på højre side</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Vis filer der slettes på højre side</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Skjul filer der overskrives på venstre side</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Vis filer der overskrives på venstre side</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Skjul filer der overskrives på højre side</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Vis filer der overskrives på højre side</target>
 
-<source>Hide files that won't be copied</source>
-<target>Skjul filer der ikke kopieres</target>
-
 <source>Show files that won't be copied</source>
 <target>Vis filer der ikke kopieres</target>
 
+<source>Set as default</source>
+<target>Sæt som standard</target>
+
 <source>All folders are in sync!</source>
 <target>Alle mapper er synkrone</target>
 
@@ -972,14 +948,8 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>File list exported!</source>
 <target>Fillisten blev eksporteret!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Emnet blev slettet!</pluralform>
-<pluralform>%x emner blev slettet!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>Søger efter opdatering...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1014,6 +984,9 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>&Ignore</source>
 <target>Ignorer</target>
 
+<source>Don't show this warning again</source>
+<target>Vis ikke igen</target>
+
 <source>&Switch</source>
 <target>Skift</target>
 
@@ -1032,9 +1005,6 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Comparing content...</source>
 <target>Analyserer indhold...</target>
 
-<source>Copy</source>
-<target>Kopier</target>
-
 <source>Paused</source>
 <target>Pauset</target>
 
@@ -1117,8 +1087,8 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <target>Vis skjulte advarsler og dialoger igen?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
 <pluralform>Vil du flytte emnet til papirkurven?</pluralform>
@@ -1126,8 +1096,8 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Vil du slette følgende emne?</pluralform>
@@ -1137,15 +1107,18 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Leave as unresolved conflict</source>
 <target>Efterlad som uløst konflikt</target>
 
+<source>Time stamp</source>
+<target>Tidsstempel</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Føj tidsstempel til hvert filnavn</target>
+
 <source>Replace</source>
 <target>Erstat</target>
 
 <source>Move files and replace if existing</source>
 <target>Flyt fil og erstat eventuelt eksisterende</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Føj tidsstempel til hvert filnavn</target>
-
 <source>Folder</source>
 <target>Mappe</target>
 
@@ -1260,6 +1233,12 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Cannot set privilege %x.</source>
 <target>Kan ikke sætte %x privilegier.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Kunne ikke suspendere systemets standby funktion.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Kan ikke ændre I/O prioriteter.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Kan ikke flytte %x til papirkurv!</target>
 
@@ -1278,14 +1257,38 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Sætter standardretning: Gamle filer overskrives med nyere.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Tjekker papirkurvs tilgængelighed for mappen %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Flytter filen %x til papirkurv</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Flytter mappen %x til papirkurv</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Flytter symlink %x til papirkurv</target>
+
+<source>Deleting file %x</source>
+<target>Sletter filen %x</target>
+
+<source>Deleting folder %x</source>
+<target>Sletter mappen %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Sletter symlink %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Papirkurven kan ikke bruges på følgende stier! Filer slettes permanent:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Du kan ignorere denne fejl og betragte mappen som tom.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>Den tilsvarende mappe betragtes som tom.</target>
 
-<source>Cannot find folder %x.</source>
-<target>Kan ikke finde mappen %x.</target>
+<source>Cannot find the following folders:</source>
+<target>Kan ikke finde følgende mapper:</target>
+
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Ignorer denne fejl for at betragte hver mappe som tom.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Afhængige mapper! Vær forsigtig når du laver synkroniseringsregler:</target>
@@ -1293,7 +1296,7 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Start comparison</source>
 <target>Start analyse</target>
 
-<source>Preparing synchronization...</source>
+<source>Calculating sync directions...</source>
 <target>Forbereder synkronisering...</target>
 
 <source>Conflict detected:</source>
@@ -1359,24 +1362,6 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Multiple...</source>
 <target>Flere...</target>
 
-<source>Deleting file %x</source>
-<target>Sletter filen %x</target>
-
-<source>Deleting folder %x</source>
-<target>Sletter mappen %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Sletter symlinket %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Flytter filen %x til papirkurven</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Flytter mappe %x til papirkurven</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Flytter symlinket %x til papirkurven</target>
-
 <source>Moving file %x to %y</source>
 <target>Flytter filen %x til %y</target>
 
@@ -1389,9 +1374,6 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Removing old versions...</source>
 <target>Fjerner gamle udgaver...</target>
 
-<source>Creating file %x</source>
-<target>Opretter filen %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Opretter symlinket %x</target>
 
@@ -1410,6 +1392,9 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Updating attributes of %x</source>
 <target>Opdaterer attributter for %x</target>
 
+<source>Cannot find %x.</source>
+<target>Kan ikke finde %x.</target>
+
 <source>Target folder %x already existing.</source>
 <target>Destinationsmappen %x findes allerede.</target>
 
@@ -1455,6 +1440,9 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Generating database...</source>
 <target>Opretter database...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Opretter VVS kopi for %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
-<target>Godkendelsesfejl: Kilde- og destinationsfil har forskelligt indhold!</target>
+<target>Godkendelsesfejl: Kilde og destinationsfil har forskelligt indhold!</target>
 
diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng
index 0aff2993..4bb61171 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Totale tijd:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Kan locatie %x niet op slot zetten.</target>
+
 <source>Show in Explorer</source>
 <target>Toon in Verkenner</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Fout</target>
 
+<source>Selected variant:</source>
+<target>Selecter variant:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Selecteer alternatieve vergelijkingsinstellingen</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Verwijder filterinstellingen</target>
 
+<source>Copy</source>
+<target>Kopiëren</target>
+
+<source>Paste</source>
+<target>Plakken</target>
+
 <source>Save as batch job</source>
 <target>Opslaan als batch opdracht</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Kritieke fout</target>
 
-<source>Windows Error Code %x:</source>
-<target>Windows Foutcode %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux Foutcode %x:</target>
+<source>Error Code %x:</source>
+<target>Foutcode %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Kan snelkoppeling %x niet vinden.</target>
@@ -160,8 +169,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Wachten totdat map is vergrendeld (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Kan directory %x niet sluiten.</target>
+<source>Creating file %x</source>
+<target>Bestand %x wordt aangemaakt</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -193,9 +202,6 @@
 <source>/sec</source>
 <target>/sec</target>
 
-<source>Cannot find file %x.</source>
-<target>Kan bestand %x niet vinden.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Bestand %x bevat geen valide configuratie.</target>
 
@@ -220,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Kan de volgende XML elementen niet lezen:</target>
 
+<source>Cannot find file %x.</source>
+<target>Kan bestand %x niet vinden.</target>
+
 <source>&Open...</source>
 <target>&Open...</target>
 
@@ -453,24 +462,21 @@ De opdracht word geactiveerd als:
 <source>&Advanced</source>
 <target>&Geavanceerd</target>
 
-<source>&Check for new version</source>
-<target>&Controleer op nieuwe versie</target>
+<source>&Check now</source>
+<target>&Controleer nu</target>
 
-<source>Compare</source>
-<target>Vergelijk</target>
+<source>Check &automatically once a week</source>
+<target>Controleer &automatisch eens per week</target>
 
-<source>Compare both sides</source>
-<target>Vergelijk beide zijdes</target>
+<source>Check for new version</source>
+<target>Controleer voor nieuwe versie</target>
 
-<source>&Abort</source>
-<target>&Afbreken</target>
+<source>Compare</source>
+<target>Vergelijk</target>
 
 <source>Synchronize</source>
 <target>Synchroniseer</target>
 
-<source>Start synchronization</source>
-<target>Start synchronisatie</target>
-
 <source>Add folder pair</source>
 <target>Voeg gekoppelde mappen toe</target>
 
@@ -480,15 +486,6 @@ De opdracht word geactiveerd als:
 <source>Swap sides</source>
 <target>Wissel zijdes</target>
 
-<source>Open</source>
-<target>Open</target>
-
-<source>Save</source>
-<target>Opslaan</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Laatst gebruikte instellingen (druk op DEL om iets te verwijderen)</target>
-
 <source>Hide excluded items</source>
 <target>Verberg uitgesloten bestanden</target>
 
@@ -519,6 +516,18 @@ De opdracht word geactiveerd als:
 <source>Time elapsed:</source>
 <target>Verstreken tijd:</target>
 
+<source>Synchronizing...</source>
+<target>Synchroniseert...</target>
+
+<source>On completion</source>
+<target>Na voltooiing</target>
+
+<source>Close</source>
+<target>Sluiten</target>
+
+<source>&Pause</source>
+<target>&Pauze</target>
+
 <source>Batch job</source>
 <target>Taaklijst</target>
 
@@ -549,9 +558,6 @@ De opdracht word geactiveerd als:
 <source>Abort synchronization on first error</source>
 <target>Synchronisatie stoppen bij eerste foutmelding</target>
 
-<source>On completion</source>
-<target>Na voltooiing</target>
-
 <source>Show progress dialog</source>
 <target>Toon voortgangsdialoogvenster</target>
 
@@ -609,8 +615,8 @@ overeenkomt
 <source><- Two way -></source>
 <target><- Twee kanten op -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identificeer en verspreid veranderingen aan beide kanten met behulp van een database. Verwijderingen, hernoemingen en conflicten worden automatisch gedetecteerd.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Identificeer en pas veranderingen toe aan beide kanten. Verwijderingen, verplaatsingen en conflicten worden automatisch gevonden met behulp van een database.</target>
 
 <source>Mirror ->></source>
 <target>Spiegelen ->></target>
@@ -648,15 +654,12 @@ overeenkomt
 <source>Versioning</source>
 <target>Versiebeheer</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Verplaats bestanden met tijdstempel naar specifieke map</target>
+<source>Move files to user-defined folder</source>
+<target>Verplaats bestanden naar een gebruikers gedefineerde map</target>
 
 <source>Naming convention:</source>
 <target>Naamgevingsconventie</target>
 
-<source>Configuration</source>
-<target>Configuratie</target>
-
 <source>Item exists on left side only</source>
 <target>Item bestaat alleen aan de linkerkant</target>
 
@@ -675,12 +678,6 @@ overeenkomt
 <source>Conflict/item cannot be categorized</source>
 <target>Conflict/item kan niet worden gecategoriseerd</target>
 
-<source>Synchronizing...</source>
-<target>Synchroniseert...</target>
-
-<source>&Pause</source>
-<target>&Pauze</target>
-
 <source>Source code written in C++ using:</source>
 <target>Broncode geschreven in C++ met behulp van:</target>
 
@@ -741,8 +738,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Maximum</source>
 <target>Maximum</target>
 
-<source>&Default</source>
-<target>&Standaard</target>
+<source>&Clear</source>
+<target>&Leegmaken</target>
 
 <source>Fail-safe file copy</source>
 <target>Fail-safe bestandskopie</target>
@@ -771,6 +768,12 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Description</source>
 <target>Omschrijving</target>
 
+<source>&Default</source>
+<target>&Standaard</target>
+
+<source>Start synchronization</source>
+<target>Start synchronisatie</target>
+
 <source>Variant</source>
 <target>Variant</target>
 
@@ -801,12 +804,24 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Overview</source>
 <target>Overzicht</target>
 
+<source>Configuration</source>
+<target>Configuratie</target>
+
 <source>Filter files</source>
 <target>Filter bestanden</target>
 
 <source>Select view</source>
 <target>Selecteer weergave</target>
 
+<source>Open...</source>
+<target>Open...</target>
+
+<source>Save</source>
+<target>Opslaan</target>
+
+<source>Compare both sides</source>
+<target>Vergelijk beide zijdes</target>
+
 <source>Set direction:</source>
 <target>Stel richting in:</target>
 
@@ -864,104 +879,62 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync taak</target>
 
-<source>Never save changes</source>
-<target>Wijzigingen nooit opslaan</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Wilt u de wijzigingen in %x opslaan?</target>
 
 <source>Do&n't save</source>
 <target>&Niet opslaan</target>
 
+<source>Never save changes</source>
+<target>Wijzigingen nooit opslaan</target>
+
 <source>Configuration loaded!</source>
 <target>Configuratie geladen!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Verberg bestanden die alleen aan de linkerzijde bestaan</target>
-
 <source>Show files that exist on left side only</source>
 <target>Toon bestanden die alleen aan de linkerzijde bestaan</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Verberg bestanden die alleen aan de rechterzijde bestaan</target>
-
 <source>Show files that exist on right side only</source>
 <target>Toon bestanden die alleen aan de rechterzijde bestaan</target>
 
-<source>Hide files that are newer on left</source>
-<target>Verberg bestanden die aan de linkerzijde nieuwer zijn</target>
-
 <source>Show files that are newer on left</source>
 <target>Toon bestanden die aan de linkerzijde nieuwer zijn</target>
 
-<source>Hide files that are newer on right</source>
-<target>Verberg bestanden die aan de rechterzijde nieuwer zijn</target>
-
 <source>Show files that are newer on right</source>
 <target>Toon bestanden die aan de rechterzijde nieuwer zijn</target>
 
-<source>Hide files that are equal</source>
-<target>Verberg bestanden die gelijk zijn</target>
-
 <source>Show files that are equal</source>
 <target>Toon bestanden die gelijk zijn</target>
 
-<source>Hide files that are different</source>
-<target>Verberg bestanden die verschillend zijn</target>
-
 <source>Show files that are different</source>
 <target>Toon bestanden die verschillend zijn</target>
 
-<source>Hide conflicts</source>
-<target>Verberg conflicten</target>
-
 <source>Show conflicts</source>
 <target>Toon conflicten</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Verberg bestanden die aan de linkerzijde aangemaakt zullen worden</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Toon bestanden die aan de linkerzijde aangemaakt zullen worden</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Verberg bestanden die aan de rechterzijde aangemaakt zullen worden</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Toon bestanden die aan de rechterzijde aangemaakt zullen worden</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Verberg bestanden die aan de linkerzijde aangemaakt zullen worden</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Toon bestanden die van de linkerzijde verwijderd zullen worden</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Verberg bestanden die aan de rechterzijde verwijderd zullen worden</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Toon bestanden die van de rechterzijde verwijderd zullen worden</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Verberg bestanden die aan de linkerzijde overschreven zullen worden</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Toon bestanden die aan de linkerzijde overschreven zullen worden</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Verberg bestanden die aan de rechterzijde overschreven zullen worden</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Toon bestanden die aan de rechterzijde overschreven zullen worden</target>
 
-<source>Hide files that won't be copied</source>
-<target>Verberg bestanden die niet gekopiëerd zullen worden</target>
-
 <source>Show files that won't be copied</source>
 <target>Toon bestanden die niet gekopiëerd zullen worden</target>
 
 <source>Set as default</source>
-<target></target>
+<target>Instellen als standaard</target>
 
 <source>All folders are in sync!</source>
 <target>Alle mappen zijn gesynchroniseerd!</target>
@@ -975,14 +948,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>File list exported!</source>
 <target>Bestandslijst geëxporteerd!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Object succesvol verwijderd!</pluralform>
-<pluralform>%x objecten succesvol verwijderd!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>Bezig met zoeken naar programma updates...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1017,6 +984,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>&Ignore</source>
 <target>&Negeren</target>
 
+<source>Don't show this warning again</source>
+<target>Laat deze waarschuwing niet opnieuw zien</target>
+
 <source>&Switch</source>
 <target>&Omschakelen</target>
 
@@ -1035,9 +1005,6 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Comparing content...</source>
 <target>Inhoud vergelijken...</target>
 
-<source>Copy</source>
-<target>Kopiëren</target>
-
 <source>Paused</source>
 <target>Gepauzeerd</target>
 
@@ -1120,35 +1087,38 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <target>Verborgen waarschuwingen en dialogen zichtbaar maken?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Weet u zeker dat u dit object naar de Prullenbak wil verplaatsen?</pluralform>
-<pluralform>Weet u zeker dat u deze %x objecten naar de Prullenbak wil verplaatsen?</pluralform>
+<pluralform>Weet u zeker dat u het volgende item naar de Prullebak wilt verplaatsen?</pluralform>
+<pluralform>Weet u zeker dat u de volgende %x items naar de Prullebak wilt verplaatsen?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Weet u zeker dat u dit object wilt verwijderen?</pluralform>
-<pluralform>Weet u zeker dat u deze %x objecten wilt verwijderen?</pluralform>
+<pluralform>Wilt u het volgende item echt verwijderen?</pluralform>
+<pluralform>Wilt u echt de volgende %x items verwijderen?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Beschouw als onopgelost conflict</target>
 
+<source>Time stamp</source>
+<target>Tijdstempel</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Voeg een timestamp aan elke bestandsnaam toe</target>
+
 <source>Replace</source>
 <target>Vervangen</target>
 
 <source>Move files and replace if existing</source>
 <target>Verplaats bestanden en overschrijf bestaande bestanden</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Voeg een timestamp aan elke bestandsnaam toe</target>
-
 <source>Folder</source>
 <target>Map</target>
 
@@ -1263,6 +1233,12 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Cannot set privilege %x.</source>
 <target>Kan privilege %x niet instellen.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Het opschorten van slaapstand is mislukt.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Kan de I/O prioriteiten niet aanpassen.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Niet mogelijk om %x naar de Prullenbak te verplaatsen!</target>
 
@@ -1281,14 +1257,38 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Stel standaard synchronisatie richtingen in: Oude bestanden worden door nieuwere bestanden overschreven.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Prullebak beschikbaarheid voor map %x te controleren...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Bezig met verplaatsen van bestand %x naar de prullenbak</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Bezig met verplaatsen van map %x naar de prullenbak</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Bezig met verplaatsen van snelkoppeling %x naar de prullenbak</target>
+
+<source>Deleting file %x</source>
+<target>Verwijderen van bestand %x</target>
+
+<source>Deleting folder %x</source>
+<target>Verwijderen van map %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Verwijderen van snelkoppeling %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Prullenbak is niet beschikbaar voor de volgende locaties! De bestanden worden permanent verwijderd:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>U kunt deze waarschuwing negeren om de map als leeg te laten gelden.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>De overeenkomstige map zal als leeg worden beschouwd.</target>
 
-<source>Cannot find folder %x.</source>
-<target>Kan map %x niet vinden.</target>
+<source>Cannot find the following folders:</source>
+<target>Kan de volgende mappen niet vinden:</target>
+
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>U kunt deze foutmelding negeren om elke map als leeg te beschouwen.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Mappen zijn afhankelijk van elkaar! Wees voorzichtig met het maken van synchronisatieregels:</target>
@@ -1296,8 +1296,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Start comparison</source>
 <target>Start vergelijking</target>
 
-<source>Preparing synchronization...</source>
-<target>Synchronisatie voorbereiden</target>
+<source>Calculating sync directions...</source>
+<target>Synchronisatie richtingen calculeren...</target>
 
 <source>Conflict detected:</source>
 <target>Conflict gedetecteerd:</target>
@@ -1362,24 +1362,6 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Multiple...</source>
 <target>Meerdere...</target>
 
-<source>Deleting file %x</source>
-<target>Verwijderen van bestand %x</target>
-
-<source>Deleting folder %x</source>
-<target>Verwijderen van map %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Verwijderen van snelkoppeling %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Bezig met verplaatsen van bestand %x naar de prullenbak</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Bezig met verplaatsen van map %x naar de prullenbak</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Bezig met verplaatsen van snelkoppeling %x naar de prullenbak</target>
-
 <source>Moving file %x to %y</source>
 <target>Bezig met verplaatsen van bestand %x naar %y</target>
 
@@ -1392,9 +1374,6 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Removing old versions...</source>
 <target>Bezig met verwijderen van oude versies...</target>
 
-<source>Creating file %x</source>
-<target>Bestand %x wordt aangemaakt</target>
-
 <source>Creating symbolic link %x</source>
 <target>Snelkoppeling %x wordt aangemaakt</target>
 
@@ -1413,6 +1392,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Updating attributes of %x</source>
 <target>Attributen bijwerken van %x</target>
 
+<source>Cannot find %x.</source>
+<target>Kan %x niet vinden.</target>
+
 <source>Target folder %x already existing.</source>
 <target>Doelmap %x bestaat al.</target>
 
@@ -1458,6 +1440,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Generating database...</source>
 <target>Genereren van database...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Bezig met Volume Schaduwkopie te maken voor %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Dataverificatie-fout: Bron en doelbestand hebben verschillende inhoud!</target>
 
diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index 4c77a16a..93340c36 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Total time:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Cannot set directory lock for %x.</target>
+
 <source>Show in Explorer</source>
 <target>Show in Explorer</target>
 
@@ -61,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Clear filter settings</target>
 
+<source>Copy</source>
+<target>Copy</target>
+
+<source>Paste</source>
+<target>Paste</target>
+
 <source>Save as batch job</source>
 <target>Save as batch job</target>
 
@@ -160,9 +169,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Waiting while directory is locked (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Cannot set directory lock %x.</target>
-
 <source>Creating file %x</source>
 <target>Creating file %x</target>
 
@@ -196,9 +202,6 @@
 <source>/sec</source>
 <target>/sec</target>
 
-<source>Cannot find file %x.</source>
-<target>Cannot find file %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>File %x does not contain a valid configuration.</target>
 
@@ -223,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Cannot read the following XML elements:</target>
 
+<source>Cannot find file %x.</source>
+<target>Cannot find file %x.</target>
+
 <source>&Open...</source>
 <target>&Open...</target>
 
@@ -456,15 +462,18 @@ The command is triggered if:
 <source>&Advanced</source>
 <target>&Advanced</target>
 
-<source>&Check for new version</source>
-<target>&Check for new version</target>
+<source>&Check now</source>
+<target>&Check now</target>
+
+<source>Check &automatically once a week</source>
+<target>Check &automatically once a week</target>
+
+<source>Check for new version</source>
+<target>Check for new version</target>
 
 <source>Compare</source>
 <target>Compare</target>
 
-<source>&Abort</source>
-<target>&Abort</target>
-
 <source>Synchronize</source>
 <target>Synchronise</target>
 
@@ -513,8 +522,8 @@ The command is triggered if:
 <source>On completion</source>
 <target>On completion</target>
 
-<source>OK</source>
-<target>OK</target>
+<source>Close</source>
+<target>Close</target>
 
 <source>&Pause</source>
 <target>&Pause</target>
@@ -600,11 +609,14 @@ is the same
 <source>Symbolic Link handling</source>
 <target>Symbolic Link handling</target>
 
+<source>OK</source>
+<target>OK</target>
+
 <source><- Two way -></source>
 <target><- Two way -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</target>
 
 <source>Mirror ->></source>
 <target>Mirror ->></target>
@@ -642,15 +654,12 @@ is the same
 <source>Versioning</source>
 <target>Versioning</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Move time-stamped files into specified folder</target>
+<source>Move files to user-defined folder</source>
+<target>Move files to user-defined folder</target>
 
 <source>Naming convention:</source>
 <target>Naming convention:</target>
 
-<source>Configuration</source>
-<target>Configuration</target>
-
 <source>Item exists on left side only</source>
 <target>Item exists on left side only</target>
 
@@ -729,8 +738,8 @@ Note: File names must be relative to base directories!
 <source>Maximum</source>
 <target>Maximum</target>
 
-<source>&Default</source>
-<target>&Default</target>
+<source>&Clear</source>
+<target>&Clear</target>
 
 <source>Fail-safe file copy</source>
 <target>Fail-safe file copy</target>
@@ -759,6 +768,9 @@ Note: File names must be relative to base directories!
 <source>Description</source>
 <target>Description</target>
 
+<source>&Default</source>
+<target>&Default</target>
+
 <source>Start synchronization</source>
 <target>Start synchronisation</target>
 
@@ -792,6 +804,9 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>Overview</target>
 
+<source>Configuration</source>
+<target>Configuration</target>
+
 <source>Filter files</source>
 <target>Filter files</target>
 
@@ -864,99 +879,57 @@ Note: File names must be relative to base directories!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync batch</target>
 
-<source>Never save changes</source>
-<target>Never save changes</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Do you want to save changes to %x?</target>
 
 <source>Do&n't save</source>
 <target>Do&n't save</target>
 
+<source>Never save changes</source>
+<target>Never save changes</target>
+
 <source>Configuration loaded!</source>
 <target>Configuration loaded!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Hide files that exist on left side only</target>
-
 <source>Show files that exist on left side only</source>
 <target>Show files that exist on left side only</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Hide files that exist on right side only</target>
-
 <source>Show files that exist on right side only</source>
 <target>Show files that exist on right side only</target>
 
-<source>Hide files that are newer on left</source>
-<target>Hide files that are newer on left</target>
-
 <source>Show files that are newer on left</source>
 <target>Show files that are newer on left</target>
 
-<source>Hide files that are newer on right</source>
-<target>Hide files that are newer on right</target>
-
 <source>Show files that are newer on right</source>
 <target>Show files that are newer on right</target>
 
-<source>Hide files that are equal</source>
-<target>Hide files that are equal</target>
-
 <source>Show files that are equal</source>
 <target>Show files that are equal</target>
 
-<source>Hide files that are different</source>
-<target>Hide files that are different</target>
-
 <source>Show files that are different</source>
 <target>Show files that are different</target>
 
-<source>Hide conflicts</source>
-<target>Hide conflicts</target>
-
 <source>Show conflicts</source>
 <target>Show conflicts</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Hide files that will be created on the left side</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Show files that will be created on the left side</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Hide files that will be created on the right side</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Show files that will be created on the right side</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Hide files that will be deleted on the left side</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Show files that will be deleted on the left side</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Hide files that will be deleted on the right side</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Show files that will be deleted on the right side</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Hide files that will be overwritten on left side</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Show files that will be overwritten on left side</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Hide files that will be overwritten on right side</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Show files that will be overwritten on right side</target>
 
-<source>Hide files that won't be copied</source>
-<target>Hide files that won't be copied</target>
-
 <source>Show files that won't be copied</source>
 <target>Show files that won't be copied</target>
 
@@ -975,6 +948,9 @@ Note: File names must be relative to base directories!
 <source>File list exported!</source>
 <target>File list exported!</target>
 
+<source>Searching for program updates...</source>
+<target>Searching for program updates...</target>
+
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
@@ -1008,6 +984,9 @@ Note: File names must be relative to base directories!
 <source>&Ignore</source>
 <target>&Ignore</target>
 
+<source>Don't show this warning again</source>
+<target>Don't show this warning again</target>
+
 <source>&Switch</source>
 <target>&Switch</target>
 
@@ -1026,9 +1005,6 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>Comparing content...</target>
 
-<source>Copy</source>
-<target>Copy</target>
-
 <source>Paused</source>
 <target>Paused</target>
 
@@ -1111,26 +1087,29 @@ Note: File names must be relative to base directories!
 <target>Make hidden warnings and dialogues visible again?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Leave as unresolved conflict</target>
 
+<source>Time stamp</source>
+<target>Time stamp</target>
+
 <source>Append a timestamp to each file name</source>
 <target>Append a timestamp to each file name</target>
 
@@ -1302,20 +1281,23 @@ Note: File names must be relative to base directories!
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</target>
 
-<source>You can ignore this error to consider each folder as empty.</source>
-<target>You can ignore this error to consider each folder as empty.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>The corresponding folder will be considered as empty.</target>
 
 <source>Cannot find the following folders:</source>
 <target>Cannot find the following folders:</target>
 
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>You can ignore this error to consider each folder as empty.</target>
+
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Directories are dependent! Be careful when setting up synchronisation rules:</target>
 
 <source>Start comparison</source>
 <target>Start comparison</target>
 
-<source>Preparing synchronization...</source>
-<target>Preparing synchronisation...</target>
+<source>Calculating sync directions...</source>
+<target>Calculating sync directions...</target>
 
 <source>Conflict detected:</source>
 <target>Conflict detected:</target>
@@ -1458,6 +1440,9 @@ Note: File names must be relative to base directories!
 <source>Generating database...</source>
 <target>Generating database...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Creating Volume Shadow Copy for %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Data verification error: Source and target file have different content!</target>
 
diff --git a/BUILD/Languages/finnish.lng b/BUILD/Languages/finnish.lng
index f5db927c..5d82fab5 100644
--- a/BUILD/Languages/finnish.lng
+++ b/BUILD/Languages/finnish.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Kokonaisaika:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Hakemiston %x lukitus ei onnistu.</target>
+
 <source>Show in Explorer</source>
 <target>Näytä Explorerissa</target>
 
@@ -40,11 +43,14 @@
 <source>Error</source>
 <target>Virhe</target>
 
+<source>Selected variant:</source>
+<target>Valitse tyyppi:</target>
+
 <source>Select alternate comparison settings</source>
-<target>Valitse toinen asetus vertailulle</target>
+<target>Muuta vertailun asetusta</target>
 
 <source>Select alternate synchronization settings</source>
-<target>Valitse täsmäykselle toinen asetus</target>
+<target>Muuta täsmäytyksen asetus</target>
 
 <source>Filter is active</source>
 <target>Suodin aktivoitu</target>
@@ -53,11 +59,17 @@
 <target>Suodin valitsematta</target>
 
 <source>Remove alternate settings</source>
-<target>Poista toinen asetus</target>
+<target>Poista muut asetukset</target>
 
 <source>Clear filter settings</source>
 <target>Nollaa suodin</target>
 
+<source>Copy</source>
+<target>Monista</target>
+
+<source>Paste</source>
+<target>Liitä</target>
+
 <source>Save as batch job</source>
 <target>Tallenna eräajona</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Kohtalokas virhe</target>
 
-<source>Windows Error Code %x:</source>
-<target>Windows virhekoodi %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux virhekoodi %x:</target>
+<source>Error Code %x:</source>
+<target>Virhe %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Tämä linkki on virheellinen %x.</target>
@@ -160,8 +169,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Odotan hakemiston lukitusta (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Hakemistoa %x ei saada lukittua.</target>
+<source>Creating file %x</source>
+<target>Luodaan tiedosto %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -187,15 +196,12 @@
 </source>
 <target>
 <pluralform>[1 säije]</pluralform>
-<pluralform>[%x säikeitä]</pluralform>
+<pluralform>[%x säijettä]</pluralform>
 </target>
 
 <source>/sec</source>
 <target>/s</target>
 
-<source>Cannot find file %x.</source>
-<target>Tiedosto %x ei löydy.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Tiedosto %x ei sisällä kelvollista kokoonpanoa.</target>
 
@@ -220,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>XML elementit lukukelvottimia:</target>
 
+<source>Cannot find file %x.</source>
+<target>Tiedosto %x ei löydy.</target>
+
 <source>&Open...</source>
 <target>&Avaa...</target>
 
@@ -453,24 +462,21 @@ Käsky suoritetaan jos:
 <source>&Advanced</source>
 <target>&Laajennettu</target>
 
-<source>&Check for new version</source>
-<target>Etsi &uusi versio</target>
+<source>&Check now</source>
+<target>&Tarkista nyt</target>
 
-<source>Compare</source>
-<target>Vertaile</target>
+<source>Check &automatically once a week</source>
+<target>Tarkista &viikoittain</target>
 
-<source>Compare both sides</source>
-<target>Vertaile molemmat puolet</target>
+<source>Check for new version</source>
+<target>Tarkita onko uudempaa</target>
 
-<source>&Abort</source>
-<target>&Lopeta</target>
+<source>Compare</source>
+<target>Vertaile</target>
 
 <source>Synchronize</source>
 <target>Täsmäytä</target>
 
-<source>Start synchronization</source>
-<target>Käynnistä täsmäytys</target>
-
 <source>Add folder pair</source>
 <target>Lisää hakemistopari</target>
 
@@ -480,17 +486,8 @@ Käsky suoritetaan jos:
 <source>Swap sides</source>
 <target>Puolten vaihto</target>
 
-<source>Open</source>
-<target>Avaa</target>
-
-<source>Save</source>
-<target>Tallenna</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Viimeksi käytetty asetus (poista listalta paina DEL)</target>
-
 <source>Hide excluded items</source>
-<target>Piilota poissuljetus</target>
+<target>Piilota ohitettavat</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Näytä suodatetut/nyt pois suljetut tiedostot</target>
@@ -519,6 +516,18 @@ Käsky suoritetaan jos:
 <source>Time elapsed:</source>
 <target>Aikaa kulunut:</target>
 
+<source>Synchronizing...</source>
+<target>Täsmäytetään...</target>
+
+<source>On completion</source>
+<target>Valmistuttua</target>
+
+<source>Close</source>
+<target>Sulje</target>
+
+<source>&Pause</source>
+<target>&Keskeytä</target>
+
 <source>Batch job</source>
 <target>Eräajo</target>
 
@@ -549,9 +558,6 @@ Käsky suoritetaan jos:
 <source>Abort synchronization on first error</source>
 <target>Keskeytä täsmäytys ensimmäisestä virheestä</target>
 
-<source>On completion</source>
-<target>Valmistuttua</target>
-
 <source>Show progress dialog</source>
 <target>Näytä etenemä ikkuna</target>
 
@@ -609,8 +615,8 @@ on sama
 <source><- Two way -></source>
 <target><- Molemmat -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Tunnista ja monista muutokset tietokannalla molemmille puolille. Poistot, uudelleennimeäminen ja ristiriidat havaitaan automaattisesti.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Löydä ja suorita muutokset molemmilla puolilla. Poistot, siirrot ja eroavuudet tunnistetaan tietokannan avulla.</target>
 
 <source>Mirror ->></source>
 <target>Peilaava ->></target>
@@ -628,7 +634,7 @@ on sama
 <target>Oma määritelmä</target>
 
 <source>Configure your own synchronization rules.</source>
-<target>Määritä omat täsmäyssäännöt.</target>
+<target>Määritä omat täsmäytyssäännöt.</target>
 
 <source>Deletion handling</source>
 <target>Poistotapa</target>
@@ -648,15 +654,12 @@ on sama
 <source>Versioning</source>
 <target>Versiointi</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Siirrä aikaleimatut tiedostot hakemistoon</target>
+<source>Move files to user-defined folder</source>
+<target>Siirrä tiedostot määrättyyn hakemistoon</target>
 
 <source>Naming convention:</source>
 <target>Nimeämis käytäntö:</target>
 
-<source>Configuration</source>
-<target>Asetukset</target>
-
 <source>Item exists on left side only</source>
 <target>Kohde löytyy vain vasemmalta</target>
 
@@ -675,12 +678,6 @@ on sama
 <source>Conflict/item cannot be categorized</source>
 <target>Ristiriita, ei määriteltävissä</target>
 
-<source>Synchronizing...</source>
-<target>Täsmäytetään...</target>
-
-<source>&Pause</source>
-<target>&Keskeytä</target>
-
 <source>Source code written in C++ using:</source>
 <target>Koodikieli on C++ käyttäen:</target>
 
@@ -741,8 +738,8 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Maximum</source>
 <target>Enintäin</target>
 
-<source>&Default</source>
-<target>&Vakio</target>
+<source>&Clear</source>
+<target>&Pyyhi</target>
 
 <source>Fail-safe file copy</source>
 <target>Varmennettu tiedostokopiointi</target>
@@ -760,7 +757,7 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <target>Kopioi tiedoston käyttöoikeuksia</target>
 
 <source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Kopioi tiedosto ja hakemisto käyttöoikeuksia (Pääkäyttäjän oikeudet tarvitaan)</target>
+<target>Kopioi tiedosto ja hakemisto käyttöoikeuksia (Vaatii Järjestelmävalvojan oikeuksia)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Palauta piiloitetut ikkunat</target>
@@ -771,6 +768,12 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Description</source>
 <target>Seloste</target>
 
+<source>&Default</source>
+<target>&Vakio</target>
+
+<source>Start synchronization</source>
+<target>Käynnistä täsmäytys</target>
+
 <source>Variant</source>
 <target>Vaihtoehto</target>
 
@@ -801,12 +804,24 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Overview</source>
 <target>Yleiskatsaus</target>
 
+<source>Configuration</source>
+<target>Asetukset</target>
+
 <source>Filter files</source>
 <target>Suodata tiedostot</target>
 
 <source>Select view</source>
 <target>Valitse näkymä</target>
 
+<source>Open...</source>
+<target>Avaa...</target>
+
+<source>Save</source>
+<target>Tallenna</target>
+
+<source>Compare both sides</source>
+<target>Vertaile molemmat puolet</target>
+
 <source>Set direction:</source>
 <target>Aseta suunta:</target>
 
@@ -864,102 +879,63 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync eräajo</target>
 
-<source>Never save changes</source>
-<target>Älä tallenna muutoksia</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Haluatko tallentaa muutokset: %x?</target>
 
 <source>Do&n't save</source>
 <target>Älä tallenna</target>
 
+<source>Never save changes</source>
+<target>Älä tallenna muutoksia</target>
+
 <source>Configuration loaded!</source>
 <target>Asetukset ladattu!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Piilota vain vasemmalla esiintyvät tiedostot</target>
-
 <source>Show files that exist on left side only</source>
 <target>Näytä vain vasemmalla esiintyvät tiedostot</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Piilota vain oikealla esiintyvät tiedostot</target>
-
 <source>Show files that exist on right side only</source>
 <target>Näytä vain oikealla esiintyvät tiedostot</target>
 
-<source>Hide files that are newer on left</source>
-<target>Piilota vasemmalla olevat uudemmat tiedostot</target>
-
 <source>Show files that are newer on left</source>
 <target>Näytä vasemmalla olevat uudemmat tiedostot</target>
 
-<source>Hide files that are newer on right</source>
-<target>Piilota oikealla olevat uudemmat tiedostot</target>
-
 <source>Show files that are newer on right</source>
 <target>Näytä uudemmat tiedostot oikealla</target>
 
-<source>Hide files that are equal</source>
-<target>Piilota yhteneväiset tiedostot</target>
-
 <source>Show files that are equal</source>
 <target>Näytä yhteneväiset tiedostot</target>
 
-<source>Hide files that are different</source>
-<target>Piilota erilaiset tiedostot</target>
-
 <source>Show files that are different</source>
 <target>Näytä erilaiset tiedostot</target>
 
-<source>Hide conflicts</source>
-<target>Piilota ristiriidat</target>
-
 <source>Show conflicts</source>
 <target>Näytä ristiriidat</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Piilota tiedostot jotka luodaan vasemmalle</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Näytä vasemmalle luotavat tiedostot</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Piilota tiedostot jotka luodaan oikealla</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Näytä oikealle luotavat tiedostot</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Piilota tiedostot jotka poistetaan vasemmalta</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Näytä vasemmalta poistettavat tiedostot</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Piilota tiedostot jotka poistetaan oikealta</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Näytä oikealta poistettavat tiedostot</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Piilota tiedostot jotka korvataan vasemmalla</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Näytä vasemmalla korvattavat tiedostot</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Piilota tiedostot jotka korvataan oikealla</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Näytä oikealla korvattavat tiedostot</target>
 
-<source>Hide files that won't be copied</source>
-<target>Piilota tiedostot jotka eivät kopioida</target>
-
 <source>Show files that won't be copied</source>
 <target>Näytä kopioimatta jäävät tiedostot</target>
 
+<source>Set as default</source>
+<target>Aseta oletukseksi</target>
+
 <source>All folders are in sync!</source>
 <target>Kaikki hakemistot täsmäytetty!</target>
 
@@ -972,14 +948,8 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>File list exported!</source>
 <target>Tiedostolista viety!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Kohde poistettu onnistuneesti!</pluralform>
-<pluralform>%x kohdetta poistettu onnistuneesti!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>Ohjelmapäivytys haetaa...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1014,6 +984,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>&Ignore</source>
 <target>&Unohda</target>
 
+<source>Don't show this warning again</source>
+<target>Älä enää näytä varoitusta</target>
+
 <source>&Switch</source>
 <target>&Vaihda</target>
 
@@ -1032,9 +1005,6 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Comparing content...</source>
 <target>Sisällön vertailu...</target>
 
-<source>Copy</source>
-<target>Monista</target>
-
 <source>Paused</source>
 <target>Pysäytetty</target>
 
@@ -1117,34 +1087,37 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <target>Näytä piiloitetut varoitukset/ikkunnat uudestaan?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Haluatko varmasti siirtää seuraava kohde Roskakoriin?</pluralform>
-<pluralform>Haluatko varmasti siirtää seuraavat %x kohteet Roskakoriin?</pluralform>
+<pluralform>Haluatko todella siirtää tätä Roskakoriin?</pluralform>
+<pluralform>Haluatko todella siirtää nämä %x kohdetta Roskakoriin?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Haluatko varmasti poistaa seuraava kohde?</pluralform>
-<pluralform>Haluatko varmasti poistaa seuraavat %x kohteet?</pluralform>
+<pluralform>Haluatko todella poistta tämä?</pluralform>
+<pluralform>Haluatko todella poistaa nämä %x kohdetta?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Jätä ratkaisemattomana virheenä</target>
 
+<source>Time stamp</source>
+<target>Aikaleima</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Lisää aikaleima tiedostoihin</target>
+
 <source>Replace</source>
 <target>Korvaa</target>
 
 <source>Move files and replace if existing</source>
-<target>Siirrä tiedostot ja korvaa tarvittaessa</target>
-
-<source>Append a timestamp to each file name</source>
-<target>Lisää aikaleima tiedostoihin</target>
+<target>Siirrä tiedostot ja korvaa olemassaolevat</target>
 
 <source>Folder</source>
 <target>Hakemisto</target>
@@ -1158,6 +1131,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Files</source>
 <target>Tiedostot</target>
 
+<source>Items</source>
+<target></target>
+
 <source>Percentage</source>
 <target>Prosenttia</target>
 
@@ -1260,6 +1236,12 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Cannot set privilege %x.</source>
 <target>Oikeuksia %x ei voitu asettaa.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Lepotilan keskeytys epäonnistui.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Prosessin I/O -pririteetin muutos ei onnistu.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Ei voitu siirtää %x Roskakoriin!</target>
 
@@ -1278,14 +1260,38 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Aseta oletussuunta täsmäykselle: Vanhat tiedostot korvataan uudemilla tiedostoilla.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Tarkistetaan Roskakorin käyttö hakemistolle %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Siirrä tiedosto %x roskakoriin</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Siirrä hakemisto %x roskakoriin</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Siirrä pikakuvake %x roskakoriin</target>
+
+<source>Deleting file %x</source>
+<target>Poista tiedosto %x</target>
+
+<source>Deleting folder %x</source>
+<target>Poista hakemisto %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Pistetaan pikakuvake %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Roskakori puuttuu näistä polusta! Tiedostot poistetaan pysyvästi:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Ohita tämä virhe ja oleta hakemisto tyhjäksi.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>Hakemisto tulkitaan tyhjäksi.</target>
+
+<source>Cannot find the following folders:</source>
+<target>Hakemistot ei löydy:</target>
 
-<source>Cannot find folder %x.</source>
-<target>Hakemisto %x ei löydy.</target>
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Ohita tämä virhe olettamalla hakemistot tyhjäksi.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Hakemistot riippuvuussuhteessa! Aseta täsmäyssääntöjä varovasti:</target>
@@ -1293,8 +1299,8 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Start comparison</source>
 <target>Käynnistä vertailu</target>
 
-<source>Preparing synchronization...</source>
-<target>Täsmäytys alustetaan...</target>
+<source>Calculating sync directions...</source>
+<target>Lasketaa täsmäytyksen suuntaa...</target>
 
 <source>Conflict detected:</source>
 <target>Ristiriita todettu:</target>
@@ -1359,24 +1365,6 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Multiple...</source>
 <target>Moninkertainen...</target>
 
-<source>Deleting file %x</source>
-<target>Poista tiedosto %x</target>
-
-<source>Deleting folder %x</source>
-<target>Poista hakemisto %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Pistetaan pikakuvake %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Siirrä tiedosto %x roskakoriin</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Siirrä hakemisto %x roskakoriin</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Siirrä pikakuvake %x roskakoriin</target>
-
 <source>Moving file %x to %y</source>
 <target>Siirrä tiedosto %x -> %y</target>
 
@@ -1389,9 +1377,6 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Removing old versions...</source>
 <target>Vanhat poistetaa...</target>
 
-<source>Creating file %x</source>
-<target>Luodaan tiedosto %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Luodaan pikakuvake %x</target>
 
@@ -1410,6 +1395,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Updating attributes of %x</source>
 <target>Päivitän %x:n ominaisuudet</target>
 
+<source>Cannot find %x.</source>
+<target>%x ei löydy.</target>
+
 <source>Target folder %x already existing.</source>
 <target>Kohdehakemisto %x on olemassa.</target>
 
@@ -1458,6 +1446,9 @@ Tietokanta luodaan.
 ..
 </target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Luodaan Volume Shadow Copy %x:lle...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Tiedon varmennusvirhe: Lähteellä ja kohteella on eri sisältö!</target>
 
diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng
index 7d8e8a4f..2bbb75d9 100644
--- a/BUILD/Languages/french.lng
+++ b/BUILD/Languages/french.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Durée totale :</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Impossible de verrouiller le dossier %x</target>
+
 <source>Show in Explorer</source>
 <target>Montrer dans l'explorateur</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Erreur</target>
 
+<source>Selected variant:</source>
+<target>Variante choisie :</target>
+
 <source>Select alternate comparison settings</source>
 <target>Choisir d'autres paramètres de comparaison</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Effacer la configuration du filtrage</target>
 
+<source>Copy</source>
+<target>Copier</target>
+
+<source>Paste</source>
+<target>Coller</target>
+
 <source>Save as batch job</source>
 <target>Enrgistrer en temps que fichier batch</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Erreur Fatale</target>
 
-<source>Windows Error Code %x:</source>
-<target>Code erreur Windows %x :</target>
-
-<source>Linux Error Code %x:</source>
-<target>Code erreur Linux %x :</target>
+<source>Error Code %x:</source>
+<target>Code erreur %x :</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Impossible de résoudre le lien symbolique %x.</target>
@@ -160,8 +169,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>En attente tant que le répertoire est verrouillé (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Impossible de verrouiller le répertoire %x.</target>
+<source>Creating file %x</source>
+<target>Création du fichier %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -193,9 +202,6 @@
 <source>/sec</source>
 <target>/sec</target>
 
-<source>Cannot find file %x.</source>
-<target>Impossible de trouver le fichier %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Le fichier %x ne contient pas une configuration valide.</target>
 
@@ -220,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Impossible de lire les données XML suivantes :</target>
 
+<source>Cannot find file %x.</source>
+<target>Impossible de trouver le fichier %x.</target>
+
 <source>&Open...</source>
 <target>&Ouvrir...</target>
 
@@ -230,7 +239,7 @@
 <target>&Quitter</target>
 
 <source>&Program</source>
-<target>&Tâche</target>
+<target>&Programme</target>
 
 <source>&Content</source>
 <target>&Contenu</target>
@@ -453,24 +462,21 @@ La commande est déclenchée si :
 <source>&Advanced</source>
 <target>&Avancé</target>
 
-<source>&Check for new version</source>
-<target>&Rechercher une nouvelle version</target>
+<source>&Check now</source>
+<target>&Contrôler maintenant</target>
 
-<source>Compare</source>
-<target>Comparer</target>
+<source>Check &automatically once a week</source>
+<target>Contrôler &automatiquement une fois par semaine</target>
 
-<source>Compare both sides</source>
-<target>Comparer les deux listes</target>
+<source>Check for new version</source>
+<target>Rechercher une nouvelle version</target>
 
-<source>&Abort</source>
-<target>&Abandonner</target>
+<source>Compare</source>
+<target>Comparer</target>
 
 <source>Synchronize</source>
 <target>Synchroniser</target>
 
-<source>Start synchronization</source>
-<target>Démarrer la synchronisation</target>
-
 <source>Add folder pair</source>
 <target>Ajout d'un couple de dossiers</target>
 
@@ -480,15 +486,6 @@ La commande est déclenchée si :
 <source>Swap sides</source>
 <target>Permuter les côtés</target>
 
-<source>Open</source>
-<target>Ouvrir</target>
-
-<source>Save</source>
-<target>Sauvegarder</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Dernière configuration utilisée (Appuyez sur SUPPR pour l'enlever de la liste)</target>
-
 <source>Hide excluded items</source>
 <target>Cacher les éléments exclus</target>
 
@@ -519,6 +516,18 @@ La commande est déclenchée si :
 <source>Time elapsed:</source>
 <target>Temps écoulé :</target>
 
+<source>Synchronizing...</source>
+<target>Synchronisation en cours...</target>
+
+<source>On completion</source>
+<target>À la fin</target>
+
+<source>Close</source>
+<target>Fermer</target>
+
+<source>&Pause</source>
+<target>&Pause</target>
+
 <source>Batch job</source>
 <target>Traitement batch</target>
 
@@ -549,9 +558,6 @@ La commande est déclenchée si :
 <source>Abort synchronization on first error</source>
 <target>Abandonner la synchronisation dès la première erreur</target>
 
-<source>On completion</source>
-<target>À la fin</target>
-
 <source>Show progress dialog</source>
 <target>Montrer la fenêtre de progression</target>
 
@@ -584,7 +590,7 @@ sont les mêmes
 </target>
 
 <source>File time and size</source>
-<target>Heure et taille du fichier</target>
+<target>Date et taille du fichier</target>
 
 <source>
 Files are found equal if
@@ -609,8 +615,8 @@ est identique
 <source><- Two way -></source>
 <target><- Deux sens -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identifie et propage les modifications des deux côtés à l'aide d'une base de données. Les suppressions, renommages et conflits sont détectés automatiquement.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Identifier et propager les modifications des deux côtés. Suppressions, déplacements et conflits sont détectés automatiquement en utilisant une base de données.</target>
 
 <source>Mirror ->></source>
 <target>Miroir ->></target>
@@ -648,15 +654,12 @@ est identique
 <source>Versioning</source>
 <target>Gestion des versions</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Déplacer les fichiers horodatés dans le dossier spécifié</target>
+<source>Move files to user-defined folder</source>
+<target>Déplacer les fichiers vers un dossier choisi par l'utilisateur</target>
 
 <source>Naming convention:</source>
 <target>Convention de nommage :</target>
 
-<source>Configuration</source>
-<target>Configuration</target>
-
 <source>Item exists on left side only</source>
 <target>Cet élément existe seulement à gauche</target>
 
@@ -675,12 +678,6 @@ est identique
 <source>Conflict/item cannot be categorized</source>
 <target>Conflit/élément impossible à classer</target>
 
-<source>Synchronizing...</source>
-<target>Synchronisation en cours...</target>
-
-<source>&Pause</source>
-<target>&Pause</target>
-
 <source>Source code written in C++ using:</source>
 <target>Code source écrit en C++ utilisant :</target>
 
@@ -741,8 +738,8 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Maximum</source>
 <target>Maximum</target>
 
-<source>&Default</source>
-<target>&Défaut</target>
+<source>&Clear</source>
+<target>&Effacer</target>
 
 <source>Fail-safe file copy</source>
 <target>Copie de fichiers sécurisé</target>
@@ -771,6 +768,12 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Description</source>
 <target>Description</target>
 
+<source>&Default</source>
+<target>&Défaut</target>
+
+<source>Start synchronization</source>
+<target>Démarrer la synchronisation</target>
+
 <source>Variant</source>
 <target>Variante</target>
 
@@ -801,12 +804,24 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Overview</source>
 <target>Présentation</target>
 
+<source>Configuration</source>
+<target>Configuration</target>
+
 <source>Filter files</source>
 <target>Filtrage des fichiers</target>
 
 <source>Select view</source>
 <target>Choisissez une vue</target>
 
+<source>Open...</source>
+<target>Ouvrir ...</target>
+
+<source>Save</source>
+<target>Sauvegarder</target>
+
+<source>Compare both sides</source>
+<target>Comparer les deux listes</target>
+
 <source>Set direction:</source>
 <target>Choix de la direction :</target>
 
@@ -864,102 +879,63 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>FreeFileSync batch</source>
 <target>FreeFileSync batch</target>
 
-<source>Never save changes</source>
-<target>Ne jamais enregistrer les modifications</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Voulez-vous enregistrer les modifications dans %x ?</target>
 
 <source>Do&n't save</source>
 <target>&Ne pas Sauvegarder</target>
 
+<source>Never save changes</source>
+<target>Ne jamais enregistrer les modifications</target>
+
 <source>Configuration loaded!</source>
 <target>Configuration chargée !</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Masquer les fichiers n'existant qu'à gauche</target>
-
 <source>Show files that exist on left side only</source>
 <target>Afficher les fichiers existant seulement à gauche</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Masquer les fichiers n'existant qu'à droite</target>
-
 <source>Show files that exist on right side only</source>
 <target>Afficher les fichiers existant seulement à droite</target>
 
-<source>Hide files that are newer on left</source>
-<target>Masquer les fichiers plus récents à gauche</target>
-
 <source>Show files that are newer on left</source>
 <target>Afficher les fichiers de gauche plus récents que ceux de droite</target>
 
-<source>Hide files that are newer on right</source>
-<target>Masquer les fichiers plus récents à droite</target>
-
 <source>Show files that are newer on right</source>
 <target>Afficher les fichiers de droite plus récents que ceux de gauche</target>
 
-<source>Hide files that are equal</source>
-<target>Masquer les fichiers identiques</target>
-
 <source>Show files that are equal</source>
 <target>Afficher les fichiers identiques</target>
 
-<source>Hide files that are different</source>
-<target>Masquer les fichiers différents</target>
-
 <source>Show files that are different</source>
 <target>Afficher les fichiers différents</target>
 
-<source>Hide conflicts</source>
-<target>Masquer les conflits</target>
-
 <source>Show conflicts</source>
 <target>Afficher les conflits</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Masquer les fichiers qui seront créés à gauche</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Afficher les fichiers qui seront créés à gauche</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Masquer les fichiers qui seront créés à droite</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Afficher les fichiers qui seront créés à droite</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Masquer les fichiers qui seront supprimés à gauche</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Afficher les fichiers qui seront supprimés à gauche</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Masquer les fichiers qui seront supprimés à droite</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Afficher les fichiers qui seront supprimés à droite</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Fichiers masqués qui ont été écrasés à gauche</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Afficher les fichiers qui seront écrasés à gauche</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Fichiers masqués qui ont été écrasés à droite</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Afficher les fichiers qui seront écrasés à droite</target>
 
-<source>Hide files that won't be copied</source>
-<target>Masquer les fichiers qui ne seront pas copiés</target>
-
 <source>Show files that won't be copied</source>
 <target>Afficher les fichiers qui ne seront pas copiés</target>
 
+<source>Set as default</source>
+<target>Définir par défaut</target>
+
 <source>All folders are in sync!</source>
 <target>Tous les dossiers sont synchronisés !</target>
 
@@ -972,14 +948,8 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>File list exported!</source>
 <target>Liste des fichiers exportée !</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Objet supprimé avec succès !</pluralform>
-<pluralform>%x objets supprimés avec succès!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>Recherche de mises à jour ...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1014,6 +984,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>&Ignore</source>
 <target>&Ignorer</target>
 
+<source>Don't show this warning again</source>
+<target>Ne plus afficher cet avertissement</target>
+
 <source>&Switch</source>
 <target>&Changer</target>
 
@@ -1032,9 +1005,6 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Comparing content...</source>
 <target>Comparaison du contenu...</target>
 
-<source>Copy</source>
-<target>Copier</target>
-
 <source>Paused</source>
 <target>En pause</target>
 
@@ -1117,35 +1087,38 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <target>Voulez-vous réafficher les avertissements et les boîtes de dialogue ?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Voulez-vous vraiment mettre cet objet dans la corbeille ?</pluralform>
-<pluralform>Voulez-vous vraiment mettre ces %x objets dans la corbeille ?</pluralform>
+<pluralform>Voulez-vous vraiment mettre à la Corbeille l'élément suivant ?</pluralform>
+<pluralform>Voulez-vous vraiment mettre à la Corbeille les %x éléments suivants ?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Voulez-vous vraiment supprimer cet objet ?</pluralform>
-<pluralform>Voulez-vous vraiment supprimer ces %x objets ?</pluralform>
+<pluralform>Voulez-vous vraiment supprimer l'élément suivant ?</pluralform>
+<pluralform>Voulez-vous vraiment supprimer les %x éléments suivants ?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Abandonner en tant que conflit non résolu</target>
 
+<source>Time stamp</source>
+<target>Horodatage</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Ajouter un horodatage à chaque fichier</target>
+
 <source>Replace</source>
 <target>Remplacer</target>
 
 <source>Move files and replace if existing</source>
 <target>Déplacer les fichiers et remplacer ceux existant</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Ajouter un horodatage à chaque fichier</target>
-
 <source>Folder</source>
 <target>Dossier</target>
 
@@ -1260,6 +1233,12 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Cannot set privilege %x.</source>
 <target>Impossible de fixer le privilège %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Impossible de suspendre le mode veille du système.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Impossible de modifier les priorités E/S des tâches</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Impossible de déplacer %x dans la Corbeille !</target>
 
@@ -1278,14 +1257,38 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Directions de la synchronisation par défaut : les anciens fichiers seront remplacés par les nouveaux.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Contrôle de la disponibilité de la Corbeille pour le dossier %x ...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Envoi du fichier %x dans la corbeille</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Envoi du dossier %x dans la corbeille</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Envoi du lien symbolique %x dans la corbeille</target>
+
+<source>Deleting file %x</source>
+<target>Suppression du fichier %x</target>
+
+<source>Deleting folder %x</source>
+<target>Suppression du dossier %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Suppression du lien symbolique %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>La corbeille n'est pas valable pour les chemins suivants ! Les fichiers seront détruits définitivement :</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Vous pouvez ignorer cette erreur en considérant le dossier comme vide.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>Le dossier correspondant sera considéré comme vide.</target>
+
+<source>Cannot find the following folders:</source>
+<target>Impossible de trouver les dossiers suivants :</target>
 
-<source>Cannot find folder %x.</source>
-<target>Impossible de trouver le dossier %x.</target>
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Vous pouvez ignorer cette erreur et considérer chaque dossier comme vide.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Les répertoires sont imbriqués ! Attention à la mise à jour des règles de synchronisation :</target>
@@ -1293,8 +1296,8 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Start comparison</source>
 <target>Démarrer la comparaison</target>
 
-<source>Preparing synchronization...</source>
-<target>Synchronisation en cours de préparation ...</target>
+<source>Calculating sync directions...</source>
+<target>Evaluation du sens des synchronisations ...</target>
 
 <source>Conflict detected:</source>
 <target>Conflit détecté :</target>
@@ -1359,24 +1362,6 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Multiple...</source>
 <target>Multiple...</target>
 
-<source>Deleting file %x</source>
-<target>Suppression du fichier %x</target>
-
-<source>Deleting folder %x</source>
-<target>Suppression du dossier %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Suppression du lien symbolique %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Envoi du fichier %x dans la corbeille</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Envoi du dossier %x dans la corbeille</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Envoi du lien symbolique %x dans la corbeille</target>
-
 <source>Moving file %x to %y</source>
 <target>Déplacement du fichier %x vers %y</target>
 
@@ -1389,9 +1374,6 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Removing old versions...</source>
 <target>Suppression des anciennes versions...</target>
 
-<source>Creating file %x</source>
-<target>Création du fichier %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Création du lien symbolique %x</target>
 
@@ -1410,6 +1392,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Updating attributes of %x</source>
 <target>Mise à jour des attributs de %x</target>
 
+<source>Cannot find %x.</source>
+<target>Impossible de trouver %x</target>
+
 <source>Target folder %x already existing.</source>
 <target>Le dossier destination %x existe déjà.</target>
 
@@ -1455,6 +1440,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Generating database...</source>
 <target>Génération de la base de données...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Création d'un Volume Shadow Copy pour %x ...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Erreur lors du contrôle des données : Les fichiers source et destination ont des contenus différents !</target>
 
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index b904ff18..706736c4 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Gesamtzeit:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Die Verzeichnissperre für %x kann nicht gesetzt werden.</target>
+
 <source>Show in Explorer</source>
 <target>Im Explorer anzeigen</target>
 
@@ -61,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Filtereinstellungen löschen</target>
 
+<source>Copy</source>
+<target>Kopieren</target>
+
+<source>Paste</source>
+<target>Einfügen</target>
+
 <source>Save as batch job</source>
 <target>Als Batch-Job speichern</target>
 
@@ -160,9 +169,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Warte während Verzeichnis gesperrt ist (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Die Verzeichnissperre %x kann nicht gesetzt werden.</target>
-
 <source>Creating file %x</source>
 <target>Erstelle Datei %x</target>
 
@@ -196,9 +202,6 @@
 <source>/sec</source>
 <target>/s</target>
 
-<source>Cannot find file %x.</source>
-<target>Die Datei %x wurde nicht gefunden.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Die Datei %x enthält keine gültige Konfiguration.</target>
 
@@ -223,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Die folgenden XML-Elemente können nicht gelesen werden:</target>
 
+<source>Cannot find file %x.</source>
+<target>Die Datei %x wurde nicht gefunden.</target>
+
 <source>&Open...</source>
 <target>Ö&ffnen...</target>
 
@@ -456,8 +462,14 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>&Advanced</source>
 <target>&Erweitert</target>
 
-<source>&Check for new version</source>
-<target>&Auf neuere Version prüfen</target>
+<source>&Check now</source>
+<target>&Jetzt prüfen</target>
+
+<source>Check &automatically once a week</source>
+<target>&Automatisch wöchentlich prüfen</target>
+
+<source>Check for new version</source>
+<target>Auf neuere Version prüfen</target>
 
 <source>Compare</source>
 <target>Vergleichen</target>
@@ -603,8 +615,8 @@ gleich ist
 <source><- Two way -></source>
 <target><- Zwei Wege -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identifiziere und propagiere Änderungen auf beiden Seiten mit Hilfe einer Datenbank. Löschungen, Umbenennungen und Konflikte werden automatisch erkannt.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Identifiziere und propagiere Änderungen auf beiden Seiten. Löschungen, Verschiebungen und Konflikte werden automatisch mit Hilfe einer Datenbank erkannt.</target>
 
 <source>Mirror ->></source>
 <target>Spiegeln ->></target>
@@ -642,15 +654,12 @@ gleich ist
 <source>Versioning</source>
 <target>Versionierung</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Dateien mit Zeitstempel in den angegebenen Ordner verschieben</target>
+<source>Move files to user-defined folder</source>
+<target>Dateien in den benutzerdefinierten Ordner verschieben</target>
 
 <source>Naming convention:</source>
 <target>Namenskonvention:</target>
 
-<source>Configuration</source>
-<target>Konfiguration</target>
-
 <source>Item exists on left side only</source>
 <target>Element existiert nur links</target>
 
@@ -729,8 +738,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Maximum</source>
 <target>Maximum</target>
 
-<source>&Default</source>
-<target>&Standard</target>
+<source>&Clear</source>
+<target>&Löschen</target>
 
 <source>Fail-safe file copy</source>
 <target>Dateien ausfallsicher kopieren</target>
@@ -759,6 +768,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Description</source>
 <target>Beschreibung</target>
 
+<source>&Default</source>
+<target>&Standard</target>
+
 <source>Start synchronization</source>
 <target>Synchronisation starten</target>
 
@@ -792,6 +804,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Overview</source>
 <target>Übersicht</target>
 
+<source>Configuration</source>
+<target>Konfiguration</target>
+
 <source>Filter files</source>
 <target>Dateien filtern</target>
 
@@ -876,87 +891,45 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Configuration loaded!</source>
 <target>Konfiguration geladen!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Nur links existierende Dateien ausblenden</target>
-
 <source>Show files that exist on left side only</source>
 <target>Nur links existierende Dateien anzeigen</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Nur rechts existierende Dateien ausblenden</target>
-
 <source>Show files that exist on right side only</source>
 <target>Nur rechts existierende Dateien anzeigen</target>
 
-<source>Hide files that are newer on left</source>
-<target>Auf beiden Seiten existierende Dateien ausblenden; linke Datei ist neuer</target>
-
 <source>Show files that are newer on left</source>
 <target>Auf beiden Seiten existierende Dateien anzeigen; linke Datei ist neuer</target>
 
-<source>Hide files that are newer on right</source>
-<target>Auf beiden Seiten existierende Dateien ausblenden; rechte Datei ist neuer</target>
-
 <source>Show files that are newer on right</source>
 <target>Auf beiden Seiten existierende Dateien anzeigen; rechte Datei ist neuer</target>
 
-<source>Hide files that are equal</source>
-<target>Gleiche Dateien ausblenden</target>
-
 <source>Show files that are equal</source>
 <target>Gleiche Dateien anzeigen</target>
 
-<source>Hide files that are different</source>
-<target>Ungleiche Dateien ausblenden</target>
-
 <source>Show files that are different</source>
 <target>Ungleiche Dateien anzeigen</target>
 
-<source>Hide conflicts</source>
-<target>Konflikte ausblenden</target>
-
 <source>Show conflicts</source>
 <target>Konflikte zeigen</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Dateien die links erstellt werden ausblenden</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Dateien die links erstellt werden anzeigen</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Dateien die rechts erstellt werden ausblenden</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Dateien die rechts erstellt werden anzeigen</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Dateien die links gelöscht werden ausblenden</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Dateien die links gelöscht werden anzeigen</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Dateien die rechts gelöscht werden ausblenden</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Dateien die rechts gelöscht werden anzeigen</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Dateien die links überschrieben werden ausblenden</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Dateien die links überschrieben werden anzeigen</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Dateien die rechts überschrieben werden ausblenden</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Dateien die rechts überschrieben werden anzeigen</target>
 
-<source>Hide files that won't be copied</source>
-<target>Dateien die nicht kopiert werden ausblenden</target>
-
 <source>Show files that won't be copied</source>
 <target>Dateien die nicht kopiert werden anzeigen</target>
 
@@ -975,6 +948,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>File list exported!</source>
 <target>Dateiliste exportiert!</target>
 
+<source>Searching for program updates...</source>
+<target>Suche nach aktualisierten Programmversionen...</target>
+
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
@@ -1008,6 +984,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>&Ignore</source>
 <target>&Ignorieren</target>
 
+<source>Don't show this warning again</source>
+<target>Diese Warnung nicht mehr anzeigen</target>
+
 <source>&Switch</source>
 <target>&Wechseln</target>
 
@@ -1026,9 +1005,6 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Comparing content...</source>
 <target>Vergleiche Dateiinhalt...</target>
 
-<source>Copy</source>
-<target>Kopieren</target>
-
 <source>Paused</source>
 <target>Angehalten</target>
 
@@ -1111,8 +1087,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <target>Versteckte Warnungen und Dialoge wieder sichtbar machen?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
 <pluralform>Soll das folgende Element wirklich in den Papierkorb verschoben werden?</pluralform>
@@ -1120,8 +1096,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Soll das folgende Element wirklich gelöscht werden?</pluralform>
@@ -1131,14 +1107,17 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Leave as unresolved conflict</source>
 <target>Als unbehandelten Konflikt belassen</target>
 
+<source>Time stamp</source>
+<target>Zeitstempel</target>
+
 <source>Append a timestamp to each file name</source>
-<target>Einen Zeitstempel an jeden Dateinamen hinzufügen</target>
+<target>Einen Zeitstempel an jeden Dateinamen anhängen</target>
 
 <source>Replace</source>
 <target>Ersetzen</target>
 
 <source>Move files and replace if existing</source>
-<target>Dateien verschieben und bereits vorhandene ersetzen</target>
+<target>Dateien verschieben und vorhandene ersetzen</target>
 
 <source>Folder</source>
 <target>Ordner</target>
@@ -1152,6 +1131,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Files</source>
 <target>Dateien</target>
 
+<source>Items</source>
+<target>Elemente</target>
+
 <source>Percentage</source>
 <target>Prozent</target>
 
@@ -1302,20 +1284,23 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Der Papierkorb ist für die folgenden Pfade nicht verfügbar! Die Dateien werden stattdessen permanent gelöscht:</target>
 
-<source>You can ignore this error to consider each folder as empty.</source>
-<target>Dieser Fehler kann ignoriert werden, um die Ordner als leer anzusehen.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>Der entsprechende Ordner wird als leer angesehen.</target>
 
 <source>Cannot find the following folders:</source>
 <target>Die folgenden Ordner wurden nicht gefunden:</target>
 
+<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>Dieser Fehler kann ignoriert werden, um die Ordner als leer anzusehen. Die Ordner werden dann beim Synchronisieren automatisch erstellt.</target>
+
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Die Verzeichnisse sind voneinander abhängig! Achtung beim Festlegen der Synchronisationsregeln:</target>
 
 <source>Start comparison</source>
 <target>Starte Vergleich</target>
 
-<source>Preparing synchronization...</source>
-<target>Bereite Synchronisation vor...</target>
+<source>Calculating sync directions...</source>
+<target>Berechne Synchronisationsrichtungen...</target>
 
 <source>Conflict detected:</source>
 <target>Ein Konflikt wurde erkannt:</target>
@@ -1458,6 +1443,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Generating database...</source>
 <target>Erzeuge Synchronisationsdatenbank...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Erstelle Volumenschattenkopie für %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Verifizierungsfehler: Quell- und Zieldatei haben unterschiedlichen Inhalt!</target>
 
diff --git a/BUILD/Languages/greek.lng b/BUILD/Languages/greek.lng
index d48de099..51650524 100644
--- a/BUILD/Languages/greek.lng
+++ b/BUILD/Languages/greek.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Συνολική διάρκεια:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Ο υποκατάλογος για το %x δεν μπορεί να κλειδωθεί.</target>
+
 <source>Show in Explorer</source>
 <target>Εμφάνιση στην Εξερεύνηση</target>
 
@@ -32,7 +35,7 @@
 <target>Ζητήθηκε ματαίωση: Αναμονή για την λήξη της τρέχουσας εργασίας...</target>
 
 <source>Failure to create timestamp for versioning:</source>
-<target></target>
+<target>Αποτυχία να δημιουργηθεί χρονική σήμανση για τη διατήρηση παλιών εκδόσεων:</target>
 
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Αυτοματοποιημένος Συγχρονισμός</target>
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Σφάλματα</target>
 
+<source>Selected variant:</source>
+<target>Μέθοδος που επιλέχθηκε:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Επιλογή διαφοροποιημένων ρυθμίσεων σύγκρισης</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Διαγραφή όλων των ρυθμίσεων φίλτρου</target>
 
+<source>Copy</source>
+<target>Αντιγραφή</target>
+
+<source>Paste</source>
+<target>Επικόλληση</target>
+
 <source>Save as batch job</source>
 <target>Αποθήκευση ως δέσμη ενεργειών</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Σημαντικό Σφάλμα</target>
 
-<source>Windows Error Code %x:</source>
-<target>Κωδικός Σφάλματος των Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Κωδικός Σφάλματος του Linux %x:</target>
+<source>Error Code %x:</source>
+<target>Κωδικός Σφάλματος %x</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Ο συμβολικός δεσμός %x δεν μπορεί να επιλυθεί</target>
@@ -160,8 +169,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Αναμονή μέχρι να κλειδωθεί ο υποκατάλογος (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Δεν μπορεί να κλειδωθεί ο υπολατάλογος %x.</target>
+<source>Creating file %x</source>
+<target>Δημιουργία του αρχείου %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -193,9 +202,6 @@
 <source>/sec</source>
 <target>/δευτερόλεπτο</target>
 
-<source>Cannot find file %x.</source>
-<target>Το αρχείο %x δε βρέθηκε.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Το αρχείο %x δεν περιέχει μια έγκυρη διάταξη.</target>
 
@@ -220,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Δεν ήταν δυνατό να αναγνωσθούν τα ακόλουθα στοιχεία XML:</target>
 
+<source>Cannot find file %x.</source>
+<target>Το αρχείο %x δε βρέθηκε.</target>
+
 <source>&Open...</source>
 <target>Ά&νοιγμα...</target>
 
@@ -453,15 +462,18 @@ The command is triggered if:
 <source>&Advanced</source>
 <target>&Για προχωρημένους</target>
 
-<source>&Check for new version</source>
-<target>Έ&λεγχος για νέα έκδοση</target>
+<source>&Check now</source>
+<target>Έλεγχος &τώρα</target>
+
+<source>Check &automatically once a week</source>
+<target>&Aυτόματος έλεγχος μια φορά την εβδομάδα</target>
+
+<source>Check for new version</source>
+<target>Έλεγχος για νέα έκδοση</target>
 
 <source>Compare</source>
 <target>Σύγκριση</target>
 
-<source>&Abort</source>
-<target>&Άκυρο</target>
-
 <source>Synchronize</source>
 <target>Συγχρονισμός</target>
 
@@ -504,6 +516,18 @@ The command is triggered if:
 <source>Time elapsed:</source>
 <target>Πέρασε χρόνος:</target>
 
+<source>Synchronizing...</source>
+<target>Γίνεται συγχρονισμός...</target>
+
+<source>On completion</source>
+<target>Μετά την ολοκλήρωση</target>
+
+<source>Close</source>
+<target>Κλείσιμο</target>
+
+<source>&Pause</source>
+<target>&Παύση</target>
+
 <source>Batch job</source>
 <target>Δέσμη ενεργειών</target>
 
@@ -534,9 +558,6 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>Ματαίωση του συγχρονισμού με το πρώτο σφάλμα</target>
 
-<source>On completion</source>
-<target>Μετά την ολοκλήρωση</target>
-
 <source>Show progress dialog</source>
 <target>Εμφάνιση της αναφοράς προόδου</target>
 
@@ -594,8 +615,8 @@ is the same
 <source><- Two way -></source>
 <target><- Διπλής κατεύθυνσης -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Αναγνώριση και αναπαραγωγή των αλλαγών και στις δύο πλευρές με τη χρήση μιας βάσης δεδομένων. Διαγραφές, μετονομασίες και διενέξεις ανιχνεύονται αυτόματα.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Αναγνώριση και εφαρμογή αλλαγών και στις δυο πλευρές. Οι διαγραφές, οι μεταφορές και οι διενέξεις αναγνωρίζονται αυτόματα με τη βοήθεια μιας βάσης δεδομένων.</target>
 
 <source>Mirror ->></source>
 <target>Κατοπτρισμός ->></target>
@@ -633,15 +654,12 @@ is the same
 <source>Versioning</source>
 <target>Διατήρηση παλιών εκδόσεων</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Μεταφορά χρονοσημασμένων αρχείων σε συγκεκριμένο υποκατάλογο</target>
+<source>Move files to user-defined folder</source>
+<target>Μεταφορά των αρχείων σε έναν υποκατάλογο που ορίζεται από το χρήστη</target>
 
 <source>Naming convention:</source>
 <target>Τρόπος ονομασίας:</target>
 
-<source>Configuration</source>
-<target>Διάταξη</target>
-
 <source>Item exists on left side only</source>
 <target>Το αντικείμενο υπάρχει μόνο στην αριστερή πλευρά</target>
 
@@ -660,12 +678,6 @@ is the same
 <source>Conflict/item cannot be categorized</source>
 <target>Διένεξη/το αντικείμενο δεν μπορεί να κατηγοριοποιηθεί</target>
 
-<source>Synchronizing...</source>
-<target>Γίνεται συγχρονισμός...</target>
-
-<source>&Pause</source>
-<target>&Παύση</target>
-
 <source>Source code written in C++ using:</source>
 <target>Ο πηγαίος κώδικας γράφτηκε σε C++ χρησιμοποιώντας τα:</target>
 
@@ -726,8 +738,8 @@ Note: File names must be relative to base directories!
 <source>Maximum</source>
 <target>Μέγιστο</target>
 
-<source>&Default</source>
-<target>&Προεπιλογή</target>
+<source>&Clear</source>
+<target>&Καθαρισμός</target>
 
 <source>Fail-safe file copy</source>
 <target>Ασφαλής αντιγραφή αρχείων</target>
@@ -756,6 +768,9 @@ Note: File names must be relative to base directories!
 <source>Description</source>
 <target>Περιγραφή</target>
 
+<source>&Default</source>
+<target>&Προεπιλογή</target>
+
 <source>Start synchronization</source>
 <target>Έναρξη του συγχρονισμού</target>
 
@@ -789,6 +804,9 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>Σύνοψη</target>
 
+<source>Configuration</source>
+<target>Διάταξη</target>
+
 <source>Filter files</source>
 <target>Φιλτράρισμα</target>
 
@@ -796,7 +814,7 @@ Note: File names must be relative to base directories!
 <target>Επιλογή εμφάνισης</target>
 
 <source>Open...</source>
-<target></target>
+<target>Άνοιγμα...</target>
 
 <source>Save</source>
 <target>Αποθήκευση</target>
@@ -861,104 +879,62 @@ Note: File names must be relative to base directories!
 <source>FreeFileSync batch</source>
 <target>Δέσμη ενεργειών του FreeFileSync</target>
 
-<source>Never save changes</source>
-<target>Να μην αποθηκεύονται οι αλλαγές</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Θέλετε να αποθηκεύσετε τις αλλαγές στο %x;</target>
 
 <source>Do&n't save</source>
 <target>Να &μην αποθηκευθούν</target>
 
+<source>Never save changes</source>
+<target>Να μην αποθηκεύονται οι αλλαγές</target>
+
 <source>Configuration loaded!</source>
 <target>Η διάταξη έχει ανοιχθεί!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Απόκρυψη των αρχείων που υπάρχουν μόνο στα αριστερά</target>
-
 <source>Show files that exist on left side only</source>
 <target>Εμφάνιση των αρχείων που υπάρχουν μόνο στα αριστερά</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Απόκρυψη των αρχείων που υπάρχουν μόνο στα δεξιά</target>
-
 <source>Show files that exist on right side only</source>
 <target>Εμφάνιση των αρχείων που υπάρχουν μόνο στα δεξιά</target>
 
-<source>Hide files that are newer on left</source>
-<target>Απόκρυψη των αρχείων που είναι πιο πρόσφατα στα αριστερά</target>
-
 <source>Show files that are newer on left</source>
 <target>Εμφάνιση των αρχείων που είναι πιο πρόσφατα στα αριστερά</target>
 
-<source>Hide files that are newer on right</source>
-<target>Απόκρυψη των αρχείων που είναι πιο πρόσφατα στα δεξιά</target>
-
 <source>Show files that are newer on right</source>
 <target>Εμφάνιση των αρχείων που είναι πιο πρόσφατα στα δεξιά</target>
 
-<source>Hide files that are equal</source>
-<target>Απόκρυψη των αρχείων που είναι ίδια</target>
-
 <source>Show files that are equal</source>
 <target>Εμφάνιση των αρχείων που είναι ίδια</target>
 
-<source>Hide files that are different</source>
-<target>Απόκρυψη των αρχείων που είναι διαφορετικά</target>
-
 <source>Show files that are different</source>
 <target>Εμφάνιση των αρχείων που είναι διαφορετικά</target>
 
-<source>Hide conflicts</source>
-<target>Απόκρυψη διενέξεων</target>
-
 <source>Show conflicts</source>
 <target>Εμφάνιση διενέξεων</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Απόκρυψη των αρχείων που θα δημιουργηθούν στα αριστερά</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Εμφάνιση των αρχείων που θα δημιουργηθούν στα αριστερά</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Απόκρυψη των αρχείων που θα δημιουργηθούν στα δεξιά</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Εμφάνιση των αρχείων που θα δημιουργηθούν στα δεξιά</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Απόκρυψη των αρχείων που θα διαγραφούν στα αριστερά</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Εμφάνιση των αρχείων που θα διαγραφούν στα αριστερά</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Απόκρυψη των αρχείων που θα διαγραφούν στα δεξιά</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Εμφάνιση των αρχείων που θα διαγραφούν στα δεξιά</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Απόκρυψη των αρχείων που θα αντικατασταθούν στα αριστερά</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Εμφάνιση των αρχείων που θα αντικατασταθούν στα αριστερά</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Απόκρυψη των αρχείων που θα αντικατασταθούν στα δεξιά</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Εμφάνιση των αρχείων που θα αντικατασταθούν στα αριστερά</target>
 
-<source>Hide files that won't be copied</source>
-<target>Απόκρυψη των αρχείων που δε θα αντιγραφούν</target>
-
 <source>Show files that won't be copied</source>
 <target>Εμφάνιση των αρχείων που δε θα αντιγραφούν</target>
 
 <source>Set as default</source>
-<target></target>
+<target>Ορισμός ως προεπιλογής</target>
 
 <source>All folders are in sync!</source>
 <target>Όλοι οι υποκατάλογοι είναι συγχρονισμένοι!</target>
@@ -972,6 +948,9 @@ Note: File names must be relative to base directories!
 <source>File list exported!</source>
 <target>Ο κατάλογος των αρχείων έχει εξαχθεί!</target>
 
+<source>Searching for program updates...</source>
+<target>Αναζήτηση καινούριας έκδοσης...</target>
+
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
@@ -1005,6 +984,9 @@ Note: File names must be relative to base directories!
 <source>&Ignore</source>
 <target>&Παράβλεψη</target>
 
+<source>Don't show this warning again</source>
+<target>Να μην εμφανιστεί ξανά αυτή η προειδοποίηση</target>
+
 <source>&Switch</source>
 <target>&Εναλλαγή</target>
 
@@ -1023,9 +1005,6 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>Σύγκριση του περιεχομένου...</target>
 
-<source>Copy</source>
-<target>Αντιγραφή</target>
-
 <source>Paused</source>
 <target>Σε παύση</target>
 
@@ -1081,10 +1060,10 @@ Note: File names must be relative to base directories!
 <target>Φίλτρο</target>
 
 <source>Direct</source>
-<target>Ως δεσμό</target>
+<target>Ως δεσμού</target>
 
 <source>Follow</source>
-<target>Ως περιεχόμενο</target>
+<target>Ως περιεχομένου</target>
 
 <source>Copy NTFS permissions</source>
 <target>Αντιγραφή αδειών προσπέλασης NTFS</target>
@@ -1108,26 +1087,29 @@ Note: File names must be relative to base directories!
 <target>Να επανεμφανιστούν τα κρυμμένα μηνύματα και προειδοποιήσεις;</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Είστε σίγουροι ότι θέλετε να μετακινήσετε το ακόλουθο αντικείμενο στον Κάδο Ανακύκλωσης;</pluralform>
-<pluralform>Είστε σίγουροι ότι θέλετε να μετακινήσετε τα ακόλουθα %x αντικείμενα στον Κάδο Ανακύκλωσης;</pluralform>
+<pluralform>Είσαι σίγουρος ότι θέλεις να μεταφερθεί το ακόλουθο αντικείμενο στον Κάδο Ανακύκλωσης;</pluralform>
+<pluralform>Είσαι σίγουρος ότι θέλεις να μεταφερθούν τα ακόλουθα %x αντικείμενα στον Κάδο Ανακύκλωσης;</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Είστε σίγουροι ότι θέλετε να διαγράψετε το ακόλουθο αντικείμενο;</pluralform>
-<pluralform>Είστε σίγουροι ότι θέλετε να διαγράψετε τα ακόλουθα %x αντικείμενα;</pluralform>
+<pluralform>Είσαι σίγουρος ότι θέλεις να διαγραφεί το ακόλουθο αντικείμενο;</pluralform>
+<pluralform>Είσαι σίγουρος ότι θέλεις να διαγραφούν τα ακόλουθα %x αντικείμενα;</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Παράβλεψη ως ανεπίλυτη διένεξη</target>
 
+<source>Time stamp</source>
+<target>Χρονική σήμανση</target>
+
 <source>Append a timestamp to each file name</source>
 <target>Προσάρτηση χρονικής σήμανσης σε κάθε όνομα αρχείου</target>
 
@@ -1251,6 +1233,12 @@ Note: File names must be relative to base directories!
 <source>Cannot set privilege %x.</source>
 <target>Τα δικαιώματα %x δεν μπορούν να οριστούν.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Απέτυχε η αναβολή της αναστολής λειτουργίας του υπολογιστή.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Δεν μπορούν να αλλάξουν οι προτεραιότητες I/O της διεργασίας.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Το αρχείο %x δεν ήταν δυνατό να μεταφερθεί στον Κάδο Ανακύκλωσης!</target>
 
@@ -1270,7 +1258,7 @@ Note: File names must be relative to base directories!
 <target>Ρύθμιση προεπιλεγμένης κατεύθυνσης συγχρονισμού: Τα νεότερα αρχεία θα αντικαταστήσουν τα παλιότερα.</target>
 
 <source>Checking recycle bin availability for folder %x...</source>
-<target></target>
+<target>Έλεγχος της διαθεσιμότητας του κάδου ανακύκλωσης για τον υποκατάλογο %x...</target>
 
 <source>Moving file %x to recycle bin</source>
 <target>Μεταφορά του αρχείου %x στον κάδο ανακύκλωσης</target>
@@ -1293,11 +1281,14 @@ Note: File names must be relative to base directories!
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Ο Κάδος Ανακύκλωσης δεν είναι διαθέσιμος για τις ακόλουθες διαδρομές! Τα αρχεία θα διαγραφούν μόνιμα:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Μπορείτε να αγνοήσετε αυτό το λάθος, για να θεωρήσετε ότι ο υποκατάλογος είναι κενός.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>Ο αντίστοιχος υποκατάλογος θα θεωρηθεί κενός.</target>
+
+<source>Cannot find the following folders:</source>
+<target>Οι ακόλουθοι υποκατάλογοι δεν ήταν δυνατό να βρεθούν:</target>
 
-<source>Cannot find folder %x.</source>
-<target>Ο υποκατάλογος %x δεν μπορεί να βρεθεί.</target>
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Μπορείτε να αγνοήσετε αυτό το σφάλμα, για να αντιμετωπίσετε κάθε υποκατάλογο ως κενό.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Οι υποκατάλογοι είναι εξαρτώμενοι. Προσοχή κατά την εισαγωγή των κανόνων συγχρονισμού:</target>
@@ -1305,8 +1296,8 @@ Note: File names must be relative to base directories!
 <source>Start comparison</source>
 <target>Έναρξη σύγκρισης</target>
 
-<source>Preparing synchronization...</source>
-<target>Προετοιμασία του συγχρονισμού...</target>
+<source>Calculating sync directions...</source>
+<target>Υπολογισμός των κατευθύνσεων συγχρονισμού...</target>
 
 <source>Conflict detected:</source>
 <target>Ανιχνεύθηκε διένεξη:</target>
@@ -1383,9 +1374,6 @@ Note: File names must be relative to base directories!
 <source>Removing old versions...</source>
 <target>Διαγραφή παλιών εκδόσεων...</target>
 
-<source>Creating file %x</source>
-<target>Δημιουργία του αρχείου %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Δημιουργία του συμβολικού δεσμού %x</target>
 
@@ -1404,6 +1392,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>Ενημέρωση των χαρακτηριστικών αρχείου του %x</target>
 
+<source>Cannot find %x.</source>
+<target>Το %x δεν μπορεί να βρεθεί.</target>
+
 <source>Target folder %x already existing.</source>
 <target>Ο υποκατάλογος-στόχος %x υπάρχει ήδη.</target>
 
@@ -1449,6 +1440,9 @@ Note: File names must be relative to base directories!
 <source>Generating database...</source>
 <target>Δημιουργία βάσης δεδομένων...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Δημιουργία Σκιώδους Αντίγραφου Τόμου για το %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Σφάλμα επικύρωσης δεδομένων: Τα αρχεία προέλευσης και προορισμού έχουν διαφορετικό περιεχόμενο!</target>
 
diff --git a/BUILD/Languages/hebrew.lng b/BUILD/Languages/hebrew.lng
index a7182126..89c5ab1c 100644
--- a/BUILD/Languages/hebrew.lng
+++ b/BUILD/Languages/hebrew.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>זמן כולל:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>לא ניתן לנעול מחיצה עבור %x.</target>
+
 <source>Show in Explorer</source>
 <target>הראה בסייר הקבצים</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>שגיאה</target>
 
+<source>Selected variant:</source>
+<target>גירסה שנבחרה:</target>
+
 <source>Select alternate comparison settings</source>
 <target>בחר הגדרות השוואה חליפיות</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>נקה בחירת מסנן</target>
 
+<source>Copy</source>
+<target>העתק</target>
+
+<source>Paste</source>
+<target>הדבק</target>
+
 <source>Save as batch job</source>
 <target>שמור כעבודת אצווה</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>שגיאה פטלית</target>
 
-<source>Windows Error Code %x:</source>
-<target>קוד שגיאת חלונות %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>קוד שגיאת לינוקס %x:</target>
+<source>Error Code %x:</source>
+<target>קוד שגיאה %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>לא יכול לפענח את הקישור הסימבולי %x.</target>
@@ -160,8 +169,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>ממתין כאשר  מחיצה נעולה (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>לא יכול להגדיר את נעילת מחיצה %x.</target>
+<source>Creating file %x</source>
+<target>יוצר קובץ %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -193,9 +202,6 @@
 <source>/sec</source>
 <target>/שנ</target>
 
-<source>Cannot find file %x.</source>
-<target>לא יכול למצוא קובץ %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>קובץ %x אינו כולל תצורה תקינה.</target>
 
@@ -220,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>לא יכול לקרוא את שמות צמתי XML:</target>
 
+<source>Cannot find file %x.</source>
+<target>לא יכול למצוא קובץ %x.</target>
+
 <source>&Open...</source>
 <target>&פתח...</target>
 
@@ -453,24 +462,21 @@ The command is triggered if:
 <source>&Advanced</source>
 <target>&מתקדם</target>
 
-<source>&Check for new version</source>
-<target>&בדוק לגירסא חדשה</target>
+<source>&Check now</source>
+<target>&בדוק עכשיו</target>
 
-<source>Compare</source>
-<target>השוואה</target>
+<source>Check &automatically once a week</source>
+<target>בדוק &אוטומטית אחת לשבוע</target>
 
-<source>Compare both sides</source>
-<target>השווה בין שני הצדדים</target>
+<source>Check for new version</source>
+<target>בדוק האם קיימת גירסה חדשה</target>
 
-<source>&Abort</source>
-<target>&נטוש</target>
+<source>Compare</source>
+<target>השוואה</target>
 
 <source>Synchronize</source>
 <target>סנכרן</target>
 
-<source>Start synchronization</source>
-<target>התחל סנכרון</target>
-
 <source>Add folder pair</source>
 <target>הוסף זוג מחיצות</target>
 
@@ -480,15 +486,6 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>החלף צדדים</target>
 
-<source>Open</source>
-<target>פתח</target>
-
-<source>Save</source>
-<target>שמור</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>תצורות אחרונות שהיו בשמוש (לחץ DEL להסרה מהרשימה)</target>
-
 <source>Hide excluded items</source>
 <target>הסתר פריטים שלט נכללו</target>
 
@@ -519,6 +516,18 @@ The command is triggered if:
 <source>Time elapsed:</source>
 <target>זמן שעבר:</target>
 
+<source>Synchronizing...</source>
+<target>מסנכרן...</target>
+
+<source>On completion</source>
+<target>לאחר סיום:</target>
+
+<source>Close</source>
+<target>סגור</target>
+
+<source>&Pause</source>
+<target>&עצור</target>
+
 <source>Batch job</source>
 <target>עבודת אצווה</target>
 
@@ -549,9 +558,6 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>הפסק פעולת סינכרון בשגיאה ראשונה</target>
 
-<source>On completion</source>
-<target>לאחר סיום:</target>
-
 <source>Show progress dialog</source>
 <target>הראה שיח התקדמות</target>
 
@@ -609,8 +615,8 @@ is the same
 <source><- Two way -></source>
 <target>- דו כווני -</target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>זהה והפץ שינויים בשני הצדדים באמצעות שימוש במסד נתונים. מחיקות, שינויי שמות וסתירות מתגלים באופן אוטומטי.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>זהה והפץ שינויים בשני הצדדים. מחיקות העברות וסתירות מתגלים באופן אוטומטי באמצעות מסד נתונים.</target>
 
 <source>Mirror ->></source>
 <target>מראה ->></target>
@@ -648,15 +654,12 @@ is the same
 <source>Versioning</source>
 <target>עדכון גרסאות</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>העבר קבצים עם חתימת זמן לתיקיה מיוחדת</target>
+<source>Move files to user-defined folder</source>
+<target>העבר קבצים למחיצה שהוגדרה ע"י המשתמש</target>
 
 <source>Naming convention:</source>
 <target>מוסכמות לקביעת שמות:</target>
 
-<source>Configuration</source>
-<target>תצורה</target>
-
 <source>Item exists on left side only</source>
 <target>הפריט קיים בצד ימין בלבד</target>
 
@@ -675,12 +678,6 @@ is the same
 <source>Conflict/item cannot be categorized</source>
 <target>סתירה/פריט אינו ניתן לסיווג</target>
 
-<source>Synchronizing...</source>
-<target>מסנכרן...</target>
-
-<source>&Pause</source>
-<target>&עצור</target>
-
 <source>Source code written in C++ using:</source>
 <target>קוד מקור נכתב ב- C++ באמצעות:</target>
 
@@ -741,8 +738,8 @@ Note: File names must be relative to base directories!
 <source>Maximum</source>
 <target>מקסימום</target>
 
-<source>&Default</source>
-<target>&ברירת מחדל</target>
+<source>&Clear</source>
+<target>&נקה</target>
 
 <source>Fail-safe file copy</source>
 <target>כשלון באבטחת העתקת קובץ</target>
@@ -771,6 +768,12 @@ Note: File names must be relative to base directories!
 <source>Description</source>
 <target>תאור</target>
 
+<source>&Default</source>
+<target>&ברירת מחדל</target>
+
+<source>Start synchronization</source>
+<target>התחל סנכרון</target>
+
 <source>Variant</source>
 <target>משתנה</target>
 
@@ -801,12 +804,24 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>מבט כללי</target>
 
+<source>Configuration</source>
+<target>תצורה</target>
+
 <source>Filter files</source>
 <target>קבצי המסנן</target>
 
 <source>Select view</source>
 <target>בחר תצוגה</target>
 
+<source>Open...</source>
+<target>פתח...</target>
+
+<source>Save</source>
+<target>שמור</target>
+
+<source>Compare both sides</source>
+<target>השווה בין שני הצדדים</target>
+
 <source>Set direction:</source>
 <target>בחר כוון:</target>
 
@@ -864,102 +879,63 @@ Note: File names must be relative to base directories!
 <source>FreeFileSync batch</source>
 <target>אצוות FreeFileSync</target>
 
-<source>Never save changes</source>
-<target>אל תשמור שינויים לעולם</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>האם לשמור שינויים אל %x?</target>
 
 <source>Do&n't save</source>
 <target>אל &תשמור</target>
 
+<source>Never save changes</source>
+<target>אל תשמור שינויים לעולם</target>
+
 <source>Configuration loaded!</source>
 <target>תצורה הוטענה!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>הסתר קבצים הקימים אך ורק בצד ימין</target>
-
 <source>Show files that exist on left side only</source>
 <target>הראה קבצים הנמצאים אך ורק בצד ימין</target>
 
-<source>Hide files that exist on right side only</source>
-<target>הסתר קבצים הקימים אך ורק בצד שמאל</target>
-
 <source>Show files that exist on right side only</source>
 <target>הראה קבצים הנמצאים אך ורק בצד שמאל</target>
 
-<source>Hide files that are newer on left</source>
-<target>הסתר קבצים חדשים יותר בצד ימין</target>
-
 <source>Show files that are newer on left</source>
 <target>הראה קבצים חדשים יותר בצד ימין</target>
 
-<source>Hide files that are newer on right</source>
-<target>הסתר קבצים חדשים יותר בצד שמאל</target>
-
 <source>Show files that are newer on right</source>
 <target>הראה קבצים חדשים יותר בצד שמאל</target>
 
-<source>Hide files that are equal</source>
-<target>הסתר קבצים שאינם שווים</target>
-
 <source>Show files that are equal</source>
 <target>הראה קבצים שווים</target>
 
-<source>Hide files that are different</source>
-<target>הסתר קבצים שונים</target>
-
 <source>Show files that are different</source>
 <target>הראה קבצים שונים</target>
 
-<source>Hide conflicts</source>
-<target>הסתר קונפליקטים</target>
-
 <source>Show conflicts</source>
 <target>הראה קונפליקטים</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>הסתר קבצים שייוצרו בצד ימין</target>
-
 <source>Show files that will be created on the left side</source>
 <target>הראה קבצים שיווצרו בצד ימין</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>הסתר קבצים שייוצרו בצד שמאל</target>
-
 <source>Show files that will be created on the right side</source>
 <target>הראה קבצים שיווצרו בצד שמאל</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>הסתר קבצים שימחקו בצד ימין</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>הראה קבצים שימחקו בצד ימין</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>הסתר קבצים שימחקו בצד שמאל</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>הראה קבצים שימחקו בצד שמאל</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>הסתר קבצים שידרסו בצד ימין</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>הראה קבצים שידרסו בצד ימין</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>הסתר קבצים שידרסו בצד שמאל</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>הראה קבצים שידרסו בצד שמאל</target>
 
-<source>Hide files that won't be copied</source>
-<target>הסתר קבצים אשר לא יועתקו</target>
-
 <source>Show files that won't be copied</source>
 <target>הראה קבצים שלא יועתקו</target>
 
+<source>Set as default</source>
+<target>הגדר כברירת מחדל</target>
+
 <source>All folders are in sync!</source>
 <target>כל התיקיות מסונכרנות</target>
 
@@ -972,14 +948,8 @@ Note: File names must be relative to base directories!
 <source>File list exported!</source>
 <target>רשימת קבצים יוצאה!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>העצם נמחק בהצלחה!</pluralform>
-<pluralform>%x עצמים נמחקו בהצלחה!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>מחפש עידכוני תוכנה...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1014,6 +984,9 @@ Note: File names must be relative to base directories!
 <source>&Ignore</source>
 <target>&התעלם</target>
 
+<source>Don't show this warning again</source>
+<target>אל תראה אזהרה זו שוב</target>
+
 <source>&Switch</source>
 <target>&החלפה</target>
 
@@ -1032,9 +1005,6 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>משווה תכולה...</target>
 
-<source>Copy</source>
-<target>העתק</target>
-
 <source>Paused</source>
 <target>עצור</target>
 
@@ -1111,41 +1081,44 @@ Note: File names must be relative to base directories!
 <target>- הצד השני מקביל ל %item_path%</target>
 
 <source>- Other side's counterpart to %item_folder%</source>
-<target>הצד השני מקביל ל %item_folder%</target>
+<target>הצד השני המקביל ל %item_folder%</target>
 
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>להפוך דיאלוגים מוסתרים ואזהרות לגלויים שוב?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>האם להעביר את העצם הבא לסל המיחזור?</pluralform>
-<pluralform>האם להעביר את %x העצמים הבאים לסל המיחזור?</pluralform>
+<pluralform>האם ברצונך להעביר את הפריט הבא לסל המיחזור?</pluralform>
+<pluralform>האם ברצונך להעביר את הפריטים %x הבאים לסל המיחזור?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>האם למחוק את העצם הבא?</pluralform>
-<pluralform>האם למחוק את %x העצמים הבאים?</pluralform>
+<pluralform>האם ברצונך למחוק את הפריט הבא?</pluralform>
+<pluralform>האם ברצונך למחוק את הפריטים %x הבאים?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>השאר כקונפליקט לא מטופל</target>
 
+<source>Time stamp</source>
+<target>תג זמן</target>
+
+<source>Append a timestamp to each file name</source>
+<target>הצמד תג זמן לכל שם קובץ</target>
+
 <source>Replace</source>
 <target>החלף</target>
 
 <source>Move files and replace if existing</source>
 <target>העבר קבצים והחלף במדה וקיימים</target>
 
-<source>Append a timestamp to each file name</source>
-<target>הצמד תג זמן לכל שם קובץ</target>
-
 <source>Folder</source>
 <target>תיקייה</target>
 
@@ -1260,6 +1233,12 @@ Note: File names must be relative to base directories!
 <source>Cannot set privilege %x.</source>
 <target>לא יכול להגדיר זבות %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>נכשל נסיון להשעות מצב שינה של המערכת.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>לא יכול לשנות קדימויות של תהליך קלט פלט.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>לא יכול להעביר את %x לסל המיחזור!</target>
 
@@ -1278,14 +1257,38 @@ Note: File names must be relative to base directories!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>בחר ברירת מחדל של סנכרון: קבצים ישנים ידרסו ע"י קבצים חדשים יותר.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>בודק זמינות סל מחזור עבור מחיצה %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>מעביר קובץ %x לסל מחזור</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>מעביר מחיצה %x לסל מחזור</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>מעביר קישור סימבולי %x לסל מחזור</target>
+
+<source>Deleting file %x</source>
+<target>מוחק קובץ %x</target>
+
+<source>Deleting folder %x</source>
+<target>מוחק מחיצה %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>מוחק קישור סימבולי %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>סל מחזור אינו זמין עבור הנתיבים הבאים! קבצים ימחקו לצמיתות:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>ניתן להתעלם משגיאה זו ולהחשיב התיקייה כריקה.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>המחיצה המתאימה תחשב כריקה.</target>
+
+<source>Cannot find the following folders:</source>
+<target>לא יכול למצוא את המחיצות הבאות:</target>
 
-<source>Cannot find folder %x.</source>
-<target>לא מוצא תיקייה %x.</target>
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>אפשר להתעלם משגיאה זו ולהחשיב כל מחיצה כריקה.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>מחיצות תלויות! זהירות בהגדרת כללי סנכרון:</target>
@@ -1293,8 +1296,8 @@ Note: File names must be relative to base directories!
 <source>Start comparison</source>
 <target>התחל השוואה</target>
 
-<source>Preparing synchronization...</source>
-<target>מכין סינכרון...</target>
+<source>Calculating sync directions...</source>
+<target>מחשב כיווני סנכרון...</target>
 
 <source>Conflict detected:</source>
 <target>התגלה קונפליקט:</target>
@@ -1359,24 +1362,6 @@ Note: File names must be relative to base directories!
 <source>Multiple...</source>
 <target>הכפל...</target>
 
-<source>Deleting file %x</source>
-<target>מוחק קובץ %x</target>
-
-<source>Deleting folder %x</source>
-<target>מוחק מחיצה %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>מוחק קישור סימבולי %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>מעביר קטבץ %x לסל מחזור</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>מעביר מחיצה %x לסל מחזור</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>מעביר קישור סימבולי %x לסל מחזור</target>
-
 <source>Moving file %x to %y</source>
 <target>מעביר קובץ %x אל %y</target>
 
@@ -1389,9 +1374,6 @@ Note: File names must be relative to base directories!
 <source>Removing old versions...</source>
 <target>מסיר גרסאות ישנות...</target>
 
-<source>Creating file %x</source>
-<target>יוצר קובץ %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>יוצר קישור סימבולי %x</target>
 
@@ -1410,6 +1392,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>מעדכן תכונות של %x</target>
 
+<source>Cannot find %x.</source>
+<target>לא מוצא %x.</target>
+
 <source>Target folder %x already existing.</source>
 <target>תיקיית מטרה %x כבר קיימת.</target>
 
@@ -1455,6 +1440,9 @@ Note: File names must be relative to base directories!
 <source>Generating database...</source>
 <target>מייצר מסד נתונים...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>יוצר העתק  volume shadow עבור %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>שגיאה של אימות נתונים קובץ מקור ומטרה בעלי תכולת נתונים שונה!</target>
 
diff --git a/BUILD/Languages/hungarian.lng b/BUILD/Languages/hungarian.lng
index 385eaec3..58600506 100644
--- a/BUILD/Languages/hungarian.lng
+++ b/BUILD/Languages/hungarian.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Becsült idő:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>A következő mappa zárolása sikertelen: %x.</target>
+
 <source>Show in Explorer</source>
 <target>Mutatás az Intézőben</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Hiba</target>
 
+<source>Selected variant:</source>
+<target>Változat kiválasztása:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Alternatív összehasonlítás beállításai</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Szűrőbeállítások törlése</target>
 
+<source>Copy</source>
+<target>Másolás</target>
+
+<source>Paste</source>
+<target>Beillesztés</target>
+
 <source>Save as batch job</source>
 <target>Mentés kötegelt feladatként</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Kritikus hiba</target>
 
-<source>Windows Error Code %x:</source>
-<target>Windows hibakód %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux hibakód %x:</target>
+<source>Error Code %x:</source>
+<target>Hibakód %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Sikertelen a következő symlink feloldása: %x.</target>
@@ -160,8 +169,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Várakozás a mappa zárolásának a feloldására (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>A következő mappa zárolása sikertelen: %x.</target>
+<source>Creating file %x</source>
+<target>%x fájl létrehozása</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -193,9 +202,6 @@
 <source>/sec</source>
 <target>/másodperc</target>
 
-<source>Cannot find file %x.</source>
-<target>Nem található a következő fájl: %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>A következő fájl nem tartalmaz érvényes beállításokat: %x.</target>
 
@@ -220,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>A következő XML elemek olvasása sikertelen:</target>
 
+<source>Cannot find file %x.</source>
+<target>Nem található a következő fájl: %x.</target>
+
 <source>&Open...</source>
 <target>&Megnyitás...</target>
 
@@ -453,24 +462,21 @@ A parancs végrehajtódik, ha:
 <source>&Advanced</source>
 <target>&Haladó</target>
 
-<source>&Check for new version</source>
-<target>&Új verzió keresése</target>
+<source>&Check now</source>
+<target>&Ellenőrzés most</target>
 
-<source>Compare</source>
-<target>Összehasonlítás</target>
+<source>Check &automatically once a week</source>
+<target>&Automatikus ellenőrzés hetente</target>
 
-<source>Compare both sides</source>
-<target>Mindkét oldal összehasonlítása</target>
+<source>Check for new version</source>
+<target>Új verzió keresése</target>
 
-<source>&Abort</source>
-<target>&Megszakít</target>
+<source>Compare</source>
+<target>Összehasonlítás</target>
 
 <source>Synchronize</source>
 <target>Szinkronizálás</target>
 
-<source>Start synchronization</source>
-<target>Szinkronizáció indítása</target>
-
 <source>Add folder pair</source>
 <target>Mappa pár megadása</target>
 
@@ -480,15 +486,6 @@ A parancs végrehajtódik, ha:
 <source>Swap sides</source>
 <target>Oldalak felcserélése</target>
 
-<source>Open</source>
-<target>Megnyitás</target>
-
-<source>Save</source>
-<target>Mentés</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Utoljára használt beállítások (DEL billentyűvel törölhető a listából)</target>
-
 <source>Hide excluded items</source>
 <target>Kizárt elemek elrejtése</target>
 
@@ -519,6 +516,18 @@ A parancs végrehajtódik, ha:
 <source>Time elapsed:</source>
 <target>Eltelt idő:</target>
 
+<source>Synchronizing...</source>
+<target>Szinkronizálás folyamatban...</target>
+
+<source>On completion</source>
+<target>Befejezés esetén</target>
+
+<source>Close</source>
+<target>Bezárás</target>
+
+<source>&Pause</source>
+<target>&Szünet</target>
+
 <source>Batch job</source>
 <target>Kötegelt feladat</target>
 
@@ -549,9 +558,6 @@ A parancs végrehajtódik, ha:
 <source>Abort synchronization on first error</source>
 <target>Szinkronizáció leállítása az első hibánál</target>
 
-<source>On completion</source>
-<target>Befejezés esetén</target>
-
 <source>Show progress dialog</source>
 <target>Folyamatjelző párbeszédablak mutatása</target>
 
@@ -607,8 +613,8 @@ A fájlok megegyeznek, ha megegyezik
 <source><- Two way -></source>
 <target><- Kétirányú -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Változások azonosítása és végrehajtása mindkét oldalon adatbázis segítségével. Automatikusan felismerődnek a törlések, átnevezések és ütközések.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Változások keresése mindkét oldalon. A törlések, mozgatások és ütközések automatikus felismerése adatbázis segítségével.</target>
 
 <source>Mirror ->></source>
 <target>Tükrözés ->></target>
@@ -646,15 +652,12 @@ A fájlok megegyeznek, ha megegyezik
 <source>Versioning</source>
 <target>Verziókövetés</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Időbélyeges fájlok mozgatása a megadott mappába</target>
+<source>Move files to user-defined folder</source>
+<target>Fájlok mozgatása előre megadott mappába</target>
 
 <source>Naming convention:</source>
 <target>Elnevezési konvenció:</target>
 
-<source>Configuration</source>
-<target>Beállítás</target>
-
 <source>Item exists on left side only</source>
 <target>Az elem csak a bal oldalon létezik</target>
 
@@ -673,12 +676,6 @@ A fájlok megegyeznek, ha megegyezik
 <source>Conflict/item cannot be categorized</source>
 <target>Az ütközés vagy elem nem kategorizálható</target>
 
-<source>Synchronizing...</source>
-<target>Szinkronizálás folyamatban...</target>
-
-<source>&Pause</source>
-<target>&Szünet</target>
-
 <source>Source code written in C++ using:</source>
 <target>A programot C++-ban fejlesztették a következők felhasználásával:</target>
 
@@ -739,8 +736,8 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Maximum</source>
 <target>Maximum</target>
 
-<source>&Default</source>
-<target>&Alapértelmezett</target>
+<source>&Clear</source>
+<target>&Törlés</target>
 
 <source>Fail-safe file copy</source>
 <target>Hibamentes fájlmásolás</target>
@@ -769,6 +766,12 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Description</source>
 <target>Megjegyzés</target>
 
+<source>&Default</source>
+<target>&Alapértelmezett</target>
+
+<source>Start synchronization</source>
+<target>Szinkronizáció indítása</target>
+
 <source>Variant</source>
 <target>Variáns</target>
 
@@ -799,12 +802,24 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Overview</source>
 <target>Összefoglaló</target>
 
+<source>Configuration</source>
+<target>Beállítás</target>
+
 <source>Filter files</source>
 <target>Fájlok szűrése</target>
 
 <source>Select view</source>
 <target>Nézet kiválasztása</target>
 
+<source>Open...</source>
+<target>Megnyitás...</target>
+
+<source>Save</source>
+<target>Mentés</target>
+
+<source>Compare both sides</source>
+<target>Mindkét oldal összehasonlítása</target>
+
 <source>Set direction:</source>
 <target>Irány</target>
 
@@ -862,104 +877,62 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>FreeFileSync batch</source>
 <target>FreeFileSync kötegelt fájl</target>
 
-<source>Never save changes</source>
-<target>Változtatások figyelmen kívül hagyása</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Akarod menteni a %x változtatásait?</target>
 
 <source>Do&n't save</source>
 <target>Ne mentsd</target>
 
+<source>Never save changes</source>
+<target>Változtatások figyelmen kívül hagyása</target>
+
 <source>Configuration loaded!</source>
 <target>Beállítások betöltve!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Csak a bal oldalon létező fájlok elrejtése</target>
-
 <source>Show files that exist on left side only</source>
 <target>Csak a bal oldalon létező fájlok mutatása</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Csak a jobb oldalon létező fájlok elrejtése</target>
-
 <source>Show files that exist on right side only</source>
 <target>Csak a jobb oldalon létező fájlok mutatása</target>
 
-<source>Hide files that are newer on left</source>
-<target>A bal oldalon lévő újabb fájlok elrejtése</target>
-
 <source>Show files that are newer on left</source>
 <target>A bal oldali újabb fájlok mutatása</target>
 
-<source>Hide files that are newer on right</source>
-<target>A jobb oldalon lévő újabb fájlok elrejtése</target>
-
 <source>Show files that are newer on right</source>
 <target>A jobb oldali újabb fájlok mutatása</target>
 
-<source>Hide files that are equal</source>
-<target>Az egyező fájlok elrejtése</target>
-
 <source>Show files that are equal</source>
 <target>Egyező fájlok mutatása</target>
 
-<source>Hide files that are different</source>
-<target>A nem egyező fájlok elrejtése</target>
-
 <source>Show files that are different</source>
 <target>Eltérő fájlok mutatása</target>
 
-<source>Hide conflicts</source>
-<target>Ütközések elrejtése</target>
-
 <source>Show conflicts</source>
 <target>Ütközések mutatása</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>A bal oldalon létrehozandó fájlok elrejtése.</target>
-
 <source>Show files that will be created on the left side</source>
 <target>A bal oldalon létrehozandó fájlok mutatása</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>A jobb oldalon létrehozandó fájlok elrejtése.</target>
-
 <source>Show files that will be created on the right side</source>
 <target>A jobb oldalon létrehozandó fájlok mutatása</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>A bal oldalon törlendő fájlok elrejtése.</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>A bal oldalon törlendő fájlok mutatása</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>A jobb oldalon törlendő fájlok elrejtése.</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>A jobb oldalon törlendő fájlok mutatása</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>A bal oldalon felülírandó fájlok elrejtése</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>A bal oldalon felülírandó fájlok mutatása</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>A jobb oldalon felülírandó fájlok elrejtése</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>A jobb oldalon felülírandó fájlok mutatása</target>
 
-<source>Hide files that won't be copied</source>
-<target>A nem másolandó fájlok elrejtése</target>
-
 <source>Show files that won't be copied</source>
 <target>A nem másolandó fájlok mutatása</target>
 
 <source>Set as default</source>
-<target></target>
+<target>Beállítás alapértelmezettként</target>
 
 <source>All folders are in sync!</source>
 <target>Minden mappa szinkronban!</target>
@@ -973,6 +946,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>File list exported!</source>
 <target>A fájllista exportálása befejeződött!</target>
 
+<source>Searching for program updates...</source>
+<target>Szoftverfrissítés keresése...</target>
+
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
@@ -1006,6 +982,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>&Ignore</source>
 <target>&Kihagy</target>
 
+<source>Don't show this warning again</source>
+<target>Figyelmeztetés elrejtése legközelebb</target>
+
 <source>&Switch</source>
 <target>&Váltás</target>
 
@@ -1024,9 +1003,6 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Comparing content...</source>
 <target>Tartalom összehasonlítása...</target>
 
-<source>Copy</source>
-<target>Másolás</target>
-
 <source>Paused</source>
 <target>Szüneteltetve</target>
 
@@ -1109,26 +1085,29 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <target>Tegyük újra láthatóvá a rejtett figyelmeztetéseket és párbeszédablakokat?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Valóban a Lomtárba (Recycle Bin) akarod mozgatni a következő objektumot?</pluralform>
-<pluralform>Valóban a Lomtárba (Recycle Bin) akarod mozgatni a következő %x objektumot?</pluralform>
+<pluralform>Valóban a Lomtárba akarod mozgatni a következő elemet?</pluralform>
+<pluralform>Valóban a Lomtárba akarod mozgatni a következő %x elemet?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Valóban törölni akarod a következő objektumot?</pluralform>
-<pluralform>Valóban törölni akarod a következő %x objektumot?</pluralform>
+<pluralform>Valóban törölni akarod a következő elemet?</pluralform>
+<pluralform>Valóban törölni akarod a következő %x elemet?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Feloldatlan ütközésként hagyni</target>
 
+<source>Time stamp</source>
+<target>Időbélyeg</target>
+
 <source>Append a timestamp to each file name</source>
 <target>Időbélyeg hozzáadása a minden fájlnévhez</target>
 
@@ -1150,6 +1129,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Files</source>
 <target>Fájlok</target>
 
+<source>Items</source>
+<target></target>
+
 <source>Percentage</source>
 <target>Százalék</target>
 
@@ -1252,6 +1234,12 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Cannot set privilege %x.</source>
 <target>A következő privilégium beállítása sikertelen: %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>A rendszer alvó üzemmódjának felfüggesztése sikertelen.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>A feladat I/O priorításainak megváltoztatása sikertelen!</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>%x Lomtárba helyezése sikertelen!</target>
 
@@ -1271,7 +1259,7 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <target>Alapértelmezett szinkronizációs irányok beállítása: a régebbi fájlok felülíródnak az újabbakkal.</target>
 
 <source>Checking recycle bin availability for folder %x...</source>
-<target></target>
+<target>A következő mappa meglétének ellenőrzése a Lomtárban: %x.</target>
 
 <source>Moving file %x to recycle bin</source>
 <target>%x fájl mozgatása a Lomtárba (Recycle Bin)</target>
@@ -1294,11 +1282,14 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>A Lomtár (Recycle Bin) nem elérhető a következő útvonalakhoz! A fájlok azonnali törlésre kerülnek helyette:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Figyelmen kívül hagyhatod ezt a hibát ezzel üresnek tekintve a mappát.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>A megfelelő mappa üresként lesz kezelve.</target>
 
-<source>Cannot find folder %x.</source>
-<target>Nem található a következő mappa: %x.</target>
+<source>Cannot find the following folders:</source>
+<target>A következő mappák nem találhatóak:</target>
+
+<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target></target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>A mappák függenek egymástól! Legyen óvatos, amikor megadja a szinkronizálási szabályokat:</target>
@@ -1306,8 +1297,8 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Start comparison</source>
 <target>Összehasonlítás megkezdése</target>
 
-<source>Preparing synchronization...</source>
-<target>Szinkronizálás előkészítése...</target>
+<source>Calculating sync directions...</source>
+<target>Szinkronizációs irányok számítása...</target>
 
 <source>Conflict detected:</source>
 <target>Ütközés történt:</target>
@@ -1384,9 +1375,6 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Removing old versions...</source>
 <target>Régi verziók eltávolítása...</target>
 
-<source>Creating file %x</source>
-<target>%x fájl létrehozása</target>
-
 <source>Creating symbolic link %x</source>
 <target>%x symlink létrehozása</target>
 
@@ -1405,6 +1393,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Updating attributes of %x</source>
 <target>A(z) %x attribútumainak frissítése</target>
 
+<source>Cannot find %x.</source>
+<target>A(z) %x nem található.</target>
+
 <source>Target folder %x already existing.</source>
 <target>A következő célmappa már létezik: %x.</target>
 
@@ -1450,6 +1441,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Generating database...</source>
 <target>Adatbázis generálása...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Volume Shadow Copy létrehozása %x számára...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Adatellenőrzési hiba: A forrás és cél fájl tartalma különbözik!</target>
 
diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng
index 14eeaf79..0bd4d263 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Tempo totale:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Impossibile impostare blocco cartella per %x.</target>
+
 <source>Show in Explorer</source>
 <target>Mostra in Esplora Risorse</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Errore</target>
 
+<source>Selected variant:</source>
+<target>Variante selezionata:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Seleziona impostazioni di comparazione alternative</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Azzera impostazioni filtro</target>
 
+<source>Copy</source>
+<target>Copia</target>
+
+<source>Paste</source>
+<target>Incolla</target>
+
 <source>Save as batch job</source>
 <target>Salva come processo batch</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Errore fatale</target>
 
-<source>Windows Error Code %x:</source>
-<target>Windows - Errore codice %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux - Errore codice %x:</target>
+<source>Error Code %x:</source>
+<target>Errore Codice %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Impossibile risolvere collegamento %x.</target>
@@ -160,8 +169,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Attendi mentre la cartella è bloccata (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Impossibile impostare il blocco cartella %x.</target>
+<source>Creating file %x</source>
+<target>Creazione file %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -193,9 +202,6 @@
 <source>/sec</source>
 <target>/sec</target>
 
-<source>Cannot find file %x.</source>
-<target>Impossibile trovare il file %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Il file %x non contiene una configurazione valida.</target>
 
@@ -220,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Impossibile leggere i seguenti elementi XML:</target>
 
+<source>Cannot find file %x.</source>
+<target>Impossibile trovare il file %x.</target>
+
 <source>&Open...</source>
 <target>&Apri...</target>
 
@@ -453,24 +462,21 @@ Il comando è attivato se:
 <source>&Advanced</source>
 <target>&Avanzate</target>
 
-<source>&Check for new version</source>
-<target>&Controlla la presenza di nuove versioni</target>
+<source>&Check now</source>
+<target>&Controlla ora</target>
 
-<source>Compare</source>
-<target>Compara</target>
+<source>Check &automatically once a week</source>
+<target>Controlla &automaticamente una volta a settimana</target>
 
-<source>Compare both sides</source>
-<target>Compara le due liste</target>
+<source>Check for new version</source>
+<target>Controlla presenza di nuove versioni</target>
 
-<source>&Abort</source>
-<target>&Abbandona</target>
+<source>Compare</source>
+<target>Compara</target>
 
 <source>Synchronize</source>
 <target>Sincronizza</target>
 
-<source>Start synchronization</source>
-<target>Avvia sincronizzazione</target>
-
 <source>Add folder pair</source>
 <target>Aggiungi una coppia di cartelle</target>
 
@@ -480,15 +486,6 @@ Il comando è attivato se:
 <source>Swap sides</source>
 <target>Inverti i lati</target>
 
-<source>Open</source>
-<target>Apri</target>
-
-<source>Save</source>
-<target>Salva</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Ultima configurazione utilizzata (premi CANC per rimuovere dall'elenco)</target>
-
 <source>Hide excluded items</source>
 <target>Nascondi oggetti esclusi</target>
 
@@ -519,6 +516,18 @@ Il comando è attivato se:
 <source>Time elapsed:</source>
 <target>Tempo trascorso:</target>
 
+<source>Synchronizing...</source>
+<target>Sincronizzazione...</target>
+
+<source>On completion</source>
+<target>In completamento</target>
+
+<source>Close</source>
+<target>Chiudi</target>
+
+<source>&Pause</source>
+<target>&Pausa</target>
+
 <source>Batch job</source>
 <target>Attività batch</target>
 
@@ -547,10 +556,7 @@ Il comando è attivato se:
 <target>Esci</target>
 
 <source>Abort synchronization on first error</source>
-<target>Abortisci sincronizzazione al primo errore</target>
-
-<source>On completion</source>
-<target>In completamento</target>
+<target>Interrompi sincronizzazione al primo errore</target>
 
 <source>Show progress dialog</source>
 <target>Mostra stato di avanzamento</target>
@@ -609,8 +615,8 @@ I file sono considerati identici se
 <source><- Two way -></source>
 <target><- Due vie -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identifica e propaga modifiche su entrambi i lati usando un database. Cancellazioni, ridenominazioni e conflitti sono rilevati automaticamente.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Identifica e propaga cambiamenti su entrambi i lati. Cancellazioni, spostamenti e conflitti sono identificati automaticamente usando un database.</target>
 
 <source>Mirror ->></source>
 <target>Mirror ->></target>
@@ -648,15 +654,12 @@ I file sono considerati identici se
 <source>Versioning</source>
 <target>Versione</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Sposta file con indicazione datata nella cartella specifica</target>
+<source>Move files to user-defined folder</source>
+<target>Sposta file in cartella personalizzata</target>
 
 <source>Naming convention:</source>
 <target>Modalità di rinomina:</target>
 
-<source>Configuration</source>
-<target>Configurazione</target>
-
 <source>Item exists on left side only</source>
 <target>L'elemento esiste solo sul lato sinistro</target>
 
@@ -675,12 +678,6 @@ I file sono considerati identici se
 <source>Conflict/item cannot be categorized</source>
 <target>Conflitto/elemento non categorizzabile</target>
 
-<source>Synchronizing...</source>
-<target>Sincronizzazione...</target>
-
-<source>&Pause</source>
-<target>&Pausa</target>
-
 <source>Source code written in C++ using:</source>
 <target>Codice sorgente scritto in C++ utilizzando:</target>
 
@@ -741,8 +738,8 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Maximum</source>
 <target>Massimo</target>
 
-<source>&Default</source>
-<target>&Predefinito</target>
+<source>&Clear</source>
+<target>&Pulisci</target>
 
 <source>Fail-safe file copy</source>
 <target>Copia file sicura</target>
@@ -771,6 +768,12 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Description</source>
 <target>Descrizione</target>
 
+<source>&Default</source>
+<target>&Predefinito</target>
+
+<source>Start synchronization</source>
+<target>Avvia sincronizzazione</target>
+
 <source>Variant</source>
 <target>Variante</target>
 
@@ -801,12 +804,24 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Overview</source>
 <target>Anteprima</target>
 
+<source>Configuration</source>
+<target>Configurazione</target>
+
 <source>Filter files</source>
 <target>Filtro dei file</target>
 
 <source>Select view</source>
 <target>Seleziona vista</target>
 
+<source>Open...</source>
+<target>Apri...</target>
+
+<source>Save</source>
+<target>Salva</target>
+
+<source>Compare both sides</source>
+<target>Compara le due liste</target>
+
 <source>Set direction:</source>
 <target>Imposta direzione:</target>
 
@@ -864,102 +879,63 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync batch</target>
 
-<source>Never save changes</source>
-<target>Non salvare mai le modifiche</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Vuoi salvare le modifiche a %x?</target>
 
 <source>Do&n't save</source>
 <target>No&n salvare</target>
 
+<source>Never save changes</source>
+<target>Non salvare mai le modifiche</target>
+
 <source>Configuration loaded!</source>
 <target>Configurazione caricata!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Nascondi i file esistenti solo a sinistra</target>
-
 <source>Show files that exist on left side only</source>
 <target>Mostra file esistenti solo a sinistra</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Nascondi i file esistenti solo a destra</target>
-
 <source>Show files that exist on right side only</source>
 <target>Mostra file esistenti solo a destra</target>
 
-<source>Hide files that are newer on left</source>
-<target>Nascondi i file più recenti a sinistra</target>
-
 <source>Show files that are newer on left</source>
 <target>Mostra file di sinistra più recenti che a destra</target>
 
-<source>Hide files that are newer on right</source>
-<target>Nascondi i file più recenti a destra</target>
-
 <source>Show files that are newer on right</source>
 <target>Mostra file di destra più recenti che a sinistra</target>
 
-<source>Hide files that are equal</source>
-<target>Nascondi i file identici</target>
-
 <source>Show files that are equal</source>
 <target>Mostra file identici</target>
 
-<source>Hide files that are different</source>
-<target>Nascondi i file differenti</target>
-
 <source>Show files that are different</source>
 <target>Mostra file differenti</target>
 
-<source>Hide conflicts</source>
-<target>Nascondi i conflitti</target>
-
 <source>Show conflicts</source>
 <target>Mostra conflitti</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Nascondi i file che verranno creati sul lato sinistro</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Mostra file che verranno creati sul lato sinistro</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Nascondi i file che verranno creati sul lato destro</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Mostra file che verranno creati sul lato destro</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Nascondi i file che verranno cancellati sul lato sinistro</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Mostra file che verranno cancellati sul lato sinistro</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Nascondi i file che verranno cancellati sul lato destro</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Mostra file che verranno cancellati sul lato destro</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Nascondi i file che verranno sovrascritti sul lato sinistro</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Mostra file che verranno sovrascritti sul lato sinistro</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Nascondi i file che verranno sovrascritti sul lato destro</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Mostra file che verranno sovrascritti sul lato destro</target>
 
-<source>Hide files that won't be copied</source>
-<target>Nascondi i file che non saranno copiati</target>
-
 <source>Show files that won't be copied</source>
 <target>Mostra file che non saranno copiati</target>
 
+<source>Set as default</source>
+<target>Imposta come predefinito</target>
+
 <source>All folders are in sync!</source>
 <target>Tutte le cartelle sono sincronizzate!</target>
 
@@ -972,14 +948,8 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>File list exported!</source>
 <target>Elenco file esportato!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Eliminazione oggetto riuscita!</pluralform>
-<pluralform>%x oggetti eliminati con successo!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>Ricerca di aggiornamenti al programma...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1014,6 +984,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>&Ignore</source>
 <target>&Ignora</target>
 
+<source>Don't show this warning again</source>
+<target>Non mostrare più questo avviso</target>
+
 <source>&Switch</source>
 <target>&Passa</target>
 
@@ -1032,9 +1005,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Comparing content...</source>
 <target>Comparazione contenuto...</target>
 
-<source>Copy</source>
-<target>Copia</target>
-
 <source>Paused</source>
 <target>In pausa</target>
 
@@ -1117,35 +1087,38 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <target>Vuoi visualizzare nuovamente i dialoghi e avvisi nascosti?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Vuoi spostare il seguente oggetto nel Cestino?</pluralform>
-<pluralform>Vuoi spostare i seguenti %x oggetti nel Cestino?</pluralform>
+<pluralform>Vuoi veramente spostare il seguente oggetto nel Cestino?</pluralform>
+<pluralform>Vuoi veramente spostare i seguenti %x oggetti nel Cestino?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Eliminare il seguente elemento?</pluralform>
-<pluralform>Eliminare i seguenti %x elementi?</pluralform>
+<pluralform>Vuoi veramente eliminare il seguente oggetto?</pluralform>
+<pluralform>Vuoi veramente eliminare i seguenti %x oggetti?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Lascia come conflitti irrisolti</target>
 
+<source>Time stamp</source>
+<target>Data e ora</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Accoda data e ora ad ogni nome di file</target>
+
 <source>Replace</source>
 <target>Sostituisci</target>
 
 <source>Move files and replace if existing</source>
 <target>Sposta file e sostituisci se esistenti</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Accoda data e ora ad ogni nome di file</target>
-
 <source>Folder</source>
 <target>Cartella</target>
 
@@ -1158,6 +1131,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Files</source>
 <target>File</target>
 
+<source>Items</source>
+<target></target>
+
 <source>Percentage</source>
 <target>Percentuale</target>
 
@@ -1260,6 +1236,12 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Cannot set privilege %x.</source>
 <target>Impossibile impostare privilegi %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Sospensione sistema fallita.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Impossibile modificare le priorità I/O del processo.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Impossibile spostare %x nel Cestino!</target>
 
@@ -1278,14 +1260,38 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Imposta direzioni di sincronizzazione dpredefinite: i vecchi file saranno sovrascritti dai nuovi.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Controllo di disponibilità Cestino per la cartella %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Spostamento file %x nel Cestino</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Spostamento cartella %x nel Cestino</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Spostamento collegamento %x nel Cestino</target>
+
+<source>Deleting file %x</source>
+<target>Eliminazione file %x</target>
+
+<source>Deleting folder %x</source>
+<target>Eliminazione cartella %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Eliminazione collegamento %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Cestino non disponibile per i seguenti percorsi! I file verranno cancellati in modo permanente:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Puoi ignorare questo errore per considerare la cartella come vuota.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>La cartella corrispondente sarà considerata come vuota.</target>
 
-<source>Cannot find folder %x.</source>
-<target>Impossibile trovare cartella %x.</target>
+<source>Cannot find the following folders:</source>
+<target>Impossibile trovare le seguenti cartelle:</target>
+
+<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target></target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Le cartelle sono dipendenti! Fai attenzione quando configuri le regole di sincronizzazione:</target>
@@ -1293,8 +1299,8 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Start comparison</source>
 <target>Inizia comparazione</target>
 
-<source>Preparing synchronization...</source>
-<target>Preparazione sincronizzazione...</target>
+<source>Calculating sync directions...</source>
+<target>Calcolo della direzione di sincronizzazione...</target>
 
 <source>Conflict detected:</source>
 <target>Rilevato conflitto:</target>
@@ -1359,24 +1365,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Multiple...</source>
 <target>Multiplo...</target>
 
-<source>Deleting file %x</source>
-<target>Eliminazione file %x</target>
-
-<source>Deleting folder %x</source>
-<target>Eliminazione cartella %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Eliminazione collegamento %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Spostamento file %x nel Cestino</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Spostamento cartella %x nel Cestino</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Spostamento collegamento %x nel Cestino</target>
-
 <source>Moving file %x to %y</source>
 <target>Spostamento file %x in %y</target>
 
@@ -1389,9 +1377,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Removing old versions...</source>
 <target>Rimozione di vecchie versioni...</target>
 
-<source>Creating file %x</source>
-<target>Creazione file %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Creazione collegamento %x</target>
 
@@ -1410,6 +1395,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Updating attributes of %x</source>
 <target>Aggiornamento attributi di %x</target>
 
+<source>Cannot find %x.</source>
+<target>Impossibile trovare %x.</target>
+
 <source>Target folder %x already existing.</source>
 <target>La cartella di destinazione %x è già esistente.</target>
 
@@ -1455,6 +1443,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Generating database...</source>
 <target>Generazione database...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Creazione di Volume Shadow Copy per %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Errore nella verifica data: i file sorgente e destinazione hanno differente contenuto!</target>
 
diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng
index 25935c29..01b596e0 100644
--- a/BUILD/Languages/japanese.lng
+++ b/BUILD/Languages/japanese.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>合計時間:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>%x のディレクトリロックができません.</target>
+
 <source>Show in Explorer</source>
 <target>エクスプローラで表示</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>エラー</target>
 
+<source>Selected variant:</source>
+<target>選択されたバリアント:</target>
+
 <source>Select alternate comparison settings</source>
 <target>代替比較設定を選択</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>フィルター設定をクリア</target>
 
+<source>Copy</source>
+<target>コピー</target>
+
+<source>Paste</source>
+<target>貼り付け</target>
+
 <source>Save as batch job</source>
 <target>一括ジョブで保存</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>致命的なエラー</target>
 
-<source>Windows Error Code %x:</source>
-<target>Windows エラーコード %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux エラーコード %x:</target>
+<source>Error Code %x:</source>
+<target>エラーコード %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>シンボリックリンク %x を解決できません.</target>
@@ -159,8 +168,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>待機時間中ディレクトリはロックされます(%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>%x のロックをセットできません.</target>
+<source>Creating file %x</source>
+<target>ファイル %x を作成中</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -190,9 +199,6 @@
 <source>/sec</source>
 <target>/秒</target>
 
-<source>Cannot find file %x.</source>
-<target>ファイル %x がみつかりません.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>ファイル %x には有効な構成が含まれていません.</target>
 
@@ -217,6 +223,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>次の XML要素を読み込めません:</target>
 
+<source>Cannot find file %x.</source>
+<target>ファイル %x がみつかりません.</target>
+
 <source>&Open...</source>
 <target>開く(&O)...</target>
 
@@ -450,24 +459,21 @@ The command is triggered if:
 <source>&Advanced</source>
 <target>拡張(&A)</target>
 
-<source>&Check for new version</source>
-<target>バージョン更新の確認(&C)</target>
+<source>&Check now</source>
+<target>今すぐ確認(&C)</target>
 
-<source>Compare</source>
-<target>比較</target>
+<source>Check &automatically once a week</source>
+<target>週に一回、自動的に確認する(&A)</target>
 
-<source>Compare both sides</source>
-<target>両方を比較</target>
+<source>Check for new version</source>
+<target>新バージョンの確認</target>
 
-<source>&Abort</source>
-<target>情報(&A)</target>
+<source>Compare</source>
+<target>比較</target>
 
 <source>Synchronize</source>
 <target>同期処理</target>
 
-<source>Start synchronization</source>
-<target>同期の開始</target>
-
 <source>Add folder pair</source>
 <target>フォルダのペアを追加</target>
 
@@ -477,15 +483,6 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>パネルを入れ替え</target>
 
-<source>Open</source>
-<target>開く</target>
-
-<source>Save</source>
-<target>保存</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>前回使用した構成設定(DEL キーでリストから除去します)</target>
-
 <source>Hide excluded items</source>
 <target>除外対象項目を隠す</target>
 
@@ -516,6 +513,18 @@ The command is triggered if:
 <source>Time elapsed:</source>
 <target>経過時間</target>
 
+<source>Synchronizing...</source>
+<target>同期処理中...</target>
+
+<source>On completion</source>
+<target>完了時の動作</target>
+
+<source>Close</source>
+<target>閉じる</target>
+
+<source>&Pause</source>
+<target>一時停止(&P)</target>
+
 <source>Batch job</source>
 <target>一括処理</target>
 
@@ -546,9 +555,6 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>最初のエラー発生時に同期を中断する</target>
 
-<source>On completion</source>
-<target>完了時の動作</target>
-
 <source>Show progress dialog</source>
 <target>進捗ダイアログを表示</target>
 
@@ -606,8 +612,8 @@ is the same
 <source><- Two way -></source>
 <target><- 両方向 -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>両側の識別、プロパティの変更特定にデータベースを使用します。削除、リネーム及び競合などは自動的に検出されます</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>変更箇所を識別して両側に変更を反映します。データベースを使用することで、削除、移動および競合などが自動的に検出されます。</target>
 
 <source>Mirror ->></source>
 <target>ミラー >></target>
@@ -645,15 +651,12 @@ is the same
 <source>Versioning</source>
 <target>バージョン付け</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>ファイルのタイムスタンプで指定フォルダに移動</target>
+<source>Move files to user-defined folder</source>
+<target>ユーザ定義フォルダにファイルを移動</target>
 
 <source>Naming convention:</source>
 <target>命名規則:</target>
 
-<source>Configuration</source>
-<target>構成設定</target>
-
 <source>Item exists on left side only</source>
 <target>左側のみに存在する項目</target>
 
@@ -670,13 +673,7 @@ is the same
 <target>内容が異なる項目</target>
 
 <source>Conflict/item cannot be categorized</source>
-<target>競合/項目を分類化できません</target>
-
-<source>Synchronizing...</source>
-<target>同期処理中...</target>
-
-<source>&Pause</source>
-<target>一時停止(&P)</target>
+<target>競合/分類化できない項目</target>
 
 <source>Source code written in C++ using:</source>
 <target>ソースコードは C++ で書かれています</target>
@@ -738,26 +735,26 @@ Note: File names must be relative to base directories!
 <source>Maximum</source>
 <target>最大</target>
 
-<source>&Default</source>
-<target>デフォルト(&D)</target>
+<source>&Clear</source>
+<target>クリア(&C)</target>
 
 <source>Fail-safe file copy</source>
-<target>ファイルコピーの失敗</target>
+<target>安全なファイルコピーを実施</target>
 
 <source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
-<target>最初に一時ファイル(*.ffs_tmp)に書き込み、それをリネームします。これにより、致命的なエラーが起こっても状態は保証されます</target>
+<target>最初に一時ファイル(*.ffs_tmp)に書き込み、それをリネームすることで、致命的なエラーが起こった場合でも一貫性は保証されます</target>
 
 <source>Copy locked files</source>
 <target>ロックされたファイルをコピーする</target>
 
 <source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>ボリュームシャドーコピーを使用して共有/ロックされたファイルをコピー(管理者権限が必要)</target>
+<target>ボリュームシャドウコピーを使用して共有/ロックされたファイルをコピーします(管理者権限が必要)</target>
 
 <source>Copy file access permissions</source>
 <target>ファイルのアクセスパーミッションをコピーする</target>
 
 <source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>転送ファイルとフォルダのパーミッション(管理者権限が必要)</target>
+<target>ファイルとフォルダのパーミッションを転送します(管理者権限が必要)</target>
 
 <source>Restore hidden dialogs</source>
 <target>隠したダイアログを復帰</target>
@@ -768,6 +765,12 @@ Note: File names must be relative to base directories!
 <source>Description</source>
 <target>説明</target>
 
+<source>&Default</source>
+<target>デフォルト(&D)</target>
+
+<source>Start synchronization</source>
+<target>同期の開始</target>
+
 <source>Variant</source>
 <target>変化</target>
 
@@ -798,12 +801,24 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>概要</target>
 
+<source>Configuration</source>
+<target>構成設定</target>
+
 <source>Filter files</source>
 <target>ﾌｧｲﾙﾌｨﾙﾀｰ</target>
 
 <source>Select view</source>
 <target>表示選択</target>
 
+<source>Open...</source>
+<target>開く...</target>
+
+<source>Save</source>
+<target>保存</target>
+
+<source>Compare both sides</source>
+<target>両方を比較</target>
+
 <source>Set direction:</source>
 <target>方向の設定:</target>
 
@@ -861,102 +876,63 @@ Note: File names must be relative to base directories!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync 一括</target>
 
-<source>Never save changes</source>
-<target>変更を保存しない</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>本当に %x の変更を保存しますか?</target>
 
 <source>Do&n't save</source>
 <target>保存しない(&N)</target>
 
+<source>Never save changes</source>
+<target>変更を保存しない</target>
+
 <source>Configuration loaded!</source>
 <target>構成設定を読み込み中!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>左側のみに存在するファイルを非表示</target>
-
 <source>Show files that exist on left side only</source>
 <target>左側のみに存在するファイルを表示</target>
 
-<source>Hide files that exist on right side only</source>
-<target>右側のみに存在するファイルを非表示</target>
-
 <source>Show files that exist on right side only</source>
 <target>右側のみに存在するファイルを表示</target>
 
-<source>Hide files that are newer on left</source>
-<target>左側の新しいファイルを非表示</target>
-
 <source>Show files that are newer on left</source>
 <target>左側の新しいファイルを表示</target>
 
-<source>Hide files that are newer on right</source>
-<target>右側の新しいファイルを非表示</target>
-
 <source>Show files that are newer on right</source>
 <target>右側の新しいファイルを表示</target>
 
-<source>Hide files that are equal</source>
-<target>同様のファイルを非表示</target>
-
 <source>Show files that are equal</source>
 <target>同じ内容のファイルを表示</target>
 
-<source>Hide files that are different</source>
-<target>異なるファイルを非表示</target>
-
 <source>Show files that are different</source>
 <target>差異のあるファイルを表示</target>
 
-<source>Hide conflicts</source>
-<target>不一致を隠す</target>
-
 <source>Show conflicts</source>
 <target>不一致を表示</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>左側で作成されたファイルを非表示にする</target>
-
 <source>Show files that will be created on the left side</source>
 <target>左側で作成されたファイルを表示</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>右側で作成されたファイルを非表示にする</target>
-
 <source>Show files that will be created on the right side</source>
 <target>右側で作成されたファイルを表示</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>左側で削除されたファイルを非表示にする</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>左側で削除されたファイルを表示</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>右側で削除されたファイルを非表示にする</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>右側で削除されたファイルを表示</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>左側で上書きされたファイルを非表示にする</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>左側で上書きされたファイルを表示</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>右側で上書きされたファイルを非表示にする</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>右側で上書きされたファイルを表示</target>
 
-<source>Hide files that won't be copied</source>
-<target>コピーしなかったファイルを隠す</target>
-
 <source>Show files that won't be copied</source>
 <target>コピーされなかったファイルを表示</target>
 
+<source>Set as default</source>
+<target>デフォルトにセット</target>
+
 <source>All folders are in sync!</source>
 <target>すべてのフォルダを同期!</target>
 
@@ -969,13 +945,8 @@ Note: File names must be relative to base directories!
 <source>File list exported!</source>
 <target>ファイル一覧のエクスポートが完了!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>%x のオブジェクトが削除されました!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>アップデートを検索しています...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1007,6 +978,9 @@ Note: File names must be relative to base directories!
 <source>&Ignore</source>
 <target>無視(&I)</target>
 
+<source>Don't show this warning again</source>
+<target>次回からこの警告は表示しない</target>
+
 <source>&Switch</source>
 <target>切り替え(&S)</target>
 
@@ -1025,9 +999,6 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>内容を比較中...</target>
 
-<source>Copy</source>
-<target>コピー</target>
-
 <source>Paused</source>
 <target>一時停止中</target>
 
@@ -1089,7 +1060,7 @@ Note: File names must be relative to base directories!
 <target>考慮する</target>
 
 <source>Copy NTFS permissions</source>
-<target>NTFS パーミッションをコピー</target>
+<target>NTFS パーミッションをコピーする</target>
 
 <source>Integrate external applications into context menu. The following macros are available:</source>
 <target>外部のアプリケーションをコンテキストメニューに統合、以下のマクロが利用できます:</target>
@@ -1110,33 +1081,36 @@ Note: File names must be relative to base directories!
 <target>非表示にした警告ダイアログを再び表示しますか?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>本当に %x のオブジェクトをゴミ箱に移動しますか?</pluralform>
+<pluralform>本当に以下の %x 個の項目をゴミ箱に移動しますか</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>本当に以下 %x のオブジェクトを削除しますか?</pluralform>
+<pluralform>本当に以下の %x 個の項目を削除しますか</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>未解決の競合はそのまま残す</target>
 
+<source>Time stamp</source>
+<target>タイムスタンプ</target>
+
+<source>Append a timestamp to each file name</source>
+<target>各ファイル名にタイムスタンプを追加</target>
+
 <source>Replace</source>
 <target>置換</target>
 
 <source>Move files and replace if existing</source>
 <target>ファイルを移動、存在する場合は上書き</target>
 
-<source>Append a timestamp to each file name</source>
-<target>各ファイル名にタイムスタンプを追加</target>
-
 <source>Folder</source>
 <target>フォルダ</target>
 
@@ -1248,6 +1222,12 @@ Note: File names must be relative to base directories!
 <source>Cannot set privilege %x.</source>
 <target>%x の特権をセットできません.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>システム スリープモードの中断に失敗</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>プロセスの I/O 優先度を変更できません</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>%x をゴミ箱に移動できません!</target>
 
@@ -1266,14 +1246,38 @@ Note: File names must be relative to base directories!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>同期方向のデフォルト設定: 古いファイルに新しいファイルを上書き</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>フォルダ %x をゴミ箱として使用できるかを確認中...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>ファイル %x をゴミ箱に移動中</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>フォルダ %x をゴミ箱に移動中</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>シンボリックリンク %x をゴミ箱に移動中</target>
+
+<source>Deleting file %x</source>
+<target>ファイル %x を削除中</target>
+
+<source>Deleting folder %x</source>
+<target>フォルダ %x を削除中</target>
+
+<source>Deleting symbolic link %x</source>
+<target>シンボリックリンク %x を削除中</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>以下のパスにあるゴミ箱が利用できません! 代わりにファイルは完全削除されます:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>フォルダを空と想定する場合は、このエラーは無視できます.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>対応するフォルダは空であるとみなされます</target>
 
-<source>Cannot find folder %x.</source>
-<target>フォルダ %x がみつかりません.</target>
+<source>Cannot find the following folders:</source>
+<target>以下のフォルダがみつかりません:</target>
+
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>各フォルダを空とみなす場合は、このエラーは無視できます</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>ディレクトリが依存関係にあります! 同期規則の設定時には注意してください:</target>
@@ -1281,8 +1285,8 @@ Note: File names must be relative to base directories!
 <source>Start comparison</source>
 <target>比較を開始</target>
 
-<source>Preparing synchronization...</source>
-<target>同期処理の準備中...</target>
+<source>Calculating sync directions...</source>
+<target>同期方向を計算しています...</target>
 
 <source>Conflict detected:</source>
 <target>検出された競合:</target>
@@ -1347,24 +1351,6 @@ Note: File names must be relative to base directories!
 <source>Multiple...</source>
 <target>複数処理...</target>
 
-<source>Deleting file %x</source>
-<target>ファイル %x を削除中</target>
-
-<source>Deleting folder %x</source>
-<target>フォルダ %x を削除中</target>
-
-<source>Deleting symbolic link %x</source>
-<target>シンボリックリンク %x を削除中</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>ファイル %x をゴミ箱に移動中</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>フォルダ %x をゴミ箱に移動中</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>シンボリックリンク %x をゴミ箱に移動中</target>
-
 <source>Moving file %x to %y</source>
 <target>ファイル %x を %y に移動中</target>
 
@@ -1377,9 +1363,6 @@ Note: File names must be relative to base directories!
 <source>Removing old versions...</source>
 <target>旧バージョンを除去中...</target>
 
-<source>Creating file %x</source>
-<target>ファイル %x を作成中</target>
-
 <source>Creating symbolic link %x</source>
 <target>シンボリックリンク %x を作成中</target>
 
@@ -1398,6 +1381,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>%x の属性を更新</target>
 
+<source>Cannot find %x.</source>
+<target>%x が見つかりません</target>
+
 <source>Target folder %x already existing.</source>
 <target>対象フォルダ %x は既に存在します.</target>
 
@@ -1443,6 +1429,9 @@ Note: File names must be relative to base directories!
 <source>Generating database...</source>
 <target>データベースを作成中...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>%x のボリュームシャドウコピーを作成中...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>データ検証エラー: ソースと対象ファイルに異なる内容が含まれています!</target>
 
diff --git a/BUILD/Languages/korean.lng b/BUILD/Languages/korean.lng
index b4b28480..07cc454e 100644
--- a/BUILD/Languages/korean.lng
+++ b/BUILD/Languages/korean.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>전체 시간 :</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>%x 에 대한 디렉토리 잠금을 설정할 수 없습니다.</target>
+
 <source>Show in Explorer</source>
 <target>탐색기에 표시</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>오류</target>
 
+<source>Selected variant:</source>
+<target>선택한 베어리언트</target>
+
 <source>Select alternate comparison settings</source>
 <target>대체 비교 설정 선택</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>필터 설정 지우기</target>
 
+<source>Copy</source>
+<target>복사</target>
+
+<source>Paste</source>
+<target>붙여넣기</target>
+
 <source>Save as batch job</source>
 <target>일괄 작업으로 저장</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>치명적 오류</target>
 
-<source>Windows Error Code %x:</source>
-<target>윈도우 에러 코드 %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>리눅스 에러 코드 %x:</target>
+<source>Error Code %x:</source>
+<target>오류 코드 %x</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>심볼릭 링크 %x 을(를) 해결할 수 없습니다.</target>
@@ -159,8 +168,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>디렉토리 잠금 대기 중 (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>디렉토리 잠금 %x 을(를) 설정할 수 없습니다.</target>
+<source>Creating file %x</source>
+<target>파일 %x 생성 중</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -190,9 +199,6 @@
 <source>/sec</source>
 <target>/초</target>
 
-<source>Cannot find file %x.</source>
-<target>파일 %x 을(를) 찾을 수 없습니다.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>파일 %x 의 구성이 유효하지 않습니다.</target>
 
@@ -217,6 +223,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>다음 XML 요소를 읽을 수 없습니다 :</target>
 
+<source>Cannot find file %x.</source>
+<target>파일 %x 을(를) 찾을 수 없습니다.</target>
+
 <source>&Open...</source>
 <target>열기(&O)</target>
 
@@ -331,7 +340,7 @@ The command is triggered if:
 <target>동기화 할 항목이 없습니다!</target>
 
 <source>Synchronization completed successfully.</source>
-<target>동기화 완료 성공!</target>
+<target>동기화가 성공적으로 완료 됐습니다.</target>
 
 <source>Saving log file %x...</source>
 <target>로그 파일 %x 저장 중...</target>
@@ -450,24 +459,21 @@ The command is triggered if:
 <source>&Advanced</source>
 <target>고급기능(&A)</target>
 
-<source>&Check for new version</source>
-<target>버전 업데이트 확인(&C)</target>
+<source>&Check now</source>
+<target>지금 확인(&C)</target>
 
-<source>Compare</source>
-<target>비  교</target>
+<source>Check &automatically once a week</source>
+<target>자동으로 주당 1회 확인(&a)</target>
 
-<source>Compare both sides</source>
-<target>양측 비교</target>
+<source>Check for new version</source>
+<target>신규 버전 확인</target>
 
-<source>&Abort</source>
-<target>작업 중지(&A)</target>
+<source>Compare</source>
+<target>비  교</target>
 
 <source>Synchronize</source>
 <target>동  기  화</target>
 
-<source>Start synchronization</source>
-<target>동기화 시작</target>
-
 <source>Add folder pair</source>
 <target>폴더 페어(짝) 추가</target>
 
@@ -477,15 +483,6 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>양측 위치 바꾸기</target>
 
-<source>Open</source>
-<target>열기</target>
-
-<source>Save</source>
-<target>저장</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>마지막으로 사용한 설정 (DEL 키를 누르면 리스트에서 삭제)</target>
-
 <source>Hide excluded items</source>
 <target>제외 항목 숨기기</target>
 
@@ -516,6 +513,18 @@ The command is triggered if:
 <source>Time elapsed:</source>
 <target>경과 시간 :</target>
 
+<source>Synchronizing...</source>
+<target>동기화 작업 중...</target>
+
+<source>On completion</source>
+<target>완료 시</target>
+
+<source>Close</source>
+<target>닫기</target>
+
+<source>&Pause</source>
+<target>일시정지(&P)</target>
+
 <source>Batch job</source>
 <target>일괄 작업</target>
 
@@ -546,9 +555,6 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>첫 번째 오류 시 동기화 중지</target>
 
-<source>On completion</source>
-<target>완료 시</target>
-
 <source>Show progress dialog</source>
 <target>프로그레스 다이얼로그 (진행 표시 창) 보기</target>
 
@@ -565,7 +571,7 @@ The command is triggered if:
 <target>로그 파일의 최대 개수 제한</target>
 
 <source>Select variant</source>
-<target>변형(베어리언트) 선택</target>
+<target>베어리언트 선택</target>
 
 <source>
 Files are found equal if
@@ -606,8 +612,8 @@ is the same
 <source><- Two way -></source>
 <target><- 양방/양면 (Two Way) -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>데이터베이스를 활용하여 양측의 변경사항을 확인하고 반영합니다. 파일 삭제/명칭 변경/충돌은 자동으로 감지됩니다.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>양측 변경사항을 확인하고 전달. 삭제, 이동 및 충돌은 데이터베이스를 통해 자동으로 감지됩니다.</target>
 
 <source>Mirror ->></source>
 <target>미러 ->></target>
@@ -645,15 +651,12 @@ is the same
 <source>Versioning</source>
 <target>버저닝</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>타임스탬핑(생성시간 날인)된 파일을 지정된 폴더로 이동</target>
+<source>Move files to user-defined folder</source>
+<target>사용자 정의 폴더로 파일 이동</target>
 
 <source>Naming convention:</source>
 <target>이름 지정 :</target>
 
-<source>Configuration</source>
-<target>구성 설정</target>
-
 <source>Item exists on left side only</source>
 <target>항목이 좌측에만 존재합니다.</target>
 
@@ -661,10 +664,10 @@ is the same
 <target>항목이 우측에만 존재합니다.</target>
 
 <source>Left side is newer</source>
-<target>좌측이 더 신규입니다.</target>
+<target>좌측이 최신입니다.</target>
 
 <source>Right side is newer</source>
-<target>우측이 더 신규입니다.</target>
+<target>우측이 최신입니다.</target>
 
 <source>Items have different content</source>
 <target>항목 내용이 서로 다릅니다.</target>
@@ -672,12 +675,6 @@ is the same
 <source>Conflict/item cannot be categorized</source>
 <target>충돌 / 항목을 분류할 수 없음</target>
 
-<source>Synchronizing...</source>
-<target>동기화 작업 중...</target>
-
-<source>&Pause</source>
-<target>일시정지(&P)</target>
-
 <source>Source code written in C++ using:</source>
 <target>소스코드는 C++ 언어로 아래 툴을 사용하여 작성되었습니다 :</target>
 
@@ -738,8 +735,8 @@ Note: File names must be relative to base directories!
 <source>Maximum</source>
 <target>최대</target>
 
-<source>&Default</source>
-<target>기본 설정/값(&D)</target>
+<source>&Clear</source>
+<target>지우기(&C)</target>
 
 <source>Fail-safe file copy</source>
 <target>실패 - 안전 파일 복사</target>
@@ -768,8 +765,14 @@ Note: File names must be relative to base directories!
 <source>Description</source>
 <target>설명</target>
 
+<source>&Default</source>
+<target>기본 설정/값(&D)</target>
+
+<source>Start synchronization</source>
+<target>동기화 시작</target>
+
 <source>Variant</source>
-<target>변형(베어리언트)</target>
+<target>베어리언트</target>
 
 <source>Statistics</source>
 <target>통계</target>
@@ -798,12 +801,24 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>개요</target>
 
+<source>Configuration</source>
+<target>구성 설정</target>
+
 <source>Filter files</source>
 <target>파일 필터</target>
 
 <source>Select view</source>
 <target>보기 선택</target>
 
+<source>Open...</source>
+<target>열기</target>
+
+<source>Save</source>
+<target>저장</target>
+
+<source>Compare both sides</source>
+<target>양측 비교</target>
+
 <source>Set direction:</source>
 <target>방향 설정 :</target>
 
@@ -861,102 +876,63 @@ Note: File names must be relative to base directories!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync 일괄처리(배치)</target>
 
-<source>Never save changes</source>
-<target>변경사항 절대 저장 안 함.</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>%x의 변경사항을 저장하시겠습니까?</target>
 
 <source>Do&n't save</source>
 <target>저장하기 않기(&n)</target>
 
+<source>Never save changes</source>
+<target>변경사항 절대 저장 안 함.</target>
+
 <source>Configuration loaded!</source>
 <target>설정 로드 완료!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>좌측에만 존재하는 파일 숨기기</target>
-
 <source>Show files that exist on left side only</source>
 <target>좌측에만 존재하는 파일 표시</target>
 
-<source>Hide files that exist on right side only</source>
-<target>우측에만 존재하는 파일 숨기기</target>
-
 <source>Show files that exist on right side only</source>
 <target>우측에만 존재하는 파일 표시</target>
 
-<source>Hide files that are newer on left</source>
-<target>좌측이 더 신규인 파일 숨기기</target>
-
 <source>Show files that are newer on left</source>
-<target>좌측이 더 신규인 파일 표시</target>
-
-<source>Hide files that are newer on right</source>
-<target>우측이 더 신규인 파일 숨기기</target>
+<target>좌측이 보다 최신인 파일 표시</target>
 
 <source>Show files that are newer on right</source>
-<target>우측이 더 신규인 파일 표시</target>
-
-<source>Hide files that are equal</source>
-<target>내용이 같은 파일 숨기기</target>
+<target>우측이 보다 최신인 파일 표시</target>
 
 <source>Show files that are equal</source>
 <target>내용이 같은 파일 표시</target>
 
-<source>Hide files that are different</source>
-<target>내용이 다른 파일 숨기기</target>
-
 <source>Show files that are different</source>
 <target>내용이 다른 파일 표시</target>
 
-<source>Hide conflicts</source>
-<target>충돌 내용 숨기기</target>
-
 <source>Show conflicts</source>
 <target>충돌 표시</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>좌측에 생성될 파일 숨기기</target>
-
 <source>Show files that will be created on the left side</source>
 <target>좌측에 생성될 파일 표시</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>우측에 생성될 파일 숨기기</target>
-
 <source>Show files that will be created on the right side</source>
 <target>우측에 생성될 파일 표시</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>좌측에서 삭제될 파일 숨기기</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>좌측에서 삭제될 파일 표시</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>우측에서 삭제될 파일 숨기기</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>우측에서 삭제될 파일 표시</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>좌측에 덮어쓰여질 파일 숨기기</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>좌측에 덮어쓰여질 파일 표시</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>우측에 덮어쓰여질 파일 숨기기</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>우측에 덮어쓰여질 파일 표시</target>
 
-<source>Hide files that won't be copied</source>
-<target>복사되지 않을 파일 숨기기</target>
-
 <source>Show files that won't be copied</source>
 <target>복사되지 않을 파일 표시</target>
 
+<source>Set as default</source>
+<target>기본 값으로 설정</target>
+
 <source>All folders are in sync!</source>
 <target>모든 폴더가 동기화 되었음!</target>
 
@@ -969,13 +945,8 @@ Note: File names must be relative to base directories!
 <source>File list exported!</source>
 <target>파일 리스트 내보내기 완료!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>%x개 대상이 성공적으로 삭제 됐습니다!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>프로그램 업데이트 검색 중...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1007,6 +978,9 @@ Note: File names must be relative to base directories!
 <source>&Ignore</source>
 <target>무시(&I)</target>
 
+<source>Don't show this warning again</source>
+<target>이 경고를 다시 표시하지 않음</target>
+
 <source>&Switch</source>
 <target>스위치[전환](&S)</target>
 
@@ -1025,9 +999,6 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>내용 비교 중...</target>
 
-<source>Copy</source>
-<target>복사</target>
-
 <source>Paused</source>
 <target>일시정지 중</target>
 
@@ -1110,23 +1081,29 @@ Note: File names must be relative to base directories!
 <target>숨겨진 경고 창 또는 대화 창을 다시 보이게 하시겠습니까?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>다음 %x개 대상을 정말로 휴지통으로 이동하시길 원하십니까?</pluralform>
+<pluralform>정말로 다음 %x 항목(들)을 휴지통으로 이동하시겠습니까?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>다음 %x개 대상을 정말로 삭제하시길 원하십니까?</pluralform>
+<pluralform>정말로 다음 %x 항목(들)을 삭제하시겠습니까?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
-<target>해결되지 않은 충돌로 놔두기</target>
+<target>미해결 충돌로 놔두기</target>
+
+<source>Time stamp</source>
+<target>타임 스탬프</target>
+
+<source>Append a timestamp to each file name</source>
+<target>각 파일 이름마다 타임스탬프 추가</target>
 
 <source>Replace</source>
 <target>대체</target>
@@ -1134,9 +1111,6 @@ Note: File names must be relative to base directories!
 <source>Move files and replace if existing</source>
 <target>파일 이동 및 기존 파일 존재 시에는 대체</target>
 
-<source>Append a timestamp to each file name</source>
-<target>각 파일 이름마다 타임스탬프 추가</target>
-
 <source>Folder</source>
 <target>폴더</target>
 
@@ -1248,6 +1222,12 @@ Note: File names must be relative to base directories!
 <source>Cannot set privilege %x.</source>
 <target>권한 %x 을(를) 설정할 수 없습니다.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>시스템 절전모드 중지 실패</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>I/O 우선순위 프로세스 변경 불가</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>%x 을(를) 휴지통으로 이동할 수 없습니다!</target>
 
@@ -1264,16 +1244,40 @@ Note: File names must be relative to base directories!
 <target>해당 데이터베이스 항목은 현재 설정 상태에서 동기화 되지 않습니다.</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
-<target>기본값 동기화 방향 설정 : 이전 파일들은 신규 파일들로 덮어 쓰여집니다.</target>
+<target>기본값 동기화 방향 설정 : 이전 파일들은 보다 최신 파일들로 덮어 쓰여집니다.</target>
+
+<source>Checking recycle bin availability for folder %x...</source>
+<target>폴더 %x 을(를) 위한 휴지통 가용성 여부 확인 중...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>파일 %x을(를) 휴지통으로 이동 중</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>폴더 %x을(를) 휴지통으로 이동 중</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>심볼릭 링크 %x을(를) 휴지통으로 이동 중</target>
+
+<source>Deleting file %x</source>
+<target>파일 %x 삭제 중</target>
+
+<source>Deleting folder %x</source>
+<target>폴더 %x 삭제 중</target>
+
+<source>Deleting symbolic link %x</source>
+<target>심볼릭 링크 %x 삭제 중</target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>다음 경로로는 휴지통을 사용할 수 없습니다! 대신 파일을 영구적으로 삭제합니다 :</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>폴더를 빈 상태로 가정할 경우, 이 오류는 무시될 수 있습니다.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>해당 폴더를 비어 있는 상태로 간주합니다.</target>
+
+<source>Cannot find the following folders:</source>
+<target>다음 폴더를 찾을 수 없습니다 :</target>
 
-<source>Cannot find folder %x.</source>
-<target>폴더 %x 을(를) 찾을 수 없습니다.</target>
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>이 오류를 무시하고 각 폴더를 비어 있는 상태로 간주해도 무방합니다.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>디렉토리가 의존 관계에 있습니다. 동기화 규칙 설정시 주의하십시오.</target>
@@ -1281,8 +1285,8 @@ Note: File names must be relative to base directories!
 <source>Start comparison</source>
 <target>비교 시작</target>
 
-<source>Preparing synchronization...</source>
-<target>동기화 준비 중...</target>
+<source>Calculating sync directions...</source>
+<target>동기화 방향을 계산 중...</target>
 
 <source>Conflict detected:</source>
 <target>탐지된 충돌/불일치 :</target>
@@ -1347,24 +1351,6 @@ Note: File names must be relative to base directories!
 <source>Multiple...</source>
 <target>다중처리 (멀티플) 작업...</target>
 
-<source>Deleting file %x</source>
-<target>파일 %x 삭제 중</target>
-
-<source>Deleting folder %x</source>
-<target>폴더 %x 삭제 중</target>
-
-<source>Deleting symbolic link %x</source>
-<target>심볼릭 링크 %x 삭제 중</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>파일 %x을(를) 휴지통으로 이동 중</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>폴더 %x을(를) 휴지통으로 이동 중</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>심볼릭 링크 %x을(를) 휴지통으로 이동 중</target>
-
 <source>Moving file %x to %y</source>
 <target>파일 %x을(를) %y(으)로 이동 중</target>
 
@@ -1377,9 +1363,6 @@ Note: File names must be relative to base directories!
 <source>Removing old versions...</source>
 <target>구 버전 삭제 중...</target>
 
-<source>Creating file %x</source>
-<target>파일 %x 생성 중</target>
-
 <source>Creating symbolic link %x</source>
 <target>심볼릭 링크 %x 생성 중</target>
 
@@ -1398,6 +1381,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>%x 속성 업데이트 중</target>
 
+<source>Cannot find %x.</source>
+<target>%x을(를) 찾을 수 없습니다.</target>
+
 <source>Target folder %x already existing.</source>
 <target>대상 폴더 %x이(가) 이미 존재함.</target>
 
@@ -1443,6 +1429,9 @@ Note: File names must be relative to base directories!
 <source>Generating database...</source>
 <target>데이터베이스 생성 중...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>%x을(를) 위한 Volume Shadow Copy 생성 중...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>데이터 확인 오류 : 소스 및 타겟 파일의 내용이 다릅니다!</target>
 
diff --git a/BUILD/Languages/lithuanian.lng b/BUILD/Languages/lithuanian.lng
index 4c0b74ec..c652bf6f 100644
--- a/BUILD/Languages/lithuanian.lng
+++ b/BUILD/Languages/lithuanian.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Visas laikas:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Nepavyksta nustatyti katalogo užrakto %x.</target>
+
 <source>Show in Explorer</source>
 <target>Rodyti naršyklėje</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Klaida</target>
 
+<source>Selected variant:</source>
+<target>Pasirinktas variantas:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Pasirinkite alternatyvius sulyginimo nustatymus</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Išvalyti filtro nustatymus</target>
 
+<source>Copy</source>
+<target>Kopijuoti</target>
+
+<source>Paste</source>
+<target>Įklijuoti</target>
+
 <source>Save as batch job</source>
 <target>Išsaugoti kaip paketinį darbą</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Kritinė klaida</target>
 
-<source>Windows Error Code %x:</source>
-<target>Windows klaidos kodas %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux klaidos kodas %x:</target>
+<source>Error Code %x:</source>
+<target>Klaidos kodas %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Nepavyksta išspręsti simbolinės nuorodos.</target>
@@ -162,8 +171,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Laikiama kol katalogas bus užrakintas (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Nepavyksta nustatyti katalogo užrakto %x.</target>
+<source>Creating file %x</source>
+<target>Kuriamas failas %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -199,9 +208,6 @@
 <source>/sec</source>
 <target>/sek.</target>
 
-<source>Cannot find file %x.</source>
-<target>Nepavyksta rasti failo %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Failas %x neturi tinkamų nustatymų.</target>
 
@@ -226,6 +232,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Nepavyksta perskaityti sekančių XML elementų:</target>
 
+<source>Cannot find file %x.</source>
+<target>Nepavyksta rasti failo %x.</target>
+
 <source>&Open...</source>
 <target>&Atverti...</target>
 
@@ -379,7 +388,7 @@ Komanda inicijuojama jei:
 <target><Simbolinė nuoroda></target>
 
 <source><Folder></source>
-<target><Aplankai></target>
+<target><Aplankas></target>
 
 <source>Full path</source>
 <target>Pilnas kelias</target>
@@ -459,24 +468,21 @@ Komanda inicijuojama jei:
 <source>&Advanced</source>
 <target>&Išsamiau</target>
 
-<source>&Check for new version</source>
-<target>&Tikrinti dėl atnaujinimų</target>
+<source>&Check now</source>
+<target>&Tikrinti dabar</target>
 
-<source>Compare</source>
-<target>Sulyginti</target>
+<source>Check &automatically once a week</source>
+<target>Tikrinti &automatiškai kartą per savaitę</target>
 
-<source>Compare both sides</source>
-<target>Sulyginti abi puses</target>
+<source>Check for new version</source>
+<target>Tikrinti ar yra nauja versija</target>
 
-<source>&Abort</source>
-<target>&Nutraukti</target>
+<source>Compare</source>
+<target>Sulyginti</target>
 
 <source>Synchronize</source>
 <target>Sinchronizuoti</target>
 
-<source>Start synchronization</source>
-<target>Pradėti sinchronizavimą</target>
-
 <source>Add folder pair</source>
 <target>Pridėti aplankų porą</target>
 
@@ -486,15 +492,6 @@ Komanda inicijuojama jei:
 <source>Swap sides</source>
 <target>Sukeisti puses</target>
 
-<source>Open</source>
-<target>Atverti</target>
-
-<source>Save</source>
-<target>Išsaugoti</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Paskiausiai naudoti nustatymai (spauskite DEL, kad pašalinti iš sąrašo)</target>
-
 <source>Hide excluded items</source>
 <target>Slėpti išskirtus elementus</target>
 
@@ -525,6 +522,18 @@ Komanda inicijuojama jei:
 <source>Time elapsed:</source>
 <target>Praėjęs laikas:</target>
 
+<source>Synchronizing...</source>
+<target>Sinchronizuojama...</target>
+
+<source>On completion</source>
+<target>Baigus</target>
+
+<source>Close</source>
+<target>Uždaryti</target>
+
+<source>&Pause</source>
+<target>&Pauzė</target>
+
 <source>Batch job</source>
 <target>Paketinė užduotis</target>
 
@@ -555,9 +564,6 @@ Komanda inicijuojama jei:
 <source>Abort synchronization on first error</source>
 <target>Nutraukti sinchronizavimą su pirma klaida</target>
 
-<source>On completion</source>
-<target>Baigus</target>
-
 <source>Show progress dialog</source>
 <target>Rodyti eigos langą</target>
 
@@ -615,8 +621,8 @@ yra toks pats
 <source><- Two way -></source>
 <target><- Dvipusis -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Nustatyti ir siūlyti pokeitimus abiejose pusėse naudojant duomenų bazę. Trinimai, pervardinimas ir konfliktai yra nustatomi automatiškai.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Nustatyti ir skatinti pokyčius apbiejose pusėse. Trinimai, perkėlimai ir konfliktai yra aptinkami automatiškai naudojant duomenų bazę.</target>
 
 <source>Mirror ->></source>
 <target>Veidrodis ->></target>
@@ -654,15 +660,12 @@ yra toks pats
 <source>Versioning</source>
 <target>Versijavimas</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Perkelti su laiko žyme failus į nurodytą aplanką</target>
+<source>Move files to user-defined folder</source>
+<target>Perkelti failus į naudotojo nurodytą aplanką</target>
 
 <source>Naming convention:</source>
 <target>Pavadinimų taisyklės:</target>
 
-<source>Configuration</source>
-<target>Nustatymai</target>
-
 <source>Item exists on left side only</source>
 <target>Elementas egzistuoja tik kairėje pusėje</target>
 
@@ -681,12 +684,6 @@ yra toks pats
 <source>Conflict/item cannot be categorized</source>
 <target>Konfliktas/elementas negali būti kategorizuojamas</target>
 
-<source>Synchronizing...</source>
-<target>Sinchronizuojama...</target>
-
-<source>&Pause</source>
-<target>&Pauzė</target>
-
 <source>Source code written in C++ using:</source>
 <target>Šaltinio kodas parašytas su C++ naudojant:</target>
 
@@ -747,8 +744,8 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Maximum</source>
 <target>Daugiausiai</target>
 
-<source>&Default</source>
-<target>&Numatyta</target>
+<source>&Clear</source>
+<target>&Išvalyti</target>
 
 <source>Fail-safe file copy</source>
 <target>Apsauginė failo kopija</target>
@@ -777,6 +774,12 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Description</source>
 <target>Apibūdinimas</target>
 
+<source>&Default</source>
+<target>&Numatyta</target>
+
+<source>Start synchronization</source>
+<target>Pradėti sinchronizavimą</target>
+
 <source>Variant</source>
 <target>Variantas</target>
 
@@ -807,12 +810,24 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Overview</source>
 <target>Apžvalga</target>
 
+<source>Configuration</source>
+<target>Nustatymai</target>
+
 <source>Filter files</source>
 <target>Filtruoti failus</target>
 
 <source>Select view</source>
 <target>Pasirinkti rodomus</target>
 
+<source>Open...</source>
+<target>Atverti...</target>
+
+<source>Save</source>
+<target>Išsaugoti</target>
+
+<source>Compare both sides</source>
+<target>Sulyginti abi puses</target>
+
 <source>Set direction:</source>
 <target>Nustatyti kryptį:</target>
 
@@ -870,102 +885,63 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync paketinė užduotis</target>
 
-<source>Never save changes</source>
-<target>Niekada nesaugoti pakeitimų</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Ar norite išsaugoti %x pakeitimus?</target>
 
 <source>Do&n't save</source>
 <target>&Nesaugoti</target>
 
+<source>Never save changes</source>
+<target>Niekada nesaugoti pakeitimų</target>
+
 <source>Configuration loaded!</source>
 <target>Nustatymai įkelti!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Slėpti failus, kurie egzistuoja tik kairėje pusėje</target>
-
 <source>Show files that exist on left side only</source>
 <target>Rodyti failus, kurie egzistuoja tik kairėje pusėje</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Slėpti failus, kurie egzistuoja tik dešinėje pusėje</target>
-
 <source>Show files that exist on right side only</source>
 <target>Rodyti failus, kurie egzistuoja tik dešinėje pusėje</target>
 
-<source>Hide files that are newer on left</source>
-<target>Slėpti failus, kurie yra naujesni kairėje</target>
-
 <source>Show files that are newer on left</source>
 <target>Rodyti failus, kurie yra naujesni kairėje</target>
 
-<source>Hide files that are newer on right</source>
-<target>Slėpti failus, kurie yra naujesni dešinėje</target>
-
 <source>Show files that are newer on right</source>
 <target>Rodyti failus, kurie yra naujesni dešinėje</target>
 
-<source>Hide files that are equal</source>
-<target>Slėpti failus, kurie yra lygūs</target>
-
 <source>Show files that are equal</source>
 <target>Rodyti failus, kurie yra lygūs</target>
 
-<source>Hide files that are different</source>
-<target>Slėpti failus, kurie yra skirtingi</target>
-
 <source>Show files that are different</source>
 <target>Rodyti failus, kurie yra skirtingi</target>
 
-<source>Hide conflicts</source>
-<target>Slėpti konfliktus</target>
-
 <source>Show conflicts</source>
 <target>Rodyti konfliktus</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Slėpti failus, kurie bus sukurti kairėje pusėje</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Rodyti failus, kurie bus sukurti kairėje pusėje</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Slėpti failus, kurie bus sukurti dešinėje pusėje</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Rodyti failus, kurie bus sukurti dešinėje pusėje</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Slėpti failus, kurie bus ištrinti kairėje pusėje</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Rodyti failus, kurie bus ištrinti kairėje pusėje</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Slėpti failus, kurie bus ištrinti dešinėje pusėje</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Rodyti failus, kurie bus ištrinti dešinėje pusėje</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Slėpti failus, kurie bus perrašyti kairėje pusėje</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Rodyti failus, kurie bus perrašyti kairėje pusėje</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Slėpti failus, kurie bus perrašyti dešinėje pusėje</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Rodyti failus, kurie bus perrašyti dešinėje pusėje</target>
 
-<source>Hide files that won't be copied</source>
-<target>Slėpti failus, kurie ne bus kopijuojami</target>
-
 <source>Show files that won't be copied</source>
 <target>Rodyti failus, kurie ne bus kopijuojami</target>
 
+<source>Set as default</source>
+<target>Nustatyti kaip numatytą</target>
+
 <source>All folders are in sync!</source>
 <target>Visi aplankai susinchronizuoti!</target>
 
@@ -978,16 +954,8 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>File list exported!</source>
 <target>Failų sąrašas eksportuotas!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Objektas sėkmingai ištrintas!</pluralform>
-<pluralform>%x objektai sėkmingai ištrinti!</pluralform>
-<pluralform>%x objektų sėkmingai ištrinti!</pluralform>
-<pluralform>%x objektas sėkmingai ištrintas!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>Ieškoma programos atnaujinimų...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1028,6 +996,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>&Ignore</source>
 <target>&Ignoruoti</target>
 
+<source>Don't show this warning again</source>
+<target>Neberodyti daugiau šio perspėjimo</target>
+
 <source>&Switch</source>
 <target>&Perjungti</target>
 
@@ -1046,9 +1017,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Comparing content...</source>
 <target>Sulyginamas turinys...</target>
 
-<source>Copy</source>
-<target>Kopijuoti</target>
-
 <source>Paused</source>
 <target>Pristabdyta</target>
 
@@ -1131,39 +1099,42 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <target>Ar vėl rodyti paslėptus perspėjimus ir langus?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Ar tikrai norite perkelti sekantį objektą į šiukšliadėžę?</pluralform>
-<pluralform>Ar tikrai norite perkelti sekančius %x objektus į šiukšliadėžę?</pluralform>
-<pluralform>Ar tikrai norite perkelti sekančius %x objektų į šiukšliadėžę?</pluralform>
-<pluralform>Ar tikrai norite perkelti sekančius %x objektą į šiukšliadėžę?</pluralform>
+<pluralform>Ar tikrai norite perkelti šį elementą į šiukšliadėžę?</pluralform>
+<pluralform>Ar tikrai norite perkelti šiuos %x elementus į šiukšliadėžę?</pluralform>
+<pluralform>Ar tikrai norite perkelti šiuos %x elementų į šiukšliadėžę?</pluralform>
+<pluralform>Ar tikrai norite perkelti šį %x elementą į šiukšliadėžę?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Ar tikrai norite ištrinti sekantį objektą?</pluralform>
-<pluralform>Ar tikrai norite ištrinti sekantčius %x objektus?</pluralform>
-<pluralform>Ar tikrai norite ištrinti sekantčius %x objektų?</pluralform>
-<pluralform>Ar tikrai norite ištrinti sekantčius %x objektą?</pluralform>
+<pluralform>Ar tikrai norite ištrinti šį elementą?</pluralform>
+<pluralform>Ar tikrai norite ištrinti šiuos %x elementus?</pluralform>
+<pluralform>Ar tikrai norite ištrinti šiuos %x elementų?</pluralform>
+<pluralform>Ar tikrai norite ištrinti šį %x elementą?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Palikti kaip neišpręstą konfliktą</target>
 
+<source>Time stamp</source>
+<target>Laiko žymė</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Pridėti laiko žymę kiekvieno failo pavadinime</target>
+
 <source>Replace</source>
 <target>Pakeisti</target>
 
 <source>Move files and replace if existing</source>
 <target>Perkelti failus ir pakeisti jei egzistuoja</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Pridėti laiko žymę kiekvieno failo pavadinime</target>
-
 <source>Folder</source>
 <target>Aplankas</target>
 
@@ -1284,6 +1255,12 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Cannot set privilege %x.</source>
 <target>Nepavyksta nustatyti privilegijos %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Nepavyko sustabdyti sistemos į miegojimo veikseną.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Nepavyksta pakeisti proceso I/O prioritetų.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Nepavyksta perkelti %x į šiukšliadėžę!</target>
 
@@ -1302,14 +1279,38 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Nustatomos numatytos sinchronizavimo kryptys: Seni failai bus perrašyti naujesniais failais.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Tikrinamas šiukšliadėžės prieinamumas aplankui %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Perkeliamas failas %x į šiukšliadėžę</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Perkeliamas aplankas %x į šiukšliadėžę</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Perkeliama simbolinė nuoroda %x į šiukšliadėžę</target>
+
+<source>Deleting file %x</source>
+<target>Trinamas failas %x</target>
+
+<source>Deleting folder %x</source>
+<target>Trinamas aplankas %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Tinama simbolinė nuoroda %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Šiukšliadėžė nepasiekiama sekantiems keliams! Failai bus ištrinti visam laikui išskyrus:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Galite ignoruoti šią klaidą, kad laikyti aplanką tuščiu.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>Atitinkamas aplankas bus laikomas tuščiu.</target>
+
+<source>Cannot find the following folders:</source>
+<target>Nepavyksta rasti šių aplankų:</target>
 
-<source>Cannot find folder %x.</source>
-<target>Nepavyksta rasti aplanko %x.</target>
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Galite ignoruoti šią klaidą, kad kiekvienas aplankas būtų laikomas tuščiu.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Katalogai yra priklausomi! Būkite atsargūs nustatydami sinchronizavimo taisykles:</target>
@@ -1317,8 +1318,8 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Start comparison</source>
 <target>Pradėti palyginimą</target>
 
-<source>Preparing synchronization...</source>
-<target>Ruošiamas sinchronizavimas...</target>
+<source>Calculating sync directions...</source>
+<target>Apskaičiuojamos sinchrinizacijos kryptys...</target>
 
 <source>Conflict detected:</source>
 <target>Aptiktas konfliktas:</target>
@@ -1383,24 +1384,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Multiple...</source>
 <target>Keletas...</target>
 
-<source>Deleting file %x</source>
-<target>Trinamas failas %x</target>
-
-<source>Deleting folder %x</source>
-<target>Trinamas aplankas %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Tinama simbolinė nuoroda %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Perkeliamas failas %x į šiukšliadėžę</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Perkeliamas aplankas %x į šiukšliadėžę</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Perkeliama simbolinė nuoroda %x į šiukšliadėžę</target>
-
 <source>Moving file %x to %y</source>
 <target>Perkeliamas failas %x į %y</target>
 
@@ -1413,9 +1396,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Removing old versions...</source>
 <target>Šalinamos senos versijos...</target>
 
-<source>Creating file %x</source>
-<target>Kuriamas failas %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Kuriama simbolinė nuoroda %x</target>
 
@@ -1434,6 +1414,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Updating attributes of %x</source>
 <target>Atnaujinami atributai %x</target>
 
+<source>Cannot find %x.</source>
+<target>Nepavyksta rasti %x.</target>
+
 <source>Target folder %x already existing.</source>
 <target>Tikslo aplankas %x jau yra.</target>
 
@@ -1479,6 +1462,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Generating database...</source>
 <target>Generuojama duomenų bazė...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Kuriama vietos šėšėlinė kopija dėl %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Duomenų patikrinimo klaida: Šaltinio ir tikslo failas turi skirtingus turinius!</target>
 
diff --git a/BUILD/Languages/norwegian.lng b/BUILD/Languages/norwegian.lng
index 2b581ad7..c85b7f9f 100644
--- a/BUILD/Languages/norwegian.lng
+++ b/BUILD/Languages/norwegian.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Total tid:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target></target>
+
 <source>Show in Explorer</source>
 <target>Vis i utforsker</target>
 
@@ -61,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Fjern filterinnstillinger</target>
 
+<source>Copy</source>
+<target>Kopier</target>
+
+<source>Paste</source>
+<target></target>
+
 <source>Save as batch job</source>
 <target>Lagre som sammensatt oppgave</target>
 
@@ -160,9 +169,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Venter mens mappe er låst (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Kan ikke sette mappelås %x.</target>
-
 <source>Creating file %x</source>
 <target>Oppretter fil %x</target>
 
@@ -196,9 +202,6 @@
 <source>/sec</source>
 <target>/sekund</target>
 
-<source>Cannot find file %x.</source>
-<target>Kan ikke finne filen %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Filen %x inneholder en ugyldig innstilling.</target>
 
@@ -223,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Kan ikke lese følgende XML-elementer:</target>
 
+<source>Cannot find file %x.</source>
+<target>Kan ikke finne filen %x.</target>
+
 <source>&Open...</source>
 <target>&Åpne...</target>
 
@@ -456,8 +462,14 @@ Kommandoen utløses hvis:
 <source>&Advanced</source>
 <target>&Avansert</target>
 
-<source>&Check for new version</source>
-<target>&Se etter ny versjon</target>
+<source>&Check now</source>
+<target></target>
+
+<source>Check &automatically once a week</source>
+<target></target>
+
+<source>Check for new version</source>
+<target></target>
 
 <source>Compare</source>
 <target>Sammenlign</target>
@@ -603,8 +615,8 @@ er det samme
 <source><- Two way -></source>
 <target><- Toveis -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identifiser og spre endringer på begge sider ved å bruke en database. Slettinger, navneendringer og konflikter blir automatisk oppdaget.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target></target>
 
 <source>Mirror ->></source>
 <target>Speile ->></target>
@@ -642,15 +654,12 @@ er det samme
 <source>Versioning</source>
 <target>Versjonshåndtering</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Flytt tidsstemplede filer den valgte mappen</target>
+<source>Move files to user-defined folder</source>
+<target></target>
 
 <source>Naming convention:</source>
 <target>Navnekonvensjon:</target>
 
-<source>Configuration</source>
-<target>Innstilling</target>
-
 <source>Item exists on left side only</source>
 <target>Element eksisterer kun på venstre side</target>
 
@@ -729,8 +738,8 @@ Merk: Filnavn må være relative til basismapper!
 <source>Maximum</source>
 <target>Maksimum</target>
 
-<source>&Default</source>
-<target>&Standard</target>
+<source>&Clear</source>
+<target></target>
 
 <source>Fail-safe file copy</source>
 <target>Trygg filkopi</target>
@@ -759,6 +768,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Description</source>
 <target>Beskrivelse</target>
 
+<source>&Default</source>
+<target>&Standard</target>
+
 <source>Start synchronization</source>
 <target>Start synkronisering</target>
 
@@ -792,6 +804,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Overview</source>
 <target>Oversikt</target>
 
+<source>Configuration</source>
+<target>Innstilling</target>
+
 <source>Filter files</source>
 <target>Filtrer filer</target>
 
@@ -876,87 +891,45 @@ Merk: Filnavn må være relative til basismapper!
 <source>Configuration loaded!</source>
 <target>Innstilling lastet!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Skjul filer som bare finnes på venstre side</target>
-
 <source>Show files that exist on left side only</source>
 <target>Vis filer som bare finnes på venstre side</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Skjul filer som bare finnes på høyre side</target>
-
 <source>Show files that exist on right side only</source>
 <target>Vis filer som bare finnes på høyre side</target>
 
-<source>Hide files that are newer on left</source>
-<target>Skjul filer som er nyere til venstre</target>
-
 <source>Show files that are newer on left</source>
 <target>Vis filer som er nyere til venstre</target>
 
-<source>Hide files that are newer on right</source>
-<target>Skjul filer som er nyere til høyre</target>
-
 <source>Show files that are newer on right</source>
 <target>Vis filer som er nyere til høyre</target>
 
-<source>Hide files that are equal</source>
-<target>Skjul filer som er like</target>
-
 <source>Show files that are equal</source>
 <target>Vis filer som er like</target>
 
-<source>Hide files that are different</source>
-<target>Skjul filer som er forskjellige</target>
-
 <source>Show files that are different</source>
 <target>Vis filer som er forskjellige</target>
 
-<source>Hide conflicts</source>
-<target>Skjul konflikter</target>
-
 <source>Show conflicts</source>
 <target>Vis konflikter</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Skjul filer som blir opprettet på venstre side</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Vis filer som blir opprettet på venstre side</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Skjul filer som blir opprettet på høyre side</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Vis filer som blir opprettet på høyre side</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Skjul filer som blir slettet på venstre side</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Vis filer som blir slettet på venstre side</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Skjul filer som blir slettet på høyre side</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Vis filer som blir slettet på høyre side</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Skjul filer som blir overskrevet på venstre side</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Vis filer som blir overskrevet på venstre side</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Skjul filer som blir overskrevet på høyre side</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Vis filer som blir overskrevet på høyre side</target>
 
-<source>Hide files that won't be copied</source>
-<target>Skjul filer som ikke blir kopiert</target>
-
 <source>Show files that won't be copied</source>
 <target>Vis filer som ikke blir kopiert</target>
 
@@ -975,6 +948,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>File list exported!</source>
 <target>Filliste eksportert!</target>
 
+<source>Searching for program updates...</source>
+<target></target>
+
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
@@ -1008,6 +984,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>&Ignore</source>
 <target>&Ignorer</target>
 
+<source>Don't show this warning again</source>
+<target></target>
+
 <source>&Switch</source>
 <target>&Skift</target>
 
@@ -1026,9 +1005,6 @@ Merk: Filnavn må være relative til basismapper!
 <source>Comparing content...</source>
 <target>Sammenligner innhold...</target>
 
-<source>Copy</source>
-<target>Kopier</target>
-
 <source>Paused</source>
 <target>Pauset</target>
 
@@ -1111,26 +1087,23 @@ Merk: Filnavn må være relative til basismapper!
 <target>Gjør skjylte advarsler og dialoger synlige igjen?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
-<target>
-<pluralform>Vil du flytte det følgende objektet til papirkurven?</pluralform>
-<pluralform>Vil du flytte de følgende %x objekter til papirkurven?</pluralform>
-</target>
+<target></target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Vil du slette det følgende objektet?</pluralform>
-<pluralform>Vil du slette de følgende %x objekter?</pluralform>
-</target>
+<target></target>
 
 <source>Leave as unresolved conflict</source>
 <target>Etterlat som uløste konflikter</target>
 
+<source>Time stamp</source>
+<target></target>
+
 <source>Append a timestamp to each file name</source>
 <target>Legg til et tidsstempel til hvert filnavn</target>
 
@@ -1302,20 +1275,23 @@ Merk: Filnavn må være relative til basismapper!
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Papirkurv er ikke tilgjengelig for de følgende baner! Filer blir isteden slettet permanent:</target>
 
-<source>You can ignore this error to consider each folder as empty.</source>
-<target>Denne feilen kan ignoreres dersom mappen er tom.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target></target>
 
 <source>Cannot find the following folders:</source>
 <target>Kan ikke finne følgende mapper:</target>
 
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Denne feilen kan ignoreres dersom mappen er tom.</target>
+
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Mapper er avhengige av hverandre! Vær forsiktig når du setter opp synkroniseringsregler:</target>
 
 <source>Start comparison</source>
 <target>Start sammenligning</target>
 
-<source>Preparing synchronization...</source>
-<target>Forbereder synkronisering...</target>
+<source>Calculating sync directions...</source>
+<target></target>
 
 <source>Conflict detected:</source>
 <target>Konflikt oppdaget:</target>
@@ -1458,6 +1434,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Generating database...</source>
 <target>Oppretter database...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target></target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Dataverifiseringsfeil: Kilde- og målfil har forskjellig innhold!</target>
 
diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng
index 564db6dc..d39124b3 100644
--- a/BUILD/Languages/polish.lng
+++ b/BUILD/Languages/polish.lng
@@ -11,7 +11,7 @@
 <target>Wyszukiwanie katalogu %x...</target>
 
 <source>Items processed:</source>
-<target>Przetworzeone elementy:</target>
+<target>Przetworzone elementy:</target>
 
 <source>Items remaining:</source>
 <target>Pozostałe elementy:</target>
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Całkowity czas:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Nie można utworzyć blokady dla katalogu %x.</target>
+
 <source>Show in Explorer</source>
 <target>Wyświetl w Eksploratorze</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Błąd</target>
 
+<source>Selected variant:</source>
+<target>Określ wariant:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Określ alternatywne ustawienia porównywania</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Wyczyść ustawienia filtra</target>
 
+<source>Copy</source>
+<target>Kopiuj</target>
+
+<source>Paste</source>
+<target>Wklej</target>
+
 <source>Save as batch job</source>
 <target>Zapisz w trybie wsadowym</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Błąd krytyczny</target>
 
-<source>Windows Error Code %x:</source>
-<target>Błąd systemu Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Błąd systemu Linux %x:</target>
+<source>Error Code %x:</source>
+<target>Kod błędu %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Nie można określić położenia dowiązania symbolicznego %x.</target>
@@ -126,7 +135,7 @@
 </target>
 
 <source>Database file %x is incompatible.</source>
-<target>Plika bazy danych %x nie jest kompatybilny.</target>
+<target>Plik bazy danych %x nie jest kompatybilny.</target>
 
 <source>Initial synchronization:</source>
 <target>Wstępna synchronizacja:</target>
@@ -161,8 +170,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Blokada katalogu (%x), oczekiwanie...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Nie można utworzyć blokady katalogu %x.</target>
+<source>Creating file %x</source>
+<target>Tworzenie pliku %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -196,9 +205,6 @@
 <source>/sec</source>
 <target>/sekundę</target>
 
-<source>Cannot find file %x.</source>
-<target>Nie można znaleźć pliku %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Plik %x nie zawiera prawidłowej konfiguracji</target>
 
@@ -223,6 +229,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Nie można odczytać elementu XML:</target>
 
+<source>Cannot find file %x.</source>
+<target>Nie można znaleźć pliku %x.</target>
+
 <source>&Open...</source>
 <target>&Otwórz...</target>
 
@@ -456,24 +465,21 @@ Komenda jest wykonywana gdy:
 <source>&Advanced</source>
 <target>&Zaawansowane</target>
 
-<source>&Check for new version</source>
-<target>&Aktualizuj</target>
+<source>&Check now</source>
+<target>Spra&wdź teraz</target>
 
-<source>Compare</source>
-<target>Porównaj</target>
+<source>Check &automatically once a week</source>
+<target>Sprawdzaj &automatycznie raz w tygodniu</target>
 
-<source>Compare both sides</source>
-<target>Porównaj foldery</target>
+<source>Check for new version</source>
+<target>Sprawdź dostępność aktualizacji</target>
 
-<source>&Abort</source>
-<target>&Przerwij</target>
+<source>Compare</source>
+<target>Porównaj</target>
 
 <source>Synchronize</source>
 <target>Synchronizuj</target>
 
-<source>Start synchronization</source>
-<target>Rozpocznij synchronizację</target>
-
 <source>Add folder pair</source>
 <target>Dodaj katalogi do porównania</target>
 
@@ -483,15 +489,6 @@ Komenda jest wykonywana gdy:
 <source>Swap sides</source>
 <target>Zamień stronami</target>
 
-<source>Open</source>
-<target>Otwórz</target>
-
-<source>Save</source>
-<target>Zapisz</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Ostatnio użyta konfiguracja (naciśnij DEL żeby usunąć z listy)</target>
-
 <source>Hide excluded items</source>
 <target>Ukryj wykluczone elementy</target>
 
@@ -522,6 +519,18 @@ Komenda jest wykonywana gdy:
 <source>Time elapsed:</source>
 <target>Szacowany czas:</target>
 
+<source>Synchronizing...</source>
+<target>Synchronizuję...</target>
+
+<source>On completion</source>
+<target>Po zakończeniu</target>
+
+<source>Close</source>
+<target>Zamknij</target>
+
+<source>&Pause</source>
+<target>&Pauza</target>
+
 <source>Batch job</source>
 <target>Plik wsadowy</target>
 
@@ -552,9 +561,6 @@ Komenda jest wykonywana gdy:
 <source>Abort synchronization on first error</source>
 <target>Zakończ synchronizację przy pierwszym błędzie</target>
 
-<source>On completion</source>
-<target>Po zakończeniu</target>
-
 <source>Show progress dialog</source>
 <target>Pokaż okno postępu</target>
 
@@ -612,8 +618,8 @@ jest identyczna
 <source><- Two way -></source>
 <target><- Obustronna -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Znajdź i zastosuj zmiany po obu stronach przy pomocy bazy danych. Usunięnia, zmiany nazwy plików oraz konflikty są usuwane automatycznie.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Wyszukaj oraz zastosuj zmiany po obu stronach. Wszystkie operacje na plikach takie jak usunięcia, zmiany oraz konflikty wykrywane są automatycznie przy użyciu bazy danych.</target>
 
 <source>Mirror ->></source>
 <target>Lustrzana ->></target>
@@ -651,15 +657,12 @@ jest identyczna
 <source>Versioning</source>
 <target>Wersjonowanie</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Pliki wersji oznaczone datą przenieś do określonego katalogu</target>
+<source>Move files to user-defined folder</source>
+<target>Przenieś pliki do katalogu wskazanego przez użytkownika</target>
 
 <source>Naming convention:</source>
 <target>Konwencja nazewnictwa:</target>
 
-<source>Configuration</source>
-<target>Konfiguracja</target>
-
 <source>Item exists on left side only</source>
 <target>Element istnieje tylko po lewej stronie</target>
 
@@ -678,12 +681,6 @@ jest identyczna
 <source>Conflict/item cannot be categorized</source>
 <target>Konflikt/element nie może zostać skategoryzowany</target>
 
-<source>Synchronizing...</source>
-<target>Synchronizuję...</target>
-
-<source>&Pause</source>
-<target>&Pauza</target>
-
 <source>Source code written in C++ using:</source>
 <target>Kod stworzony w C++ z wykorzystaniem:</target>
 
@@ -744,8 +741,8 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Maximum</source>
 <target>Maksimum</target>
 
-<source>&Default</source>
-<target>&Domyślne</target>
+<source>&Clear</source>
+<target>W&yczyść</target>
 
 <source>Fail-safe file copy</source>
 <target>Bezpieczne kopiowanie</target>
@@ -774,6 +771,12 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Description</source>
 <target>Opis</target>
 
+<source>&Default</source>
+<target>&Domyślne</target>
+
+<source>Start synchronization</source>
+<target>Rozpocznij synchronizację</target>
+
 <source>Variant</source>
 <target>Wariant</target>
 
@@ -804,12 +807,24 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Overview</source>
 <target>Przegląd</target>
 
+<source>Configuration</source>
+<target>Konfiguracja</target>
+
 <source>Filter files</source>
 <target>Filtruj pliki</target>
 
 <source>Select view</source>
 <target>Określ widok</target>
 
+<source>Open...</source>
+<target>Otwórz...</target>
+
+<source>Save</source>
+<target>Zapisz</target>
+
+<source>Compare both sides</source>
+<target>Porównaj foldery</target>
+
 <source>Set direction:</source>
 <target>Kierunek  synchronizacji:</target>
 
@@ -867,102 +882,63 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>FreeFileSync batch</source>
 <target>Plik wsadowy FreeFileSync</target>
 
-<source>Never save changes</source>
-<target>Nigdy nie zapisuj zmian</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Czy chcesz zapisać zmiany w %x?</target>
 
 <source>Do&n't save</source>
 <target>&Nie zapisuj</target>
 
+<source>Never save changes</source>
+<target>Nigdy nie zapisuj zmian</target>
+
 <source>Configuration loaded!</source>
 <target>Konfiguracja wczytana!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Ukryj pliki, które istnieją tylko po lewej stronie</target>
-
 <source>Show files that exist on left side only</source>
 <target>Pokaż pliki istniejące tylko po lewej stronie</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Ukryj pliki, które istnieją tylko po prawej stronie</target>
-
 <source>Show files that exist on right side only</source>
 <target>Pokaż pliki istniejące tylko po prawej stronie</target>
 
-<source>Hide files that are newer on left</source>
-<target>Ukryj pliki, które są nowsze po lewej stronie</target>
-
 <source>Show files that are newer on left</source>
 <target>Pokaż pliki nowsze po lewej stronie</target>
 
-<source>Hide files that are newer on right</source>
-<target>Ukryj pliki, które są nowsze po prawej stronie</target>
-
 <source>Show files that are newer on right</source>
 <target>Pokaż pliki nowsze po prawej stronie</target>
 
-<source>Hide files that are equal</source>
-<target>Ukryj pliki, które są równe</target>
-
 <source>Show files that are equal</source>
 <target>Pokaż pliki, które są równe</target>
 
-<source>Hide files that are different</source>
-<target>Ukryj pliki, które są różne</target>
-
 <source>Show files that are different</source>
 <target>Pokaż pliki, które się różnią</target>
 
-<source>Hide conflicts</source>
-<target>Ukryj konflikty</target>
-
 <source>Show conflicts</source>
 <target>Pokaż konflikty</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Ukryj pliki, które będą utworzone po lewej stronie</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Pokaż pliki, które będą utworzone po lewej stronie</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Ukryj pliki, które będą utworzone po prawej stronie</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Pokaż pliki, które będą utworzone po prawej stronie</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Ukryj pliki, które będą usunięte po lewej stronie</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Pokaż pliki, które będą usunięte po lewej stronie</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Ukryj pliki, które będą usunięte po lewej stronie</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Pokaż pliki, które będą usunięte po prawej stronie</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Ukryj pliki, które zostaną nadpisane po lewej stronie</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Pokaż pliki, które zostaną nadpisane po lewej stronie</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Ukryj pliki, które zostaną nadpisane po prawej stronie</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Pokaż pliki, które zostaną nadpisane po prawej stronie</target>
 
-<source>Hide files that won't be copied</source>
-<target>Ukryj pliki, które nie będą kopiowane</target>
-
 <source>Show files that won't be copied</source>
 <target>Pokaż pliki, które nie będą kopiowane</target>
 
+<source>Set as default</source>
+<target>Zapisz jako domyślne</target>
+
 <source>All folders are in sync!</source>
 <target>Wszystkie katalogi są zsynchronizowane!</target>
 
@@ -975,15 +951,8 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>File list exported!</source>
 <target>Lista plików wyeksportowana!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Obiekt pomyślnie usunięty!</pluralform>
-<pluralform>%x obiekty pomyślnie usunięte!</pluralform>
-<pluralform>%x pomyślnie usuniętych!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>Wyszukiwanie aktualizacji...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1021,6 +990,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>&Ignore</source>
 <target>&Ignoruj</target>
 
+<source>Don't show this warning again</source>
+<target>Nie pokazuj więcej tego ostrzeżenia</target>
+
 <source>&Switch</source>
 <target>&Zamień</target>
 
@@ -1039,9 +1011,6 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Comparing content...</source>
 <target>Porównywanie zawartości...</target>
 
-<source>Copy</source>
-<target>Kopiuj</target>
-
 <source>Paused</source>
 <target>Pauza</target>
 
@@ -1106,7 +1075,7 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <target>Kopiuj uprawnienia NTFS</target>
 
 <source>Integrate external applications into context menu. The following macros are available:</source>
-<target>Dołącz zewnętrzną aplikację do menu kontekstowego. Dostępne macra:</target>
+<target>Dołącz zewnętrzną aplikację do menu kontekstowego. Dostępne makra:</target>
 
 <source>- full file or folder name</source>
 <target>- pełna nazwa pliku lub katalogu</target>
@@ -1124,37 +1093,40 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <target>Przywrócić ukryte powiadomienia i dialogi?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Czy na pewno chcesz przenieś ten obiekt do kosza?</pluralform>
-<pluralform>Czy na pewno chcesz przenieś %x obiekty do kosza?</pluralform>
-<pluralform>Czy na pewno chcesz przenieś %x obiektów do kosza?</pluralform>
+<pluralform>Czy na pewno chcesz przenieść do kosza następujący element?</pluralform>
+<pluralform>Czy na pewno chcesz przenieść do kosza %x następujące elementy?</pluralform>
+<pluralform>Czy na pewno chcesz przenieść do kosza %x następujących elementów?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Czy na pewno chcesz usunuąc ten obiekt do kosza?</pluralform>
-<pluralform>Czy na pewno chcesz usunąc %x obiekty do kosza?</pluralform>
-<pluralform>Czy na pewno chcesz usunąć %x obiektów do kosza?</pluralform>
+<pluralform>Czy na pewno chcesz usunąć następujący element?</pluralform>
+<pluralform>Czy na pewno chcesz usunąć %x następujące elementy?</pluralform>
+<pluralform>Czy na pewno chcesz usunąć %x następujących elementów?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Zostaw jako nierozwiązany konflikt</target>
 
+<source>Time stamp</source>
+<target>Znacznik czasu</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Dołącz znacznik czasu do nazwy każdego pliku</target>
+
 <source>Replace</source>
 <target>Zamień</target>
 
 <source>Move files and replace if existing</source>
 <target>Przenieś pliki i nadpisz jeżeli już istnieją</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Dołącz znacznik czasu do nazwy każdego pliku</target>
-
 <source>Folder</source>
 <target>Katalog</target>
 
@@ -1167,6 +1139,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Files</source>
 <target>Pliki</target>
 
+<source>Items</source>
+<target></target>
+
 <source>Percentage</source>
 <target>Procentowo</target>
 
@@ -1272,6 +1247,12 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Cannot set privilege %x.</source>
 <target>Nie można ustawić uprawnień %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Program nie mógł wyłączyć trybu uśpienia systemu.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Nie można zmienić priorytetu I/O procesu.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Nie można przenieść %x do kosza!</target>
 
@@ -1290,14 +1271,38 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Ustawianie domyślnego kierunku synchronizacji: Stare pliki zostaną nadpisane nowszymi.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Sprawdzanie dostępności kosza dla katalogu %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Przenoszenie pliku %x do kosza</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Przenoszenie katalogu %x do kosza</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Przenoszenie dowiązania symbolicznego %x do kosza</target>
+
+<source>Deleting file %x</source>
+<target>Usuwanie pliku %x</target>
+
+<source>Deleting folder %x</source>
+<target>Usuwanie folderu %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Usuwanie dowiązania symbolicznego %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Kosz nie jest dostępny dla określonych ścieżek! Pliki zostaną nieodwracalnie usuniętę:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Możesz zignorować ten błąd traktując katalog jako pusty.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>Katalog będzie oznaczony jako pusty.</target>
 
-<source>Cannot find folder %x.</source>
-<target>Nie można znaleźć katalogu %x.</target>
+<source>Cannot find the following folders:</source>
+<target>Nie można znaleźć następujących katalogów:</target>
+
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Możesz zignorować ten błąd aby uznając katalogi jako puste.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Katalogi są zależne! Pamiętaj o tym podczas ustawiania zasad synchronizacji:</target>
@@ -1305,8 +1310,8 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Start comparison</source>
 <target>Rozpocznij porównywanie</target>
 
-<source>Preparing synchronization...</source>
-<target>Przygotowywanie synchronizacji...</target>
+<source>Calculating sync directions...</source>
+<target>Obliczanie kierunków synchronizacji...</target>
 
 <source>Conflict detected:</source>
 <target>Wykryto konflikt:</target>
@@ -1371,24 +1376,6 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Multiple...</source>
 <target>Wiele...</target>
 
-<source>Deleting file %x</source>
-<target>Usuwanie pliku %x</target>
-
-<source>Deleting folder %x</source>
-<target>Usuwanie folderu %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Usuwanie dowiązania symbolicznego %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Przenoszenie pliku %x do kosza</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Przenoszenie katalogu %x do kosza</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Przenoszenie dowiązania symbolicznego %x do kosza</target>
-
 <source>Moving file %x to %y</source>
 <target>Przenoszenie pliku %x do %y</target>
 
@@ -1401,9 +1388,6 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Removing old versions...</source>
 <target>Usuwanie starszych wersji...</target>
 
-<source>Creating file %x</source>
-<target>Tworzenie pliku %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Tworzenie dowiązania symbolicznego %x</target>
 
@@ -1422,6 +1406,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Updating attributes of %x</source>
 <target>Aktualizowanie atrybutów %x</target>
 
+<source>Cannot find %x.</source>
+<target>Nie można znaleźć %x.</target>
+
 <source>Target folder %x already existing.</source>
 <target>Katalog docelowy %x już istnieje.</target>
 
@@ -1467,6 +1454,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Generating database...</source>
 <target>Generowanie bazy danych...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Tworzenie Volume Shadow Copy dla %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Błąd weryfikacji danych: Plik źródłowy i docelowy różnią się zawartością!</target>
 
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index a187ff07..8fd451a1 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Tempo total:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Não é possível colocar o bloqueio de directório para %x.</target>
+
 <source>Show in Explorer</source>
 <target>Mostrar no Explorer</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Erro</target>
 
+<source>Selected variant:</source>
+<target>Variante selecionada:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Selecionar opções alternativas de comparação</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Limpar opções do filtro</target>
 
+<source>Copy</source>
+<target>Copiar</target>
+
+<source>Paste</source>
+<target>Colar</target>
+
 <source>Save as batch job</source>
 <target>Guardar como batch</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Erro crítico</target>
 
-<source>Windows Error Code %x:</source>
-<target>Código de erro do Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Código de erro do Linux %x:</target>
+<source>Error Code %x:</source>
+<target>Código de erro %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Não é possível resolver o link simbólico %x.</target>
@@ -160,8 +169,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Aguardar enquanto o directório é bloqueado (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Não é possível bloquear o directório %x.</target>
+<source>Creating file %x</source>
+<target>Criar ficheiro %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -193,9 +202,6 @@
 <source>/sec</source>
 <target>/seg</target>
 
-<source>Cannot find file %x.</source>
-<target>Não é possível encontrar o ficheiro %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Ficheiro %x não tem uma configuração válida.</target>
 
@@ -220,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Não é possível ler os elementos XML:</target>
 
+<source>Cannot find file %x.</source>
+<target>Não é possível encontrar o ficheiro %x.</target>
+
 <source>&Open...</source>
 <target>&Abrir...</target>
 
@@ -453,24 +462,21 @@ O comando é executado se:
 <source>&Advanced</source>
 <target>&Avançado</target>
 
-<source>&Check for new version</source>
-<target>&Procurar actualizações</target>
+<source>&Check now</source>
+<target>&Verificar agora</target>
 
-<source>Compare</source>
-<target>Comparar</target>
+<source>Check &automatically once a week</source>
+<target>Verificar &automaticamente uma vez por semana</target>
 
-<source>Compare both sides</source>
-<target>Comparar listas</target>
+<source>Check for new version</source>
+<target>Verificar se há nova versão</target>
 
-<source>&Abort</source>
-<target>&Abortar</target>
+<source>Compare</source>
+<target>Comparar</target>
 
 <source>Synchronize</source>
 <target>Sincronizar</target>
 
-<source>Start synchronization</source>
-<target>Iniciar a sincronização</target>
-
 <source>Add folder pair</source>
 <target>Adicionar um par de pastas</target>
 
@@ -480,15 +486,6 @@ O comando é executado se:
 <source>Swap sides</source>
 <target>Trocar lados</target>
 
-<source>Open</source>
-<target>Abrir</target>
-
-<source>Save</source>
-<target>Guardar</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Última configuração utilizada (pressione DEL para remover da lista)</target>
-
 <source>Hide excluded items</source>
 <target>Esconder itens excluídos</target>
 
@@ -519,6 +516,18 @@ O comando é executado se:
 <source>Time elapsed:</source>
 <target>Tempo decorrido</target>
 
+<source>Synchronizing...</source>
+<target>A sincronizar...</target>
+
+<source>On completion</source>
+<target>Ao terminar</target>
+
+<source>Close</source>
+<target>Fechar</target>
+
+<source>&Pause</source>
+<target>&Pausa</target>
+
 <source>Batch job</source>
 <target>Ficheiro Batch</target>
 
@@ -549,9 +558,6 @@ O comando é executado se:
 <source>Abort synchronization on first error</source>
 <target>Abortar sincronização ao primeiro erro</target>
 
-<source>On completion</source>
-<target>Ao terminar</target>
-
 <source>Show progress dialog</source>
 <target>Mostrar diálogo de progresso</target>
 
@@ -608,8 +614,8 @@ Os ficheiros são considerados iguais se
 <source><- Two way -></source>
 <target><- Duas vias -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identificar e propagar mudanças em ambos os lados utilizando base de dados. Itens eliminados, renomeados e conflitos são detetados automaticamente.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Identificar e propagar mudanças nos dois lados. Eliminações, cópias e conflitos são detectados automaticamente usando base de dados.</target>
 
 <source>Mirror ->></source>
 <target>Espelhar ->></target>
@@ -647,15 +653,12 @@ Os ficheiros são considerados iguais se
 <source>Versioning</source>
 <target>Manter versões anteriores</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Mover ficheiros datados para a pasta especificada</target>
+<source>Move files to user-defined folder</source>
+<target>Mover ficheiros para directório definido pelo utilizador</target>
 
 <source>Naming convention:</source>
 <target>Convenção de nomes:</target>
 
-<source>Configuration</source>
-<target>Configuração</target>
-
 <source>Item exists on left side only</source>
 <target>Item existe apenas à esquerda</target>
 
@@ -674,12 +677,6 @@ Os ficheiros são considerados iguais se
 <source>Conflict/item cannot be categorized</source>
 <target>Conflito/item não pode ser categorizado</target>
 
-<source>Synchronizing...</source>
-<target>A sincronizar...</target>
-
-<source>&Pause</source>
-<target>&Pausa</target>
-
 <source>Source code written in C++ using:</source>
 <target>Código fonte escrito em C++ utilizando:</target>
 
@@ -740,8 +737,8 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Maximum</source>
 <target>Máximo</target>
 
-<source>&Default</source>
-<target>&Config. Iniciais</target>
+<source>&Clear</source>
+<target>&Limpar</target>
 
 <source>Fail-safe file copy</source>
 <target>Cópia à prova de falhas</target>
@@ -770,6 +767,12 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Description</source>
 <target>Descrição</target>
 
+<source>&Default</source>
+<target>&Config. Iniciais</target>
+
+<source>Start synchronization</source>
+<target>Iniciar a sincronização</target>
+
 <source>Variant</source>
 <target>Variável</target>
 
@@ -800,12 +803,24 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Overview</source>
 <target>Vista</target>
 
+<source>Configuration</source>
+<target>Configuração</target>
+
 <source>Filter files</source>
 <target>Filtrar ficheiros</target>
 
 <source>Select view</source>
 <target>Selecionar vista</target>
 
+<source>Open...</source>
+<target>Abrir...</target>
+
+<source>Save</source>
+<target>Guardar</target>
+
+<source>Compare both sides</source>
+<target>Comparar listas</target>
+
 <source>Set direction:</source>
 <target>Escolher direcção:</target>
 
@@ -863,102 +878,63 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync batch</target>
 
-<source>Never save changes</source>
-<target>Nunca guardar alterações</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Deseja guardar as alterações a %x?</target>
 
 <source>Do&n't save</source>
 <target>Não g&uardar</target>
 
+<source>Never save changes</source>
+<target>Nunca guardar alterações</target>
+
 <source>Configuration loaded!</source>
 <target>Configuração carregada!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Ocultar ficheiros existentes somente à esquerda</target>
-
 <source>Show files that exist on left side only</source>
 <target>Mostrar ficheiros existentes somente à esquerda</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Ocultar ficheiros existentes somente à direita</target>
-
 <source>Show files that exist on right side only</source>
 <target>Mostrar ficheiros existentes somente à direita</target>
 
-<source>Hide files that are newer on left</source>
-<target>Ocultar ficheiros mais recentes à esquerda</target>
-
 <source>Show files that are newer on left</source>
 <target>Mostrar ficheiros mais recentes à esquerda</target>
 
-<source>Hide files that are newer on right</source>
-<target>Ocultar ficheiros mais recentes à direita</target>
-
 <source>Show files that are newer on right</source>
 <target>Mostrar ficheiros mais recentes à direita</target>
 
-<source>Hide files that are equal</source>
-<target>Ocultar ficheiros iguais</target>
-
 <source>Show files that are equal</source>
 <target>Mostrar ficheiros iguais</target>
 
-<source>Hide files that are different</source>
-<target>Ocultar ficheiros diferentes</target>
-
 <source>Show files that are different</source>
 <target>Mostrar ficheiros diferentes</target>
 
-<source>Hide conflicts</source>
-<target>Ocultar conflitos</target>
-
 <source>Show conflicts</source>
 <target>Mostrar conflitos</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Ocultar ficheiros a ser criados à esquerda</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Mostrar ficheiros a ser criados à esquerda</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Ocultar ficheiros a ser criados à direita</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Mostrar ficheiros a ser criados à direita</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Ocultar ficheiros a ser apagados à esquerda</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Mostrar ficheiros a ser apagados à esquerda</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Ocultar ficheiros a ser apagados à direita</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Mostrar ficheiros a ser apagados à direita</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Ocultar ficheiros a ser substituidos do lado esquerdo</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Mostrar ficheiros a ser substituidos do lado esquerdo</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Ocultar ficheiros a ser substituidos do lado direito</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Mostrar ficheiros a ser substituidos do lado direito</target>
 
-<source>Hide files that won't be copied</source>
-<target>Ocultar ficheiros que não serão copiados</target>
-
 <source>Show files that won't be copied</source>
 <target>Mostrar ficheiros que não serão copiados</target>
 
+<source>Set as default</source>
+<target>Definir como padrão</target>
+
 <source>All folders are in sync!</source>
 <target>Todas as pastas estão sincronizadas!</target>
 
@@ -971,14 +947,8 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>File list exported!</source>
 <target>Lista dos ficheiros exportada!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Objecto eliminado com sucesso!</pluralform>
-<pluralform>%x objectos eliminados com sucesso!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>A procurar actualizações do programa...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1013,6 +983,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>&Ignore</source>
 <target>&Ignorar</target>
 
+<source>Don't show this warning again</source>
+<target>Não mostrar este aviso novamente</target>
+
 <source>&Switch</source>
 <target>&Trocar</target>
 
@@ -1031,9 +1004,6 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Comparing content...</source>
 <target>A comparar...</target>
 
-<source>Copy</source>
-<target>Copiar</target>
-
 <source>Paused</source>
 <target>Em pausa</target>
 
@@ -1116,35 +1086,38 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <target>Tornar visiveis os diálogos e avisos escondidos novamente?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Deseja mesmo mover o objecto para a Reciclagem?</pluralform>
-<pluralform>Deseja mesmo mover os %x objectos para a Reciclagem?</pluralform>
+<pluralform>Deseja mesmo mover o seguinte item para a Reciclagem?</pluralform>
+<pluralform>Deseja mesmo mover os seguintes %x itens para a Reciclagem?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Deseja mesmo eliminar o seguinte objecto?</pluralform>
-<pluralform>Deseja mesmo eliminar os seguintes %x objectos?</pluralform>
+<pluralform>Deseja mesmo eliminar o seguinte item?</pluralform>
+<pluralform>Deseja mesmo eliminar os seguintes %x itens?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Deixar como conflito</target>
 
+<source>Time stamp</source>
+<target>Selo temporal</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Juntar selo temporal a cada nome de ficheiro</target>
+
 <source>Replace</source>
 <target>Substituir</target>
 
 <source>Move files and replace if existing</source>
 <target>Mover ficheiros e substituir se existirem</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Juntar selo temporal a cada nome de ficheiro</target>
-
 <source>Folder</source>
 <target>Pasta</target>
 
@@ -1259,6 +1232,12 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Cannot set privilege %x.</source>
 <target>Não é possível definir o privilégio %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Falha ao suspender o modo de hibernação do sistema.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Não é possível alterar as prioridades de E / S do processo.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Não é possível mover %x para a Reciclagem!</target>
 
@@ -1277,14 +1256,38 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Escolher direcção de sincronização por defeito: Os ficheiros antigos serão substituídos pelos novos.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>A verificar a disponibilidade da reciclagem para a pasta %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Mover ficheiro %x para a Reciclagem</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Mover pasta %x para a Reciclagem</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Mover link simbólico %x para a Reciclagem</target>
+
+<source>Deleting file %x</source>
+<target>Apagar ficheiro %x</target>
+
+<source>Deleting folder %x</source>
+<target>Apagar pasta %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Eliminar link simbólico %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Reciclagem não disponível para os seguintes caminhos! Os ficheiros serão apagados permanentemente:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Pode ignorar este erro para considerar a pasta como vazia.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>A pasta correspondente será considerada como vazia.</target>
 
-<source>Cannot find folder %x.</source>
-<target>Não consigo encontrar a pasta %x.</target>
+<source>Cannot find the following folders:</source>
+<target>Não é possível encontrar as seguintes pastas:</target>
+
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Pode ignorar este erro para considerar cada pasta como vazia.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Directórios são dependentes! Cuidado ao definir as regras de sincronização:</target>
@@ -1292,8 +1295,8 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Start comparison</source>
 <target>Iniciar comparação</target>
 
-<source>Preparing synchronization...</source>
-<target>A preparar sincronização...</target>
+<source>Calculating sync directions...</source>
+<target>A calcular a direcção de sincronização...</target>
 
 <source>Conflict detected:</source>
 <target>Conflito detectado:</target>
@@ -1358,24 +1361,6 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Multiple...</source>
 <target>Multiplo...</target>
 
-<source>Deleting file %x</source>
-<target>Apagar ficheiro %x</target>
-
-<source>Deleting folder %x</source>
-<target>Apagar pasta %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Eliminar link simbólico %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Mover ficheiro %x para a Reciclagem</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Mover pasta %x para a Reciclagem</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Mover link simbólico %x para a Reciclagem</target>
-
 <source>Moving file %x to %y</source>
 <target>Mover ficheiro %x para %y</target>
 
@@ -1388,9 +1373,6 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Removing old versions...</source>
 <target>A remover versões antigas...</target>
 
-<source>Creating file %x</source>
-<target>Criar ficheiro %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Criar link simbólico %x</target>
 
@@ -1409,6 +1391,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Updating attributes of %x</source>
 <target>Actualizar atributos de %x</target>
 
+<source>Cannot find %x.</source>
+<target>Não é possível encontrar %x.</target>
+
 <source>Target folder %x already existing.</source>
 <target>Directório de destino %x já existe.</target>
 
@@ -1454,6 +1439,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Generating database...</source>
 <target>A gerar base de dados...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>A criar Volume Shadow Copy para %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Erro na verificação de dados: ficheiro fonte e de destino têm conteúdo diferente!</target>
 
diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng
index 0d4c2246..8615e134 100644
--- a/BUILD/Languages/portuguese_br.lng
+++ b/BUILD/Languages/portuguese_br.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Tempo total:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Não foi possível travar o diretório %x.</target>
+
 <source>Show in Explorer</source>
 <target>Mostrar no Explorer</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Erro</target>
 
+<source>Selected variant:</source>
+<target>Modo selecionado:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Selecionar configurações alternativas de comparação</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Limpar configurações do filtro</target>
 
+<source>Copy</source>
+<target>Copiar</target>
+
+<source>Paste</source>
+<target>Colar</target>
+
 <source>Save as batch job</source>
 <target>Salvar como tarefa em lote</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Erro fatal</target>
 
-<source>Windows Error Code %x:</source>
-<target>Código de Erro do Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Código de Erro do Linux %x:</target>
+<source>Error Code %x:</source>
+<target>Código do Erro %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Não foi possível resolver o link simbólico %x.</target>
@@ -160,8 +169,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Esperando enquanto o diretório é bloqueado (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Não foi possível bloquear o diretório %x.</target>
+<source>Creating file %x</source>
+<target>Criando arquivo %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -193,9 +202,6 @@
 <source>/sec</source>
 <target>/seg</target>
 
-<source>Cannot find file %x.</source>
-<target>Não foi possível encontrar o aquivo %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>O arquivo %x não contém uma configuração válida.</target>
 
@@ -220,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Não foi possível ler os seguintes elementos XML:</target>
 
+<source>Cannot find file %x.</source>
+<target>Não foi possível localizar o aquivo %x.</target>
+
 <source>&Open...</source>
 <target>&Abrir...</target>
 
@@ -453,24 +462,21 @@ O comando é disparado se:
 <source>&Advanced</source>
 <target>&Avançado</target>
 
-<source>&Check for new version</source>
-<target>&Procurar novas versões</target>
+<source>&Check now</source>
+<target>&Verificar agora</target>
 
-<source>Compare</source>
-<target>Comparar</target>
+<source>Check &automatically once a week</source>
+<target>Verificar &automaticamente uma vez por semana</target>
 
-<source>Compare both sides</source>
-<target>Comparar os dois lados</target>
+<source>Check for new version</source>
+<target>&Verificar novas versões</target>
 
-<source>&Abort</source>
-<target>&Cancelar</target>
+<source>Compare</source>
+<target>Comparar</target>
 
 <source>Synchronize</source>
 <target>Sincronizar</target>
 
-<source>Start synchronization</source>
-<target>Iniciar a sincronização</target>
-
 <source>Add folder pair</source>
 <target>Adicionar um par de pastas</target>
 
@@ -480,15 +486,6 @@ O comando é disparado se:
 <source>Swap sides</source>
 <target>Inverter lados</target>
 
-<source>Open</source>
-<target>Abrir</target>
-
-<source>Save</source>
-<target>Salvar</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Últimas configurações usadas (pressione DEL para remover da lista)</target>
-
 <source>Hide excluded items</source>
 <target>Ocultar itens excluídos</target>
 
@@ -519,6 +516,18 @@ O comando é disparado se:
 <source>Time elapsed:</source>
 <target>Tempo decorrido:</target>
 
+<source>Synchronizing...</source>
+<target>Sincronizando...</target>
+
+<source>On completion</source>
+<target>Ao finalizar</target>
+
+<source>Close</source>
+<target>Fechar</target>
+
+<source>&Pause</source>
+<target>&Pausar</target>
+
 <source>Batch job</source>
 <target>Tarefa em lote</target>
 
@@ -549,9 +558,6 @@ O comando é disparado se:
 <source>Abort synchronization on first error</source>
 <target>Cancela sincronização no primeiro erro</target>
 
-<source>On completion</source>
-<target>Ao finalizar</target>
-
 <source>Show progress dialog</source>
 <target>Mostrar indicador de progresso</target>
 
@@ -609,8 +615,8 @@ Os arquivos são considerados iguais se
 <source><- Two way -></source>
 <target><- Dois sentidos -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identifica e propaga as mudanças em ambos os lados usando um banco de dados. Arquivos apagados, renomeados e conflitantes são detectados automaticamente.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Identifica e propaga as mudanças em ambos os lados. Arquivos e pastas apagados e/ou movidos e conflitos são detectados automaticamente usando um banco de dados.</target>
 
 <source>Mirror ->></source>
 <target>Espelhar ->></target>
@@ -643,20 +649,17 @@ Os arquivos são considerados iguais se
 <target>Lixeira</target>
 
 <source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Utilizar Lixeira para arquivos apagados ou sobrescritos</target>
+<target>Utiliza a Lixeira para arquivos apagados ou sobrescritos</target>
 
 <source>Versioning</source>
 <target>Controle de versões</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Move os arquivos com estampa de tempo para uma pasta especificada</target>
+<source>Move files to user-defined folder</source>
+<target>Move os arquivos para uma pasta definida pelo usuário</target>
 
 <source>Naming convention:</source>
 <target>Convenção de nomenclatura:</target>
 
-<source>Configuration</source>
-<target>Configuração</target>
-
 <source>Item exists on left side only</source>
 <target>Item existe apenas no lado esquerdo</target>
 
@@ -675,12 +678,6 @@ Os arquivos são considerados iguais se
 <source>Conflict/item cannot be categorized</source>
 <target>Conflito/item não pode ser categorizado</target>
 
-<source>Synchronizing...</source>
-<target>Sincronizando...</target>
-
-<source>&Pause</source>
-<target>&Pausar</target>
-
 <source>Source code written in C++ using:</source>
 <target>Código-fonte escrito em C++ utilizando:</target>
 
@@ -741,8 +738,8 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Maximum</source>
 <target>Máximo</target>
 
-<source>&Default</source>
-<target>&Config. Padrão</target>
+<source>&Clear</source>
+<target>&Limpar</target>
 
 <source>Fail-safe file copy</source>
 <target>Cópia de arquivos a prova de falhas</target>
@@ -771,6 +768,12 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Description</source>
 <target>Descrição</target>
 
+<source>&Default</source>
+<target>&Config. Padrão</target>
+
+<source>Start synchronization</source>
+<target>Iniciar a sincronização</target>
+
 <source>Variant</source>
 <target>Modo</target>
 
@@ -801,12 +804,24 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Overview</source>
 <target>Parâmetros</target>
 
+<source>Configuration</source>
+<target>Configuração</target>
+
 <source>Filter files</source>
 <target>Filtrar arquivos</target>
 
 <source>Select view</source>
 <target>Selecionar visualização</target>
 
+<source>Open...</source>
+<target>Abrir...</target>
+
+<source>Save</source>
+<target>Salvar</target>
+
+<source>Compare both sides</source>
+<target>Comparar os dois lados</target>
+
 <source>Set direction:</source>
 <target>Configurar direção</target>
 
@@ -864,102 +879,63 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>FreeFileSync batch</source>
 <target>Tarefa em lote do FreeFileSync</target>
 
-<source>Never save changes</source>
-<target>Nunca salvar alterações</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Gostaria de salvar as alterações para %x?</target>
 
 <source>Do&n't save</source>
 <target>&Não salvar</target>
 
+<source>Never save changes</source>
+<target>Nunca salvar alterações</target>
+
 <source>Configuration loaded!</source>
 <target>Configuração carregada!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Ocultar arquivos que existem somente à esquerda</target>
-
 <source>Show files that exist on left side only</source>
 <target>Mostrar arquivos que existem somente à esquerda</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Ocultar arquivos que existem somente à direita</target>
-
 <source>Show files that exist on right side only</source>
 <target>Mostrar arquivos que existem somente à direita</target>
 
-<source>Hide files that are newer on left</source>
-<target>Ocultar arquivos que são mais recentes à esquerda</target>
-
 <source>Show files that are newer on left</source>
 <target>Mostrar arquivos que são mais recentes à esquerda</target>
 
-<source>Hide files that are newer on right</source>
-<target>Ocultar arquivos que são mais recentes à direita</target>
-
 <source>Show files that are newer on right</source>
 <target>Mostrar arquivos que são mais recentes à direita</target>
 
-<source>Hide files that are equal</source>
-<target>Ocultar arquivos que são iguais</target>
-
 <source>Show files that are equal</source>
 <target>Mostrar arquivos que são iguais</target>
 
-<source>Hide files that are different</source>
-<target>Ocultar arquivos que são diferentes</target>
-
 <source>Show files that are different</source>
 <target>Mostrar arquivos que são diferentes</target>
 
-<source>Hide conflicts</source>
-<target>Ocultar conflitos</target>
-
 <source>Show conflicts</source>
 <target>Mostrar conflitos</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Ocultar arquivos que serão criados no lado esquerdo</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Mostrar arquivos que serão criados no lado esquerdo</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Ocultar arquivos que serão criados no lado direito</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Mostrar arquivos que serão criados no lado direito</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Ocultar arquivos que serão apagados no lado esquerdo</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Mostrar arquivos que serão apagados no lado esquerdo</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Ocultar arquivos que serão apagados no lado direito</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Mostrar arquivos que serão apagados no lado direito</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Ocultar arquivos que serão substituídos no lado esquerdo</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Mostrar arquivos que serão substituídos no lado esquerdo</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Ocultar arquivos que serão substituídos no lado direito</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Mostrar arquivos que serão substituídos no lado direito</target>
 
-<source>Hide files that won't be copied</source>
-<target>Ocultar arquivos que não serão copiados</target>
-
 <source>Show files that won't be copied</source>
 <target>Mostrar arquivos que não serão copiados</target>
 
+<source>Set as default</source>
+<target>Definir como padrão</target>
+
 <source>All folders are in sync!</source>
 <target>Todas as pastas estão sincronizadas!</target>
 
@@ -972,14 +948,8 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>File list exported!</source>
 <target>Lista de arquivos exportada!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Objeto apagado com sucesso!</pluralform>
-<pluralform>%x objetos apagados com sucesso!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>Procurando atualizações do programa...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1014,6 +984,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>&Ignore</source>
 <target>&Ignorar</target>
 
+<source>Don't show this warning again</source>
+<target>Não mostrar este aviso novamente</target>
+
 <source>&Switch</source>
 <target>&Alterar</target>
 
@@ -1032,9 +1005,6 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Comparing content...</source>
 <target>Comparando conteúdo...</target>
 
-<source>Copy</source>
-<target>Copiar</target>
-
 <source>Paused</source>
 <target>Pausado</target>
 
@@ -1057,7 +1027,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <target>Ver Log</target>
 
 <source>Cannot find %x</source>
-<target>Não foi possível encontrar %x</target>
+<target>Não foi possível localizar %x</target>
 
 <source>Inactive</source>
 <target>Inativo</target>
@@ -1117,35 +1087,38 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <target>Tornar avisar e diálogos ocultados visíveis outra vez?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Você tem certeza que deseja mover o seguinte objeto para a Lixeira?</pluralform>
-<pluralform>Você tem certeza que deseja mover os seguintes %x objetos para a Lixeira?</pluralform>
+<pluralform>Você realmente quer mover o seguinte item para a Lixeira?</pluralform>
+<pluralform>Você realmente quer mover os seguintes %x itens para a Lixeira?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Você tem certeza que deseja apagar o seguinte objeto?</pluralform>
-<pluralform>Você tem certeza que deseja apagar os seguintes %x objetos?</pluralform>
+<pluralform>Você realmente quer apagar o seguinte item?</pluralform>
+<pluralform>Você realmente quer apagar os seguintes %x itens?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Deixar como conflito não resolvido</target>
 
+<source>Time stamp</source>
+<target>Estampa de tempo</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Atribuir uma estampa de tempo para cada nome de arquivo</target>
+
 <source>Replace</source>
 <target>Substituir</target>
 
 <source>Move files and replace if existing</source>
 <target>Move arquivos e substitui se existente</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Atribuir uma estampa de tempo para cada nome de arquivo</target>
-
 <source>Folder</source>
 <target>Pasta</target>
 
@@ -1158,6 +1131,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Files</source>
 <target>Arquivos</target>
 
+<source>Items</source>
+<target></target>
+
 <source>Percentage</source>
 <target>Percentual</target>
 
@@ -1186,7 +1162,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <target>Não foi possível escrever a data de modificação de %x.</target>
 
 <source>Cannot find system function %x.</source>
-<target>Não foi possível encontrar a função de sistema %x.</target>
+<target>Não foi possível localizar a função de sistema %x.</target>
 
 <source>Cannot read security context of %x.</source>
 <target>Não foi possível ler o contexto de segurança de %x.</target>
@@ -1219,7 +1195,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <target>Não foi possível enumerar o diretório %x.</target>
 
 <source>Detected endless directory recursion.</source>
-<target>Detectada recursão de diretório infinita.</target>
+<target>Recursão de diretório infinita detectada.</target>
 
 <source>%x TB</source>
 <target>%x TB</target>
@@ -1260,6 +1236,12 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Cannot set privilege %x.</source>
 <target>Não foi possível estabelecer o privilégio %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Falha ao suspender o modo de espera do sistema.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Não foi possível mudar a prioridade de E/S do processo.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Não foi possível mover %x para a Lixeira!</target>
 
@@ -1278,14 +1260,38 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Configurando direções padrões de sincronização: Arquivos antigos serão substituídos por arquivos mais novos.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Verificando a disponibilidade da lixeira para a pasta %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Movendo arquivo %x para a lixeira</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Movendo pasta %x para a lixeira</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Movendo link simbólico %x para a lixeira</target>
+
+<source>Deleting file %x</source>
+<target>Apagando arquivo %x</target>
+
+<source>Deleting folder %x</source>
+<target>Apagando pasta %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Apagando link simbólico %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>A Lixeira não está disponível para os seguintes caminhos! Os arquivos serão apagados permanentemente:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Você pode ignorar este erro para considerar a pasta como vazia.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>A pasta correspondente será considerar como vazia.</target>
 
-<source>Cannot find folder %x.</source>
-<target>Não foi possível encontrar a pasta %x.</target>
+<source>Cannot find the following folders:</source>
+<target>Não foi possível localizar as seguintes pastas:</target>
+
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Você pode ignorar este erro para considerar cada pasta como vazia.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Os diretórios são dependentes! Cuidado ao definir as regras de sincronização:</target>
@@ -1293,8 +1299,8 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Start comparison</source>
 <target>Iniciar a comparação</target>
 
-<source>Preparing synchronization...</source>
-<target>Preparando sincronização...</target>
+<source>Calculating sync directions...</source>
+<target>Calculando as direções de sincronização...</target>
 
 <source>Conflict detected:</source>
 <target>Conflito detectado:</target>
@@ -1359,24 +1365,6 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Multiple...</source>
 <target>Múltiplo...</target>
 
-<source>Deleting file %x</source>
-<target>Apagando arquivo %x</target>
-
-<source>Deleting folder %x</source>
-<target>Apagando pasta %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Apagando link simbólico %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Movendo arquivo %x para a lixeira</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Movendo pasta %x para a lixeira</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Movendo link simbólico %x para a lixeira</target>
-
 <source>Moving file %x to %y</source>
 <target>Movendo arquivo %x para %y</target>
 
@@ -1389,9 +1377,6 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Removing old versions...</source>
 <target>Removendo versões antigas...</target>
 
-<source>Creating file %x</source>
-<target>Criando arquivo %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Criando link simbólico %x</target>
 
@@ -1410,6 +1395,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Updating attributes of %x</source>
 <target>Atualizando atributos de %x</target>
 
+<source>Cannot find %x.</source>
+<target>Não foi possível localizar %x.</target>
+
 <source>Target folder %x already existing.</source>
 <target>Pasta de destino %x já existe.</target>
 
@@ -1455,6 +1443,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Generating database...</source>
 <target>Gerando banco de dados...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Criando Cópia de Sombra de Volume para %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Erro de verificação de dados: Arquivo de origem e destino têm o mesmo conteúdo!</target>
 
diff --git a/BUILD/Languages/romanian.lng b/BUILD/Languages/romanian.lng
index a0370f4d..e34b40d0 100644
--- a/BUILD/Languages/romanian.lng
+++ b/BUILD/Languages/romanian.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Timp Total:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Nu pot face zăvorîrea dosarului %x.</target>
+
 <source>Show in Explorer</source>
 <target>Arată în Exploratorul de File</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Eroare</target>
 
+<source>Selected variant:</source>
+<target>Varianta selectată:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Selectează setările alternative de comparare</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Curăță Setările Filtrului</target>
 
+<source>Copy</source>
+<target>Copiază</target>
+
+<source>Paste</source>
+<target>Lipește</target>
+
 <source>Save as batch job</source>
 <target>Salvează ca Sarcină Set</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Eroare Fatală</target>
 
-<source>Windows Error Code %x:</source>
-<target>Codul Erorii Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Codul Erorii Linux %x:</target>
+<source>Error Code %x:</source>
+<target>Cod de Eroare %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Nu pot rezolva legătura simbolică %x.</target>
@@ -161,8 +170,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Aștept ca dosarul să fie zăvorît (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Nu pot seta zăvorîrea dosarului %x.</target>
+<source>Creating file %x</source>
+<target>Creez fila %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -196,9 +205,6 @@
 <source>/sec</source>
 <target>/sec</target>
 
-<source>Cannot find file %x.</source>
-<target>Nu pot găsi fila %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Fila %x nu conține o configurație validă.</target>
 
@@ -223,6 +229,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Nu pot citi următoarele elemente XML:</target>
 
+<source>Cannot find file %x.</source>
+<target>Nu pot găsi fila %x.</target>
+
 <source>&Open...</source>
 <target>&Deschide...</target>
 
@@ -456,24 +465,21 @@ Comanda este declanșată dacă:
 <source>&Advanced</source>
 <target>&Avansate</target>
 
-<source>&Check for new version</source>
-<target>&Caută Versiune Nouă a Softului</target>
+<source>&Check now</source>
+<target>&Caută Acum</target>
 
-<source>Compare</source>
-<target>Compară</target>
+<source>Check &automatically once a week</source>
+<target>Caută &Automat în Fiecare Săptămînă</target>
 
-<source>Compare both sides</source>
-<target>Compară Părțile Stîngă și Dreaptă</target>
+<source>Check for new version</source>
+<target>Caută Versiune Nouă</target>
 
-<source>&Abort</source>
-<target>&Anulează</target>
+<source>Compare</source>
+<target>Compară</target>
 
 <source>Synchronize</source>
 <target>Sincronizează</target>
 
-<source>Start synchronization</source>
-<target>Pornește Sincronizarea</target>
-
 <source>Add folder pair</source>
 <target>Adaugă Pereche Nouă de Dosare</target>
 
@@ -483,15 +489,6 @@ Comanda este declanșată dacă:
 <source>Swap sides</source>
 <target>Schimbă compartimentele stîng și drept între ele</target>
 
-<source>Open</source>
-<target>Deschide</target>
-
-<source>Save</source>
-<target>Salvează</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Ultimele configurații utilizate (apasă tasta DEL pentru a înlătura din listă)</target>
-
 <source>Hide excluded items</source>
 <target>Ascunde elementele excluse</target>
 
@@ -522,6 +519,18 @@ Comanda este declanșată dacă:
 <source>Time elapsed:</source>
 <target>Timp Scurs:</target>
 
+<source>Synchronizing...</source>
+<target>Sincronizare Aflată în Curs...</target>
+
+<source>On completion</source>
+<target>La Terminare</target>
+
+<source>Close</source>
+<target>Închide</target>
+
+<source>&Pause</source>
+<target>&Pauzează</target>
+
 <source>Batch job</source>
 <target>Sarcină Set</target>
 
@@ -552,9 +561,6 @@ Comanda este declanșată dacă:
 <source>Abort synchronization on first error</source>
 <target>Sincronizarea e abandonată la prima eroare</target>
 
-<source>On completion</source>
-<target>La Terminare</target>
-
 <source>Show progress dialog</source>
 <target>Arată progresul sincronizării</target>
 
@@ -612,8 +618,8 @@ este același
 <source><- Two way -></source>
 <target><= Bidirecțională =></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identificare și propagare a modificărilor din ambele părți folosind o bază de date. Ștergerile, renumirile și conflictele sînt detectate automat.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Identificare și propagare a modificărilor din ambele părți. Ștergerile, renumirile și conflictele sînt detectate automat, folosind o bază de date.</target>
 
 <source>Mirror ->></source>
 <target>Clonare =>></target>
@@ -651,15 +657,12 @@ este același
 <source>Versioning</source>
 <target>Versionare</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Filelor le este adăugat un marcaj de timp și apoi sînt mutate în dosarul specificat</target>
+<source>Move files to user-defined folder</source>
+<target>Mută filele în dosarul stabilit de utilizator</target>
 
 <source>Naming convention:</source>
 <target>Convenție de numire:</target>
 
-<source>Configuration</source>
-<target>Configurație</target>
-
 <source>Item exists on left side only</source>
 <target>Elementul există doar în partea stîngă</target>
 
@@ -678,12 +681,6 @@ este același
 <source>Conflict/item cannot be categorized</source>
 <target>Conflictul/elementul nu poate fi inclus într-o anumită categorie</target>
 
-<source>Synchronizing...</source>
-<target>Sincronizare Aflată în Curs...</target>
-
-<source>&Pause</source>
-<target>&Pauzează</target>
-
 <source>Source code written in C++ using:</source>
 <target>Cod sursă scris în C++ folosind:</target>
 
@@ -744,8 +741,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Maximum</source>
 <target>Maxim</target>
 
-<source>&Default</source>
-<target>Coloanele &Implicite</target>
+<source>&Clear</source>
+<target>&Curăță</target>
 
 <source>Fail-safe file copy</source>
 <target>Copiază filele în modul protejat la eșec [fail-safe]</target>
@@ -774,6 +771,12 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Description</source>
 <target>Descriere</target>
 
+<source>&Default</source>
+<target>Coloanele &Implicite</target>
+
+<source>Start synchronization</source>
+<target>Pornește Sincronizarea</target>
+
 <source>Variant</source>
 <target>Varianta Sincronizării</target>
 
@@ -804,12 +807,24 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Overview</source>
 <target>Panoramă</target>
 
+<source>Configuration</source>
+<target>Configurație</target>
+
 <source>Filter files</source>
 <target>Filtru</target>
 
 <source>Select view</source>
 <target>Selectează Vederea</target>
 
+<source>Open...</source>
+<target>Deschide...</target>
+
+<source>Save</source>
+<target>Salvează</target>
+
+<source>Compare both sides</source>
+<target>Compară Părțile Stîngă și Dreaptă</target>
+
 <source>Set direction:</source>
 <target>Setează Acțiunea ca în Icoana Alăturată:</target>
 
@@ -867,102 +882,63 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>FreeFileSync batch</source>
 <target>Set FreeFileSync</target>
 
-<source>Never save changes</source>
-<target>Nu salva niciodată modificările</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Vrei să salvezi modificările făcute la %x?</target>
 
 <source>Do&n't save</source>
 <target>&Nu salva</target>
 
+<source>Never save changes</source>
+<target>Nu salva niciodată modificările</target>
+
 <source>Configuration loaded!</source>
 <target>Configurație deschisă !</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Ascunde filele care există doar în stînga</target>
-
 <source>Show files that exist on left side only</source>
 <target>Arată filele care există doar în stînga</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Ascunde filele care există doar în dreapta</target>
-
 <source>Show files that exist on right side only</source>
 <target>Arată filele care există doar în dreapta</target>
 
-<source>Hide files that are newer on left</source>
-<target>Ascunde filele care sînt mai noi în stînga</target>
-
 <source>Show files that are newer on left</source>
 <target>Arată filele din stînga mai noi decît cele din dreapta</target>
 
-<source>Hide files that are newer on right</source>
-<target>Ascunde filele care sînt mai noi în dreapta</target>
-
 <source>Show files that are newer on right</source>
 <target>Arată filele din dreapta mai noi decît cele din stînga</target>
 
-<source>Hide files that are equal</source>
-<target>Ascunde elementele (file/dosare) identice</target>
-
 <source>Show files that are equal</source>
 <target>Arată elementele (file/dosare) identice</target>
 
-<source>Hide files that are different</source>
-<target>Ascunde elementele (file/dosare) care sînt diferite</target>
-
 <source>Show files that are different</source>
 <target>Arată elementele (file/dosare) diferite</target>
 
-<source>Hide conflicts</source>
-<target>Ascunde conflictele</target>
-
 <source>Show conflicts</source>
 <target>Arată conflictele</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Ascunde elementele (file/dosare) care vor fi create în stînga</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Arată elementele (file/dosare) care vor fi create în stînga</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Ascunde elementele (file/dosare) care vor fi create în dreapta</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Arată elementele (file/dosare) care vor fi create în dreapta</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Ascunde elementele (file/dosare) care vor fi șterse în stînga</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Arată elementele (file/dosare) care vor fi șterse în stînga</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Ascunde elementele (file/dosare) care vor fi șterse în dreapta</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Arată elementele (file/dosare) care vor fi șterse în dreapta</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Ascunde elementele (file/dosare) care vor fi suprascrise în stînga</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Arată elementele (file/dosare) care vor fi suprascrise în stînga</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Ascunde elementele (file/dosare) care vor fi suprascrise în dreapta</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Arată elementele (file/dosare) care vor fi suprascrise în dreapta</target>
 
-<source>Hide files that won't be copied</source>
-<target>Ascunde elementele (file/dosare) care nu vor fi copiate</target>
-
 <source>Show files that won't be copied</source>
 <target>Arată elementele (file/dosare) care nu vor fi copiate</target>
 
+<source>Set as default</source>
+<target>Setează ca implicit</target>
+
 <source>All folders are in sync!</source>
 <target>Toate dosarele sînt sincronizate!</target>
 
@@ -975,15 +951,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>File list exported!</source>
 <target>Lista de file a fost exportată!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Element șters cu succes!</pluralform>
-<pluralform>%x elemente șterse cu succes!</pluralform>
-<pluralform>%x de elemente șterse cu succes!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>Caut actualizări ale programului...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1021,6 +990,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>&Ignore</source>
 <target>&OK</target>
 
+<source>Don't show this warning again</source>
+<target>Nu arăta această atenționare din nou</target>
+
 <source>&Switch</source>
 <target>&Comută</target>
 
@@ -1039,9 +1011,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Comparing content...</source>
 <target>Compar conținutul...</target>
 
-<source>Copy</source>
-<target>Copiază</target>
-
 <source>Paused</source>
 <target>Sincronizare Pauzată</target>
 
@@ -1124,8 +1093,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <target>Vrei ca dialogurile ascunse și mesajele de avertizare să fie vizibile din nou?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
 <pluralform>Sigur vrei să muți în Reciclator elementul următor?</pluralform>
@@ -1134,8 +1103,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Sigur vrei să ștergi definitiv elementul următor?</pluralform>
@@ -1146,15 +1115,18 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Leave as unresolved conflict</source>
 <target>Lasă ca Conflict Nerezolvat</target>
 
+<source>Time stamp</source>
+<target>Marcaj Temporal</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Adaugă un marcaj temporal la numele fiecărei file</target>
+
 <source>Replace</source>
 <target>Înlocuiește</target>
 
 <source>Move files and replace if existing</source>
 <target>Mută filele și înlocuiește-le pe cele existente</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Adaugă un marcaj temporal la numele fiecărei file</target>
-
 <source>Folder</source>
 <target>Dosar</target>
 
@@ -1272,6 +1244,12 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Cannot set privilege %x.</source>
 <target>Nu pot seta privilegiul %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Nu pot suspenda intrarea sistemului în adormire (repaus).</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Nu pot schimba prioritățile I/O ale procesului.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Nu pot muta %x în Reciclator!</target>
 
@@ -1279,7 +1257,7 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <target>Ambele părți s-au modificat de la ultima sincronizare!</target>
 
 <source>Cannot determine sync-direction:</source>
-<target>Nu se poate determina sensul de sincronizare:</target>
+<target>Nu pot determina sensul de sincronizare:</target>
 
 <source>No change since last synchronization!</source>
 <target>Nu sînt schimbări de la ultima sincronizare!</target>
@@ -1290,14 +1268,38 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Baza de date existentă va fi făcută compatibilă cu versiunea softului și apoi va fi setat sensul implicit de sincronizare: Filele vechi vor fi suprascrise de cele noi.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Verific dacă Reciclatorul e disponibil pentru dosarul %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Mut fila %x în Reciclator</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Mut dosarul %x în Reciclator</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Mut legătura simbolică %x în Reciclator</target>
+
+<source>Deleting file %x</source>
+<target>Șterg fila %x</target>
+
+<source>Deleting folder %x</source>
+<target>Șterg dosarul %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Șterg legătura simbolică %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Reciclatorul nu este disponibil pentru căile următoare! Filele vor fi deci șterse definitiv:</target>
+<target>Reciclatorul nu este disponibil pentru căile următoare! Filele de acolo vor fi deci șterse definitiv:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Poți ignora această eroare dacă vrei ca dosarul să fie considerat gol.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>Dosarul corespondent va fi considerat ca fiind gol.</target>
 
-<source>Cannot find folder %x.</source>
-<target>Nu pot găsi dosarul %x.</target>
+<source>Cannot find the following folders:</source>
+<target>Nu pot găsi dosarele următoare:</target>
+
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Poți ignora această eroare dacă vrei ca dosarele din ambele părți să fie considerate goale.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Dosarele sînt interdependente! Atenție la setarea regulilor de sincronizare:</target>
@@ -1305,8 +1307,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Start comparison</source>
 <target>Pornește compararea</target>
 
-<source>Preparing synchronization...</source>
-<target>Pregătesc sincronizarea...</target>
+<source>Calculating sync directions...</source>
+<target>Calculez acțiunile de sincronizare...</target>
 
 <source>Conflict detected:</source>
 <target>Conflict detectat:</target>
@@ -1371,24 +1373,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Multiple...</source>
 <target>Multiplu...</target>
 
-<source>Deleting file %x</source>
-<target>Șterg fila %x</target>
-
-<source>Deleting folder %x</source>
-<target>Șterg dosarul %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Șterg legătura simbolică %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Mut fila %x în Reciclator</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Mut dosarul %x în Reciclator</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Mut legătura simbolică %x în Reciclator</target>
-
 <source>Moving file %x to %y</source>
 <target>Mut fila %x în %y</target>
 
@@ -1401,9 +1385,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Removing old versions...</source>
 <target>Înlătur versiunile vechi...</target>
 
-<source>Creating file %x</source>
-<target>Creez fila %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Creez legătura simbolică %x</target>
 
@@ -1422,6 +1403,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Updating attributes of %x</source>
 <target>Actualizez atributele lui %x</target>
 
+<source>Cannot find %x.</source>
+<target>Nu pot găsi %x.</target>
+
 <source>Target folder %x already existing.</source>
 <target>Dosarul țintă %x există deja.</target>
 
@@ -1435,7 +1419,7 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <target>Dosarul sursă %x nu a fost găsit.</target>
 
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
-<target>Elementele următoare au conflicte nerezolvate și nu vor fi sincronizate:</target>
+<target>Există conflicte nerezolvate la elementele listate mai jos, deci ele nu vor fi sincronizate:</target>
 
 <source>Significant difference detected:</source>
 <target>Diferență semnificativă detectată:</target>
@@ -1467,6 +1451,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Generating database...</source>
 <target>Generez baza de date...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Creez Conservare a Volumului [Volume Shadow Copy] pentru %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Eroare la verificarea datelor: Filele sursă și țintă au conținut diferit!</target>
 
diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng
index 7a3b93cf..2837a169 100644
--- a/BUILD/Languages/russian.lng
+++ b/BUILD/Languages/russian.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Общее время:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target></target>
+
 <source>Show in Explorer</source>
 <target>Показать в Проводнике</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Ошибка</target>
 
+<source>Selected variant:</source>
+<target></target>
+
 <source>Select alternate comparison settings</source>
 <target>Выбрать альтернативные настройки сравнения</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Очистить настройки фильтра</target>
 
+<source>Copy</source>
+<target>Копировать</target>
+
+<source>Paste</source>
+<target></target>
+
 <source>Save as batch job</source>
 <target>Сохранить как пакетное задание</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Критическая ошибка</target>
 
-<source>Windows Error Code %x:</source>
-<target>Код ошибки Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Код ошибки Linux %x:</target>
+<source>Error Code %x:</source>
+<target></target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Не удается разрешить символическую ссылку %x.</target>
@@ -161,8 +170,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Ожидание снятия блокировки с папки %x...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Не удается установить блокировку папка %x.</target>
+<source>Creating file %x</source>
+<target>Создание файла %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -196,9 +205,6 @@
 <source>/sec</source>
 <target>/с</target>
 
-<source>Cannot find file %x.</source>
-<target>Не удается найти файл %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Файл %x не содержит действительной конфигурации.</target>
 
@@ -223,6 +229,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Невозможно прочитать следующие XML элементы:</target>
 
+<source>Cannot find file %x.</source>
+<target>Не удается найти файл %x.</target>
+
 <source>&Open...</source>
 <target>&Открыть...</target>
 
@@ -456,24 +465,21 @@ The command is triggered if:
 <source>&Advanced</source>
 <target>&Дополнительно</target>
 
-<source>&Check for new version</source>
-<target>&Проверить наличие новой версии</target>
+<source>&Check now</source>
+<target></target>
 
-<source>Compare</source>
-<target>Сравнить</target>
+<source>Check &automatically once a week</source>
+<target></target>
 
-<source>Compare both sides</source>
-<target>Сравнить обе стороны</target>
+<source>Check for new version</source>
+<target></target>
 
-<source>&Abort</source>
-<target>&Отмена</target>
+<source>Compare</source>
+<target>Сравнить</target>
 
 <source>Synchronize</source>
 <target>Синхронизировать</target>
 
-<source>Start synchronization</source>
-<target>Начать синхронизацию</target>
-
 <source>Add folder pair</source>
 <target>Добавить пару папок</target>
 
@@ -483,18 +489,6 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>Поменять направление</target>
 
-<source>Open</source>
-<target>Открыть</target>
-
-<source>Save</source>
-<target>Сохранить</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>
-Последние использованные настройки синхронизации
-(нажмите DEL для удаления из списка)
-</target>
-
 <source>Hide excluded items</source>
 <target>Скрыть исключенные элементы</target>
 
@@ -525,6 +519,18 @@ The command is triggered if:
 <source>Time elapsed:</source>
 <target>Времени прошло:</target>
 
+<source>Synchronizing...</source>
+<target>Синхронизация...</target>
+
+<source>On completion</source>
+<target>По завершению</target>
+
+<source>Close</source>
+<target></target>
+
+<source>&Pause</source>
+<target>&Пауза</target>
+
 <source>Batch job</source>
 <target>Пакетное задание</target>
 
@@ -555,9 +561,6 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>Отменить синхронизацию при первой ошибке</target>
 
-<source>On completion</source>
-<target>По завершению</target>
-
 <source>Show progress dialog</source>
 <target>Показать окно прогресса</target>
 
@@ -610,8 +613,8 @@ is the same
 <source><- Two way -></source>
 <target><= В обе стороны =></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Выявление и распространение изменений на обе стороны, используя базу данных. Удаленные, переименованные и конфликтные файлы определяются автоматически.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target></target>
 
 <source>Mirror ->></source>
 <target>Зеркало =>></target>
@@ -649,15 +652,12 @@ is the same
 <source>Versioning</source>
 <target>Архивировать</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Переместить файлы с отметками времени в указанную папку</target>
+<source>Move files to user-defined folder</source>
+<target></target>
 
 <source>Naming convention:</source>
 <target>Условие:</target>
 
-<source>Configuration</source>
-<target>Настройки</target>
-
 <source>Item exists on left side only</source>
 <target>Элемент существует только на левой стороне</target>
 
@@ -676,12 +676,6 @@ is the same
 <source>Conflict/item cannot be categorized</source>
 <target>Конфликт/элемент не могут быть отнесены к какой-либо категории</target>
 
-<source>Synchronizing...</source>
-<target>Синхронизация...</target>
-
-<source>&Pause</source>
-<target>&Пауза</target>
-
 <source>Source code written in C++ using:</source>
 <target>Исходный код написан на C++ с использованием:</target>
 
@@ -742,8 +736,8 @@ Note: File names must be relative to base directories!
 <source>Maximum</source>
 <target>максимум</target>
 
-<source>&Default</source>
-<target>&По-умолчанию</target>
+<source>&Clear</source>
+<target></target>
 
 <source>Fail-safe file copy</source>
 <target>Отказоустойчивое копирование файла</target>
@@ -772,6 +766,12 @@ Note: File names must be relative to base directories!
 <source>Description</source>
 <target>Описание</target>
 
+<source>&Default</source>
+<target>&По-умолчанию</target>
+
+<source>Start synchronization</source>
+<target>Начать синхронизацию</target>
+
 <source>Variant</source>
 <target>Вариант</target>
 
@@ -802,12 +802,24 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>Главная</target>
 
+<source>Configuration</source>
+<target>Настройки</target>
+
 <source>Filter files</source>
 <target>Фильтр</target>
 
 <source>Select view</source>
 <target>Вид списка файлов</target>
 
+<source>Open...</source>
+<target></target>
+
+<source>Save</source>
+<target>Сохранить</target>
+
+<source>Compare both sides</source>
+<target>Сравнить обе стороны</target>
+
 <source>Set direction:</source>
 <target>Выберите направление:</target>
 
@@ -865,102 +877,63 @@ Note: File names must be relative to base directories!
 <source>FreeFileSync batch</source>
 <target>Пакетное задание FreeFileSync</target>
 
-<source>Never save changes</source>
-<target>Никогда не сохранять изменения</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Вы хотите сохранить изменения в %x?</target>
 
 <source>Do&n't save</source>
 <target>&Не сохранять</target>
 
+<source>Never save changes</source>
+<target>Никогда не сохранять изменения</target>
+
 <source>Configuration loaded!</source>
 <target>Настройки синхронизации загружены!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Скрыть файлы, существующие только слева</target>
-
 <source>Show files that exist on left side only</source>
 <target>Показать файлы, существующие только слева</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Скрыть файлы, существующие только справа</target>
-
 <source>Show files that exist on right side only</source>
 <target>Показать файлы, существующие только справа</target>
 
-<source>Hide files that are newer on left</source>
-<target>Скрыть файлы, которые новее слева</target>
-
 <source>Show files that are newer on left</source>
 <target>Показать файлы, которые новее слева</target>
 
-<source>Hide files that are newer on right</source>
-<target>Скрыть файлы, которые новее справа</target>
-
 <source>Show files that are newer on right</source>
 <target>Показать файлы, которые новее справа</target>
 
-<source>Hide files that are equal</source>
-<target>Скрыть одинаковые файлы</target>
-
 <source>Show files that are equal</source>
 <target>Показать одинаковые файлы</target>
 
-<source>Hide files that are different</source>
-<target>Скрыть различающиеся файлы</target>
-
 <source>Show files that are different</source>
 <target>Показать различающиеся файлы</target>
 
-<source>Hide conflicts</source>
-<target>Скрыть конфликтующие файлы</target>
-
 <source>Show conflicts</source>
 <target>Показать конфликтующие файлы</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Скрыть файлы, которые будут созданы на левой стороне</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Показать файлы, которые будут созданы на левой стороне</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Скрыть файлы, которые будут созданы на правой стороне</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Показать файлы, которые будут созданы на правой стороне</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Скрыть файлы, которые будут удалены на левой стороне</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Показать файлы, которые будут удалены на левой стороне</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Скрыть файлы, которые будут удалены на правой стороне</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Показать файлы, которые будут удалены на правой стороне</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Скрыть файлы, которые будут перезаписаны на левой стороне</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Показать файлы, которые будут перезаписаны на левой стороне</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Скрыть файлы, которые будут перезаписаны на правой стороне</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Показать файлы, которые будут перезаписаны на правой стороне</target>
 
-<source>Hide files that won't be copied</source>
-<target>Скрыть файлы, которые не будут скопированы</target>
-
 <source>Show files that won't be copied</source>
 <target>Показать файлы, которые не будут скопированы</target>
 
+<source>Set as default</source>
+<target></target>
+
 <source>All folders are in sync!</source>
 <target>Все папки синхронизированы!</target>
 
@@ -973,15 +946,8 @@ Note: File names must be relative to base directories!
 <source>File list exported!</source>
 <target>Список файлов экспортирован!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>%x объект удален успешно!</pluralform>
-<pluralform>%x объекта удалены успешно!</pluralform>
-<pluralform>%x объектов удалены успешно!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target></target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1019,6 +985,9 @@ Note: File names must be relative to base directories!
 <source>&Ignore</source>
 <target>&Игнорировать</target>
 
+<source>Don't show this warning again</source>
+<target></target>
+
 <source>&Switch</source>
 <target>&Переключить</target>
 
@@ -1037,9 +1006,6 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>Сравнение содержания...</target>
 
-<source>Copy</source>
-<target>Копировать</target>
-
 <source>Paused</source>
 <target>Пауза</target>
 
@@ -1125,37 +1091,32 @@ Note: File names must be relative to base directories!
 <target>Сделать скрытые предупреждения и диалоги видимыми снова?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
-<target>
-<pluralform>Вы точно хотите переместить следующий %x объект в "Корзину"?</pluralform>
-<pluralform>Вы точно хотите переместить следующие %x объекта в "Корзину"?</pluralform>
-<pluralform>Вы точно хотите переместить следующие %x объектов в "Корзину"?</pluralform>
-</target>
+<target></target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Вы точно хотите удалить следующий %x объект?</pluralform>
-<pluralform>Вы точно хотите удалить следующие %x объекта?</pluralform>
-<pluralform>Вы точно хотите удалить следующие %x объектов?</pluralform>
-</target>
+<target></target>
 
 <source>Leave as unresolved conflict</source>
 <target>Оставить как нерешенный конфликт</target>
 
+<source>Time stamp</source>
+<target></target>
+
+<source>Append a timestamp to each file name</source>
+<target>Добавить отметку времени для каждого имени файла</target>
+
 <source>Replace</source>
 <target>Переместить</target>
 
 <source>Move files and replace if existing</source>
 <target>Переместить файлы и заменить, если существуют</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Добавить отметку времени для каждого имени файла</target>
-
 <source>Folder</source>
 <target>Папка</target>
 
@@ -1273,6 +1234,12 @@ Note: File names must be relative to base directories!
 <source>Cannot set privilege %x.</source>
 <target>Не удается установить привелегии %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target></target>
+
+<source>Cannot change process I/O priorities.</source>
+<target></target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Невозможно переместить %x в "Корзину"!</target>
 
@@ -1294,14 +1261,38 @@ Note: File names must be relative to base directories!
 Старые файлы будут заменены более новыми файлами.
 </target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target></target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Перемещение файла %x в "Корзину"</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Перемещение папки %x в "Корзину"</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Перемещение символьной ссылки %x в "Корзину"</target>
+
+<source>Deleting file %x</source>
+<target>Удаление файла %x</target>
+
+<source>Deleting folder %x</source>
+<target>Удаление папки %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Удаление символьной ссылки %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Для этого пути "Корзина" не доступна! Файлы будут удалены безвозвратно:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Вы можете проигнорировать ошибку, приняв папку за пустую.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target></target>
 
-<source>Cannot find folder %x.</source>
-<target>Не удается найти папку %x.</target>
+<source>Cannot find the following folders:</source>
+<target></target>
+
+<source>You can ignore this error to consider each folder as empty.</source>
+<target></target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Зависимые папки! Будьте внимательны при настройке правил синхронизации:</target>
@@ -1309,8 +1300,8 @@ Note: File names must be relative to base directories!
 <source>Start comparison</source>
 <target>Начать сравнение</target>
 
-<source>Preparing synchronization...</source>
-<target>Подготовка к синхронизации...</target>
+<source>Calculating sync directions...</source>
+<target></target>
 
 <source>Conflict detected:</source>
 <target>Обнаружен конфликт:</target>
@@ -1375,24 +1366,6 @@ Note: File names must be relative to base directories!
 <source>Multiple...</source>
 <target>Различные варианты синхронизации</target>
 
-<source>Deleting file %x</source>
-<target>Удаление файла %x</target>
-
-<source>Deleting folder %x</source>
-<target>Удаление папки %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Удаление символьной ссылки %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Перемещение файла %x в "Корзину"</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Перемещение папки %x в "Корзину"</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Перемещение символьной ссылки %x в "Корзину"</target>
-
 <source>Moving file %x to %y</source>
 <target>Перемещение файла %x в %y</target>
 
@@ -1405,9 +1378,6 @@ Note: File names must be relative to base directories!
 <source>Removing old versions...</source>
 <target>Удаление старых версий...</target>
 
-<source>Creating file %x</source>
-<target>Создание файла %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Создание символьной ссылки %x</target>
 
@@ -1426,6 +1396,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>Обновление атрибутов %x</target>
 
+<source>Cannot find %x.</source>
+<target></target>
+
 <source>Target folder %x already existing.</source>
 <target>Целевая папка %x уже существует.</target>
 
@@ -1471,6 +1444,9 @@ Note: File names must be relative to base directories!
 <source>Generating database...</source>
 <target>Создание базы данных...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target></target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Ошибка проверки данных: исходный и конечный файлы имеют разное содержание!</target>
 
diff --git a/BUILD/Languages/scottish_gaelic.lng b/BUILD/Languages/scottish_gaelic.lng
index b3d635a6..0bfe3b64 100644
--- a/BUILD/Languages/scottish_gaelic.lng
+++ b/BUILD/Languages/scottish_gaelic.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>An ùine gu lèir:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Cha ghabh glas a' phasgain airson %x a shuidheachadh.</target>
+
 <source>Show in Explorer</source>
 <target>Seall san taisgealaiche</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Mearachd</target>
 
+<source>Selected variant:</source>
+<target>An t-eug-samhail a thagh thu:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Tagh roghainnean coimeasaidh eile</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Falamhaich roghainnean na criathraige</target>
 
+<source>Copy</source>
+<target>Dèan lethbhreac</target>
+
+<source>Paste</source>
+<target>Cuir ann</target>
+
 <source>Save as batch job</source>
 <target>Sàbhail mar obair baidse</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Mearachd mharbhtach</target>
 
-<source>Windows Error Code %x:</source>
-<target>Còd mearachd Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Còd mearachd Linux %x:</target>
+<source>Error Code %x:</source>
+<target>Còd na mearachd %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Cha ghabh an symbolic link %x fhuasgladh.</target>
@@ -162,8 +171,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>A' feitheamh fhad 's a tha am pasgan glaiste (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Cha ghabh glas a' phasgain %x a shuidheachadh.</target>
+<source>Creating file %x</source>
+<target>A' cruthachadh an fhaidhle %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -199,9 +208,6 @@
 <source>/sec</source>
 <target>/diog</target>
 
-<source>Cannot find file %x.</source>
-<target>Cha deach am faidhle %x a lorg.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Chan eil rèiteachadh dligheach san fhaidhle %x.</target>
 
@@ -226,6 +232,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Chan urrainn dhuinn na h-eileamaidean XML a leanas a leughadh:</target>
 
+<source>Cannot find file %x.</source>
+<target>Cha deach am faidhle %x a lorg.</target>
+
 <source>&Open...</source>
 <target>F&osgail...</target>
 
@@ -459,24 +468,21 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>&Advanced</source>
 <target>&Adhartach</target>
 
-<source>&Check for new version</source>
-<target>&Thoir sùil ach a bheil tionndadh nas ùire ann</target>
+<source>&Check now</source>
+<target>&Thoir sùil an-dràsta</target>
 
-<source>Compare</source>
-<target>Dèan coimeas</target>
+<source>Check &automatically once a week</source>
+<target>Thoir sùil gu &fèin-obrachail turas san t-seachdain</target>
 
-<source>Compare both sides</source>
-<target>Dèan coimeas air an dà thaobh</target>
+<source>Check for new version</source>
+<target>Thoir sùil ach a bheil tionndadh ùr ann</target>
 
-<source>&Abort</source>
-<target>&Sguir dheth</target>
+<source>Compare</source>
+<target>Dèan coimeas</target>
 
 <source>Synchronize</source>
 <target>Dèan sioncronachadh</target>
 
-<source>Start synchronization</source>
-<target>Tòisich air an t-sioncronachadh</target>
-
 <source>Add folder pair</source>
 <target>Cuir paidhir de phasgain ris</target>
 
@@ -486,15 +492,6 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Swap sides</source>
 <target>Cuir an dà thaobh an àite a chèile</target>
 
-<source>Open</source>
-<target>Fosgail</target>
-
-<source>Save</source>
-<target>Sàbhail</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>An rèiteachadh mu dheireadh a chaidh a chleachdadh (brùth DEL gus rudan a thoirt air falbh on liosta)</target>
-
 <source>Hide excluded items</source>
 <target>Falaich nithean a chaidh a dhùnadh às</target>
 
@@ -525,6 +522,18 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Time elapsed:</source>
 <target>An ùine a dh'fhalbh:</target>
 
+<source>Synchronizing...</source>
+<target>A' sioncronachadh...</target>
+
+<source>On completion</source>
+<target>Nuair a bhios e deiseil</target>
+
+<source>Close</source>
+<target>Dùin</target>
+
+<source>&Pause</source>
+<target>&Cuir 'na stad</target>
+
 <source>Batch job</source>
 <target>Obair baidse</target>
 
@@ -555,9 +564,6 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Abort synchronization on first error</source>
 <target>Sguir dhen t-sioncronachadh nuair a thachras a' chiad mhearachd</target>
 
-<source>On completion</source>
-<target>Nuair a bhios e deiseil</target>
-
 <source>Show progress dialog</source>
 <target>Seall còmhradh an adhartais</target>
 
@@ -614,8 +620,8 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 <source><- Two way -></source>
 <target><- An dà chomhair -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Lorg is cuir an sàs atharraichean air an dà thaobh le stòr-dàta. Mothaichear do rudan a chaidh sguabadh às, a chaidh ainmean ùra a thoirt orra no còmhstrithean gu fèin-obrachail.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Lorg is sìolaich na h-atharraichean air an dà thaobh. Mothaichidh sinn do rudan a chaidh a sguabadh às, a ghluasad no còmhstrithean gu fèin-obrachail le stòr-dàta.</target>
 
 <source>Mirror ->></source>
 <target>Sgàthanaich ->></target>
@@ -653,15 +659,12 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 <source>Versioning</source>
 <target>Versioning</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Gluais faidhlichean air a bheil stampa ama do phasgain shònraichte</target>
+<source>Move files to user-defined folder</source>
+<target>Gluais na faidhlichean dhan phasgan a shònraich an cleachdaiche</target>
 
 <source>Naming convention:</source>
 <target>Gnàthas nan ainmean:</target>
 
-<source>Configuration</source>
-<target>Rèiteachadh</target>
-
 <source>Item exists on left side only</source>
 <target>Chan eil an nì seo ann ach air an taobh chlì</target>
 
@@ -680,12 +683,6 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 <source>Conflict/item cannot be categorized</source>
 <target>Tha còmhstri/nì ann nach urrainn dhuinn aithneachadh</target>
 
-<source>Synchronizing...</source>
-<target>A' sioncronachadh...</target>
-
-<source>&Pause</source>
-<target>&Cuir 'na stad</target>
-
 <source>Source code written in C++ using:</source>
 <target>Chaidh an còd tùsail a sgrìobhadh ann an C++ le taic:</target>
 
@@ -746,8 +743,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Maximum</source>
 <target>Air a' char as motha</target>
 
-<source>&Default</source>
-<target>&Bun-roghainn</target>
+<source>&Clear</source>
+<target>Fala&mhaich</target>
 
 <source>Fail-safe file copy</source>
 <target>Dèan lethbhreac nach gabh fàilligeadh</target>
@@ -776,6 +773,12 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Description</source>
 <target>Tuairisgeul</target>
 
+<source>&Default</source>
+<target>&Bun-roghainn</target>
+
+<source>Start synchronization</source>
+<target>Tòisich air an t-sioncronachadh</target>
+
 <source>Variant</source>
 <target>Eugsamhail</target>
 
@@ -806,12 +809,24 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Overview</source>
 <target>Foir-shealladh</target>
 
+<source>Configuration</source>
+<target>Rèiteachadh</target>
+
 <source>Filter files</source>
 <target>Criathraich na faidhlichean</target>
 
 <source>Select view</source>
 <target>Tagh sealladh</target>
 
+<source>Open...</source>
+<target>Fosgail...</target>
+
+<source>Save</source>
+<target>Sàbhail</target>
+
+<source>Compare both sides</source>
+<target>Dèan coimeas air an dà thaobh</target>
+
 <source>Set direction:</source>
 <target>Suidhich a' chomhair:</target>
 
@@ -869,102 +884,63 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>FreeFileSync batch</source>
 <target>FreeFileSync batch</target>
 
-<source>Never save changes</source>
-<target>Na sàbhail atharraichean idir</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>An sàbhail sinn dhut na h-atharraichean air %x?</target>
 
 <source>Do&n't save</source>
 <target>&Na sàbhail</target>
 
+<source>Never save changes</source>
+<target>Na sàbhail atharraichean idir</target>
+
 <source>Configuration loaded!</source>
 <target>Chaidh an rèiteachadh a luchdadh!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Na falaich ach faidhlichean a tha air an taobh chlì a-mhàin</target>
-
 <source>Show files that exist on left side only</source>
 <target>Na seall ach faidhlichean a tha air an taobh chlì a-mhàin</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Na falaich ach faidhlichean a tha air an taobh deas a-mhàin</target>
-
 <source>Show files that exist on right side only</source>
 <target>Na seall ach faidhlichean a tha air an taobh deas a-mhàin</target>
 
-<source>Hide files that are newer on left</source>
-<target>Falaich faidhlichean a tha nas ùire air an taobh chlì</target>
-
 <source>Show files that are newer on left</source>
 <target>Seall faidhlichean a tha nas ùire air an taobh chlì</target>
 
-<source>Hide files that are newer on right</source>
-<target>Falaich faidhlichean a tha nas ùire air an taobh deas</target>
-
 <source>Show files that are newer on right</source>
 <target>Seall faidhlichean a tha nas ùire air an taobh deas</target>
 
-<source>Hide files that are equal</source>
-<target>Falaich faidhlichean a tha co-ionnann</target>
-
 <source>Show files that are equal</source>
 <target>Seall faidhlichean a tha co-ionnann</target>
 
-<source>Hide files that are different</source>
-<target>Falaich faidhlichean a tha eadar-dhealaichte</target>
-
 <source>Show files that are different</source>
 <target>Seall faidhlichean a tha eadar-dhealaichte</target>
 
-<source>Hide conflicts</source>
-<target>Falaich còmhstrithean</target>
-
 <source>Show conflicts</source>
 <target>Seall còmhstrithean</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Falaich faidhlichean a thèid a chruthachadh air an taobh chlì</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Seall faidhlichean a thèid a chruthachadh air an taobh chlì</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Falaich faidhlichean a thèid a chruthachadh air an taobh deas</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Seall faidhlichean a thèid a chruthachadh air an taobh deas</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Falaich faidhlichean a thèid a sguabadh às air an taobh chlì</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Seall faidhlichean a thèid a sguabadh às air an taobh chlì</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Falaich faidhlichean a thèid a sguabadh às air an taobh deas</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Seall faidhlichean a thèid a sguabadh às air an taobh deas</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Falaich faidhlichean a thèid a thar-sgrìobhadh air an taobh chlì</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Seall faidhlichean a thèid a thar-sgrìobhadh air an taobh chlì</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Falaich faidhlichean a thèid a thar-sgrìobhadh air an taobh deas</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Seall faidhlichean a thèid a thar-sgrìobhadh air an taobh deas</target>
 
-<source>Hide files that won't be copied</source>
-<target>Falaich faidhlichean nach dèid lethbhreac a dhèanamh dhiubh</target>
-
 <source>Show files that won't be copied</source>
 <target>Seall faidhlichean nach dèid lethbhreac a dhèanamh dhiubh</target>
 
+<source>Set as default</source>
+<target>Suidhich mar a' bhun-roghainn</target>
+
 <source>All folders are in sync!</source>
 <target>Tha gach pasgan air a shioncronachadh!</target>
 
@@ -977,16 +953,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>File list exported!</source>
 <target>Chaidh liosta nam faidhle às-phortadh!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Chaidh %x oibseact a sguabadh às!</pluralform>
-<pluralform>Chaidh %x oibseact a sguabadh às!</pluralform>
-<pluralform>Chaidh %x oibseactan a sguabadh às!</pluralform>
-<pluralform>Chaidh %x oibseact a sguabadh às!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>A' lorg ùrachaidhean a' phrògraim...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1027,6 +995,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>&Ignore</source>
 <target>&Leig seachad</target>
 
+<source>Don't show this warning again</source>
+<target>Na seall an rabhadh seo a-rithist</target>
+
 <source>&Switch</source>
 <target>&Dèan suids</target>
 
@@ -1045,9 +1016,6 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Comparing content...</source>
 <target>A' dèanamh coimeas eadar an cuid susbaint...</target>
 
-<source>Copy</source>
-<target>Dèan lethbhreac</target>
-
 <source>Paused</source>
 <target>'Na stad</target>
 
@@ -1130,39 +1098,42 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <target>A bheil thus airson na rabhaidhean 's còmraidhean falaichte fhaicinn a-rithist?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>A bheil thu cinnteach gu bheil thu airson an %x oibseact seo a chur dhan bhiona ath-chuairteachaidh?</pluralform>
-<pluralform>A bheil thu cinnteach gu bheil thu airson an %x oibseact seo a chur dhan bhiona ath-chuairteachaidh?</pluralform>
-<pluralform>A bheil thu cinnteach gu bheil thu airson na %x oibseactan seo a chur dhan bhiona ath-chuairteachaidh?</pluralform>
-<pluralform>A bheil thu cinnteach gu bheil thu airson na %x oibseact seo a chur dhan bhiona ath-chuairteachaidh?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an nì a leanas a chur dhan bhiona?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an %x nì a leanas a chur dhan bhiona?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson na %x nithean a leanas a chur dhan bhiona?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson na %x nì a leanas a chur dhan bhiona?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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 bheil thu cinnteach gu bheil thu airson an %x oibseact seo a sguabadh às?</pluralform>
-<pluralform>A bheil thu cinnteach gu bheil thu airson an %x oibseact seo a sguabadh às?</pluralform>
-<pluralform>A bheil thu cinnteach gu bheil thu airson na %x oibseactan seo a sguabadh às?</pluralform>
-<pluralform>A bheil thu cinnteach gu bheil thu airson na %x oibseact seo a sguabadh às?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airso an nì a leanas a sguabadh às?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airso an %x nì a leanas a sguabadh às?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airso na %x nithean a leanas a sguabadh às?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airso na %x nì a leanas a sguabadh às?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Fàg mar còmhstri gun rèiteachadh</target>
 
+<source>Time stamp</source>
+<target>Stampa ama</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Cuir stampa-ama ris ainm gach faidhle</target>
+
 <source>Replace</source>
 <target>Cuir 'na àite</target>
 
 <source>Move files and replace if existing</source>
 <target>Gluais na faidhlichean 's cuir iad an àite na feadhainn làithreach ma tha gin ann</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Cuir stampa-ama ris ainm gach faidhle</target>
-
 <source>Folder</source>
 <target>Pasgan</target>
 
@@ -1283,6 +1254,12 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Cannot set privilege %x.</source>
 <target>Cha ghabh a' phribhleid %x a shuidheachadh.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Cha b' urrainn dhuinn modh cadal an t-siostaim a chur dheth.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Chan urrainn dhuinn na prìomhachasan I/O atharrachadh.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Chan urrainn dhuinn %x a ghluasad dhan bhiona ath-chuairteachaidh!</target>
 
@@ -1301,14 +1278,38 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>A' suidheachadh comhair bhunaiteach an t-sioncronachaidh: Thèid faidhlichean nas ùire a sgrìobhadh thairis air seann-fhaidhlichean.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>A' toirt sùil a bheil am biona ri fhaighin airson a' phasgain %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>A' gluasad an fhaidhle %x dhan bhiona ath-chuairteachaidh</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>A' gluasad a' phasgain %x dhan bhiona ath-chuairteachaidh</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>A' gluasad an symbolic link %x dhan bhiona ath-chuairteachaidh</target>
+
+<source>Deleting file %x</source>
+<target>A' sguabadh às an fhaidhle %x</target>
+
+<source>Deleting folder %x</source>
+<target>A' sguabadh às a' phasgain %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>A' sguabadh às an symbolic link %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Chan eil am biona ath-chuairteachaidh ri làimh nan slighean a leanas! Thèid na faidhlichean a sguabhadh às gu buan an àite sin:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>'S urrainn dhut a' mhearachd seo a leigeil seachad gus am pasgan a làimhseachadh mar gum biodh e falamh.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>Thèid am pasgan a leanas a làimhseachadh mar phasgan falamh.</target>
 
-<source>Cannot find folder %x.</source>
-<target>Chan urrainn dhuinn am pasgan %x a lorg.</target>
+<source>Cannot find the following folders:</source>
+<target>Chan urrainn dhuinn na pasgain a leanas a lorg:</target>
+
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>'S urrainn dhut a' mhearachd seo a leigeil seachad airson 's gun dèid gach pasgan a làimhseachadh mar phasgan falamh.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Tha na pasgain an eisimeil a chèile! Bi faiceallach nuair a shuidhicheas tu na riaghailtean sioncronachaidh:</target>
@@ -1316,8 +1317,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Start comparison</source>
 <target>Dèan coimeas</target>
 
-<source>Preparing synchronization...</source>
-<target>Ag ullachadh an t-sioncronachaidh...</target>
+<source>Calculating sync directions...</source>
+<target>Ag àireamhachadh comhairean an t-sioncronachaidh...</target>
 
 <source>Conflict detected:</source>
 <target>Mhothaich sinn do chòmhstri:</target>
@@ -1382,24 +1383,6 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Multiple...</source>
 <target>Iomadh fear...</target>
 
-<source>Deleting file %x</source>
-<target>A' sguabadh às an fhaidhle %x</target>
-
-<source>Deleting folder %x</source>
-<target>A' sguabadh às a' phasgain %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>A' sguabadh às an symbolic link %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>A' gluasad an fhaidhle %x dhan bhiona ath-chuairteachaidh</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>A' gluasad a' phasgain %x dhan bhiona ath-chuairteachaidh</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>A' gluasad an symbolic link %x dhan bhiona ath-chuairteachaidh</target>
-
 <source>Moving file %x to %y</source>
 <target>A' gluasad an fhaidhle %x gu %y</target>
 
@@ -1412,9 +1395,6 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Removing old versions...</source>
 <target>A' toirt air falbh nan seann tionndaidhean...</target>
 
-<source>Creating file %x</source>
-<target>A' cruthachadh an fhaidhle %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>A' cruthachadh an symbolic link %x</target>
 
@@ -1433,6 +1413,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Updating attributes of %x</source>
 <target>Ag ùrachadh buadhan %x</target>
 
+<source>Cannot find %x.</source>
+<target>Cha ghabh %x a lorg.</target>
+
 <source>Target folder %x already existing.</source>
 <target>Tha am pasgan-uidhe %x ann mu thràth.</target>
 
@@ -1478,6 +1461,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Generating database...</source>
 <target>A' gintinn an stòir-dhàta...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>A' cruthachadh Volume Shadow Copy de %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Mearachd dearbhadh an dàta: Tha susbaint eadar-dhealaichte san fhaidhle tùsail is san targaid!</target>
 
diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index 4a916632..9a6ce1cf 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Celoten čas:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target></target>
+
 <source>Show in Explorer</source>
 <target>Prikaži v Raziskovalcu</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Napaka</target>
 
+<source>Selected variant:</source>
+<target></target>
+
 <source>Select alternate comparison settings</source>
 <target>Izberite alternativne nastavitve primerjanja</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Počisti nastavitve filtra</target>
 
+<source>Copy</source>
+<target>Kopiraj</target>
+
+<source>Paste</source>
+<target></target>
+
 <source>Save as batch job</source>
 <target>Shrani kot paketno opravilo</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Usodna napaka</target>
 
-<source>Windows Error Code %x:</source>
-<target>Windows koda napake %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux koda napake %x:</target>
+<source>Error Code %x:</source>
+<target></target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Ne morem razrešiti simbolične povezave %x.</target>
@@ -162,8 +171,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Čakam, medtem ko se zaklepa imenik (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Ne morem nastaviti zaklepanja imenika %x.</target>
+<source>Creating file %x</source>
+<target>Ustvarjam datoteko %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -199,9 +208,6 @@
 <source>/sec</source>
 <target>/sek</target>
 
-<source>Cannot find file %x.</source>
-<target>Ne morem najti datoteke %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Datoteka %x ne vsebuje veljavnih nastavitev</target>
 
@@ -226,6 +232,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Ne morem brati naslednje XML elemente:</target>
 
+<source>Cannot find file %x.</source>
+<target>Ne morem najti datoteke %x.</target>
+
 <source>&Open...</source>
 <target>&Odpri...</target>
 
@@ -459,24 +468,21 @@ Ukaz se sproži če:
 <source>&Advanced</source>
 <target>&Napredno</target>
 
-<source>&Check for new version</source>
-<target>&Preveri za novo različico</target>
+<source>&Check now</source>
+<target></target>
 
-<source>Compare</source>
-<target>Primerjaj</target>
+<source>Check &automatically once a week</source>
+<target></target>
 
-<source>Compare both sides</source>
-<target>Primerjaj obe strani</target>
+<source>Check for new version</source>
+<target></target>
 
-<source>&Abort</source>
-<target>&Prekini</target>
+<source>Compare</source>
+<target>Primerjaj</target>
 
 <source>Synchronize</source>
 <target>Sinhroniziraj</target>
 
-<source>Start synchronization</source>
-<target>Začni sinhronizacijo</target>
-
 <source>Add folder pair</source>
 <target>Dodaj par imenikov</target>
 
@@ -486,15 +492,6 @@ Ukaz se sproži če:
 <source>Swap sides</source>
 <target>Zamenjaj strani</target>
 
-<source>Open</source>
-<target>Odpri</target>
-
-<source>Save</source>
-<target>Shrani</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Zadnje uporabljene konfiguracije (pritisite DEL za odstranitev s seznama)</target>
-
 <source>Hide excluded items</source>
 <target>Skrij izključene predmete</target>
 
@@ -525,6 +522,18 @@ Ukaz se sproži če:
 <source>Time elapsed:</source>
 <target>Pretečeni čas:</target>
 
+<source>Synchronizing...</source>
+<target>Sinhroniziram...</target>
+
+<source>On completion</source>
+<target>Ob zaključku</target>
+
+<source>Close</source>
+<target></target>
+
+<source>&Pause</source>
+<target>&Premor</target>
+
 <source>Batch job</source>
 <target>Paketno opravilo</target>
 
@@ -555,9 +564,6 @@ Ukaz se sproži če:
 <source>Abort synchronization on first error</source>
 <target>Prekini sinhronizacijo ob prvi napaki</target>
 
-<source>On completion</source>
-<target>Ob zaključku</target>
-
 <source>Show progress dialog</source>
 <target>Prikazuj pogovorno okno z napredkom</target>
 
@@ -615,8 +621,8 @@ enaka
 <source><- Two way -></source>
 <target><- Obojesmerno -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identificiraj in promoviraj spremembe na obeh straneh z uporabo podatkovne baze. Izbrisi, preimenovanja in spori so samodejno zaznani.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target></target>
 
 <source>Mirror ->></source>
 <target>Zrcalno ->></target>
@@ -654,15 +660,12 @@ enaka
 <source>Versioning</source>
 <target>Ustvarjanje različič</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Premakni časovno-označene datoteke v določeno mapo</target>
+<source>Move files to user-defined folder</source>
+<target></target>
 
 <source>Naming convention:</source>
 <target>Konvencija poimenovanja:</target>
 
-<source>Configuration</source>
-<target>Konfiguracija</target>
-
 <source>Item exists on left side only</source>
 <target>Element obstaja samo na levi strani</target>
 
@@ -681,12 +684,6 @@ enaka
 <source>Conflict/item cannot be categorized</source>
 <target>Spor/element ne more biti kategoriziran</target>
 
-<source>Synchronizing...</source>
-<target>Sinhroniziram...</target>
-
-<source>&Pause</source>
-<target>&Premor</target>
-
 <source>Source code written in C++ using:</source>
 <target>Izvorna koda napisana v C++ z uporabo:</target>
 
@@ -747,8 +744,8 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Maximum</source>
 <target>Maksimum</target>
 
-<source>&Default</source>
-<target>&Privzeto</target>
+<source>&Clear</source>
+<target></target>
 
 <source>Fail-safe file copy</source>
 <target>Kopiranje datotek varno pred odpovedjo</target>
@@ -777,6 +774,12 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Description</source>
 <target>Opis</target>
 
+<source>&Default</source>
+<target>&Privzeto</target>
+
+<source>Start synchronization</source>
+<target>Začni sinhronizacijo</target>
+
 <source>Variant</source>
 <target>Različica</target>
 
@@ -807,12 +810,24 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Overview</source>
 <target>Pregled</target>
 
+<source>Configuration</source>
+<target>Konfiguracija</target>
+
 <source>Filter files</source>
 <target>Filtriraj datoteke</target>
 
 <source>Select view</source>
 <target>Izberite pogled</target>
 
+<source>Open...</source>
+<target></target>
+
+<source>Save</source>
+<target>Shrani</target>
+
+<source>Compare both sides</source>
+<target>Primerjaj obe strani</target>
+
 <source>Set direction:</source>
 <target>Nastavi smer:</target>
 
@@ -870,102 +885,63 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync paket</target>
 
-<source>Never save changes</source>
-<target>Nikoli ne shrani sprememb</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Ali želite shraniti spremembe v %x?</target>
 
 <source>Do&n't save</source>
 <target>Ne shra&ni</target>
 
+<source>Never save changes</source>
+<target>Nikoli ne shrani sprememb</target>
+
 <source>Configuration loaded!</source>
 <target>Konfiguracija naložena!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Skrij datoteke, ki obstajajo samo na levi strani</target>
-
 <source>Show files that exist on left side only</source>
 <target>Prikaži datoteke, ki obstajajo samo na levi</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Skrij datoteke, ki obstajajo samo na desni strani</target>
-
 <source>Show files that exist on right side only</source>
 <target>Prikaži datoteke, ki obstajajo samo na desni</target>
 
-<source>Hide files that are newer on left</source>
-<target>Skrij najnovejše datoteke na levi</target>
-
 <source>Show files that are newer on left</source>
 <target>Prikaži datoteke, ki so novejše na levi</target>
 
-<source>Hide files that are newer on right</source>
-<target>Skrij najnovejše datoteke na desni</target>
-
 <source>Show files that are newer on right</source>
 <target>Prikaži datoteke, ki so novejše na desni</target>
 
-<source>Hide files that are equal</source>
-<target>Skrij enake datoteke</target>
-
 <source>Show files that are equal</source>
 <target>Prikaži datoteke, ki so enake</target>
 
-<source>Hide files that are different</source>
-<target>Skrij datoteke ki so različne</target>
-
 <source>Show files that are different</source>
 <target>Prikaži datoteke, ki so različne</target>
 
-<source>Hide conflicts</source>
-<target>Skrij spore</target>
-
 <source>Show conflicts</source>
 <target>Prikaži spore</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Skrij datoteke, ki bodo ustvarjene na levi strani</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Prikaži datoteke, ki bodo ustvarjene na levi strani</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Skrij datoteke, ki bodo ustvarjene na desni strani</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Prikaži datoteke, ki bodo ustvarjene na desni strani</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Skrij datoteke, ki bodo izbrisane na levi strani</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Prikaži datoteke, ki bodo izbrisane na levi strani</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Skrij datoteke, ki bodo izbrisane na desni strani</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Prikaži datoteke, ki bodo izbrisane na desni strani</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Skrij datoteke, ki bodo prepisane na levi strani</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Prikaži datoteke, ki bodo prepisane na levi strani</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Skrij datoteke, ki bodo prepisane na desni strani</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Prikaži datoteke, ki bodo prepisane na desni strani</target>
 
-<source>Hide files that won't be copied</source>
-<target>Skrij datoteke, ki ne bodo kopirane</target>
-
 <source>Show files that won't be copied</source>
 <target>Prikaži datoteke, ki ne bodo kopirane</target>
 
+<source>Set as default</source>
+<target></target>
+
 <source>All folders are in sync!</source>
 <target>Vse mape so sinhronizirane!</target>
 
@@ -978,16 +954,8 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>File list exported!</source>
 <target>Seznam datotek je bil izvožen!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Objekt uspešno izbrisan!</pluralform>
-<pluralform>%x objekta uspešno izbrisana!</pluralform>
-<pluralform>%x objekti uspešno izbrisani!</pluralform>
-<pluralform>%x objektov uspešno izbrisanih!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target></target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1028,6 +996,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>&Ignore</source>
 <target>&Ignoriraj</target>
 
+<source>Don't show this warning again</source>
+<target></target>
+
 <source>&Switch</source>
 <target>&Preklopi</target>
 
@@ -1046,9 +1017,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Comparing content...</source>
 <target>Primerjam vsebino...</target>
 
-<source>Copy</source>
-<target>Kopiraj</target>
-
 <source>Paused</source>
 <target>Na premoru</target>
 
@@ -1131,39 +1099,32 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <target>Ponovno prikažem vsa skrita obvestila in pogovore?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
-<target>
-<pluralform>Ali resnično želite premakniti naslednji objekt v Koš?</pluralform>
-<pluralform>Ali resnično želite premakniti naslednja %x objekta v Koš?</pluralform>
-<pluralform>Ali resnično želite premakniti naslednje %x objekte v Koš?</pluralform>
-<pluralform>Ali resnično želite premakniti naslednjih %x objektov v Koš?</pluralform>
-</target>
+<target></target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Ali resnično želite izbrisati naslednji objekt?</pluralform>
-<pluralform>Ali resnično želite izbrisati naslednja %x objekta?</pluralform>
-<pluralform>Ali resnično želite izbrisati naslednje %x objekte?</pluralform>
-<pluralform>Ali resnično želite izbrisati naslednjih %x objektov?</pluralform>
-</target>
+<target></target>
 
 <source>Leave as unresolved conflict</source>
 <target>Pusti kot nerešeni spor</target>
 
+<source>Time stamp</source>
+<target></target>
+
+<source>Append a timestamp to each file name</source>
+<target>Dodaj časovno oznako k vsakemu imenu datoteke</target>
+
 <source>Replace</source>
 <target>Zamenjaj</target>
 
 <source>Move files and replace if existing</source>
 <target>Premakne datoteke in jih zamenja, če obstajajo</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Dodaj časovno oznako k vsakemu imenu datoteke</target>
-
 <source>Folder</source>
 <target>Mapa</target>
 
@@ -1284,6 +1245,12 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Cannot set privilege %x.</source>
 <target>Ne morem nastaviti privilegija %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target></target>
+
+<source>Cannot change process I/O priorities.</source>
+<target></target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Ne morem premakniti %x v Koš</target>
 
@@ -1302,14 +1269,38 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Nastavljanje privzetih smeri sinhronizacije: Stare datoteke bodo prepisane z novimi datotekami.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target></target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Premikam datoteko %x v koš</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Premikam mapo %x v koš</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Premikam simbolično povezavo %x v koš</target>
+
+<source>Deleting file %x</source>
+<target>Brisanje datoteke %x</target>
+
+<source>Deleting folder %x</source>
+<target>Brisanje mape %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Brisanje simboličnih povezav %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Koš ni na voljo za naslednje poti! Namesto tega bodo datoteke trajno izbrisane:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>To napako, da upoštevate mapo kot prazno, lahko ignorirate</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target></target>
+
+<source>Cannot find the following folders:</source>
+<target></target>
 
-<source>Cannot find folder %x.</source>
-<target>Ne morem najti mape %x.</target>
+<source>You can ignore this error to consider each folder as empty.</source>
+<target></target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Imeniki so v odvisnosti! Bodite pozorni, ko nastavljate sinhronizacijska pravila:</target>
@@ -1317,8 +1308,8 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Start comparison</source>
 <target>Začni primerjavo</target>
 
-<source>Preparing synchronization...</source>
-<target>Pripravljam sinhronizacijo...</target>
+<source>Calculating sync directions...</source>
+<target></target>
 
 <source>Conflict detected:</source>
 <target>Zaznan spor:</target>
@@ -1383,24 +1374,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Multiple...</source>
 <target>Večkratno...</target>
 
-<source>Deleting file %x</source>
-<target>Brisanje datoteke %x</target>
-
-<source>Deleting folder %x</source>
-<target>Brisanje mape %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Brisanje simboličnih povezav %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Premikam datoteko %x v koš</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Premikam mapo %x v koš</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Premikam simbolično povezavo %x v koš</target>
-
 <source>Moving file %x to %y</source>
 <target>Premikam datoteko %x v %y</target>
 
@@ -1413,9 +1386,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Removing old versions...</source>
 <target>Odstranjujem stare različice...</target>
 
-<source>Creating file %x</source>
-<target>Ustvarjam datoteko %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Ustvarjam simbolično povezavo %x</target>
 
@@ -1434,6 +1404,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Updating attributes of %x</source>
 <target>Posodabljam atribute od %x</target>
 
+<source>Cannot find %x.</source>
+<target></target>
+
 <source>Target folder %x already existing.</source>
 <target>Ciljna mapa %x že obstaja.</target>
 
@@ -1479,6 +1452,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Generating database...</source>
 <target>Ustvarjam podatkovno bazo...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target></target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Napaka pri preverjanju podatkov: izvorna in ciljna datoteka imata različno vsebino!</target>
 
diff --git a/BUILD/Languages/spanish.lng b/BUILD/Languages/spanish.lng
index 69caeef0..084477df 100644
--- a/BUILD/Languages/spanish.lng
+++ b/BUILD/Languages/spanish.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Tiempo total:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>No se pudo bloquear el directorio %x.</target>
+
 <source>Show in Explorer</source>
 <target>Mostrar en Explorer</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Error</target>
 
+<source>Selected variant:</source>
+<target>Seleccionar variante:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Seleccionar opciones alternativas de comparación</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Limpiar opciones del filtrado</target>
 
+<source>Copy</source>
+<target>Copiar</target>
+
+<source>Paste</source>
+<target>Pegar</target>
+
 <source>Save as batch job</source>
 <target>Salvar como tarea batch</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Error fatal</target>
 
-<source>Windows Error Code %x:</source>
-<target>Código de error de Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Código de error de Linux %x:</target>
+<source>Error Code %x:</source>
+<target>Error: %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>No se puede resolver el enlace simbólico %x.</target>
@@ -160,8 +169,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Esperando mientras el directorio se encuentre bloqueado (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>No se puede establecer el directorio de bloqueo %x</target>
+<source>Creating file %x</source>
+<target>Creando archivo %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -193,9 +202,6 @@
 <source>/sec</source>
 <target>/seg</target>
 
-<source>Cannot find file %x.</source>
-<target>No se puede encontrar el archivo %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>El archivo %x no contiene una configuración válida.</target>
 
@@ -220,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Incapaz de leer los siguientes elementos XML:</target>
 
+<source>Cannot find file %x.</source>
+<target>No se puede encontrar el archivo %x.</target>
+
 <source>&Open...</source>
 <target>&Abrir...</target>
 
@@ -453,24 +462,21 @@ El comando es disparado si::
 <source>&Advanced</source>
 <target>&Avanzado</target>
 
-<source>&Check for new version</source>
-<target>&Comprobar si existe una nueva versión</target>
+<source>&Check now</source>
+<target>&Comprobar ahora</target>
 
-<source>Compare</source>
-<target>Comparar</target>
+<source>Check &automatically once a week</source>
+<target>Comprobar automáticamente una vez a la  semana</target>
 
-<source>Compare both sides</source>
-<target>Comparar ambos lados</target>
+<source>Check for new version</source>
+<target>Comprobar nueva versión</target>
 
-<source>&Abort</source>
-<target>&Abortar</target>
+<source>Compare</source>
+<target>Comparar</target>
 
 <source>Synchronize</source>
 <target>Sincronizar</target>
 
-<source>Start synchronization</source>
-<target>Iniciar sincronización</target>
-
 <source>Add folder pair</source>
 <target>Añadir un par de carpetas</target>
 
@@ -480,15 +486,6 @@ El comando es disparado si::
 <source>Swap sides</source>
 <target>Intercambiar lados</target>
 
-<source>Open</source>
-<target>Abrir</target>
-
-<source>Save</source>
-<target>Guardar</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Últimas configuraciones usadas (Pulsar DEL para quitar de la lista)</target>
-
 <source>Hide excluded items</source>
 <target>Ocultar elementos excluidos</target>
 
@@ -519,6 +516,18 @@ El comando es disparado si::
 <source>Time elapsed:</source>
 <target>Tiempo transcurrido:</target>
 
+<source>Synchronizing...</source>
+<target>Sincronizando...</target>
+
+<source>On completion</source>
+<target>Al completar</target>
+
+<source>Close</source>
+<target>Cerrar</target>
+
+<source>&Pause</source>
+<target>&Pausa</target>
+
 <source>Batch job</source>
 <target>Tarea por lotes</target>
 
@@ -549,9 +558,6 @@ El comando es disparado si::
 <source>Abort synchronization on first error</source>
 <target>Abortar sincronización al primer error</target>
 
-<source>On completion</source>
-<target>Al completar</target>
-
 <source>Show progress dialog</source>
 <target>Mostrar diálogo de progreso</target>
 
@@ -609,8 +615,8 @@ es el mismo
 <source><- Two way -></source>
 <target><- Dos formas -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identificar y propagar cambios en ambos lados usando una base de datos. Borrados, renombraciones y conflictos son detectados automáticamente.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Identificar y propagar cambios en ambos lados. Eliminaciones, movimientos y conflictos seran detectados automaticamente usando una base de datos.</target>
 
 <source>Mirror ->></source>
 <target>Espejo ->></target>
@@ -648,15 +654,12 @@ es el mismo
 <source>Versioning</source>
 <target>Control de versiones</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Mover archivos marcados a la carpeta especificada</target>
+<source>Move files to user-defined folder</source>
+<target>Mover archivos a una carpeta definida por el usuario</target>
 
 <source>Naming convention:</source>
 <target>Convención de nomenclatura:</target>
 
-<source>Configuration</source>
-<target>Configuración</target>
-
 <source>Item exists on left side only</source>
 <target>El elemento existe sólo en el lado izquierdo</target>
 
@@ -675,12 +678,6 @@ es el mismo
 <source>Conflict/item cannot be categorized</source>
 <target>Conflicto</target>
 
-<source>Synchronizing...</source>
-<target>Sincronizando...</target>
-
-<source>&Pause</source>
-<target>&Pausa</target>
-
 <source>Source code written in C++ using:</source>
 <target>Código fuente escrito en C++ utilizando:</target>
 
@@ -741,8 +738,8 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Maximum</source>
 <target>Máximo</target>
 
-<source>&Default</source>
-<target>&Configuración por defecto</target>
+<source>&Clear</source>
+<target>&Borrar</target>
 
 <source>Fail-safe file copy</source>
 <target>Copia de archivo a prueba de fallos</target>
@@ -771,6 +768,12 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Description</source>
 <target>Descripción</target>
 
+<source>&Default</source>
+<target>&Configuración por defecto</target>
+
+<source>Start synchronization</source>
+<target>Iniciar sincronización</target>
+
 <source>Variant</source>
 <target>Tipo</target>
 
@@ -801,12 +804,24 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Overview</source>
 <target>Visión global</target>
 
+<source>Configuration</source>
+<target>Configuración</target>
+
 <source>Filter files</source>
 <target>Filtrar archivos</target>
 
 <source>Select view</source>
 <target>Seleccione vista</target>
 
+<source>Open...</source>
+<target>Abrir...</target>
+
+<source>Save</source>
+<target>Guardar</target>
+
+<source>Compare both sides</source>
+<target>Comparar ambos lados</target>
+
 <source>Set direction:</source>
 <target>Indicar dirección:</target>
 
@@ -864,102 +879,63 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>FreeFileSync batch</source>
 <target>Batch de FreeFileSync</target>
 
-<source>Never save changes</source>
-<target>Nunca guardar cambios</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>¿Quiere guardar los cambios de %x?</target>
 
 <source>Do&n't save</source>
 <target>No salvar</target>
 
+<source>Never save changes</source>
+<target>Nunca guardar cambios</target>
+
 <source>Configuration loaded!</source>
 <target>¡Configuración cargada!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Ocultar archivos que existen sólo en el lado izquierdo</target>
-
 <source>Show files that exist on left side only</source>
 <target>Mostrar sólo archivos existentes en la izquierda</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Ocultar archivos que existen sólo en el lado derecho</target>
-
 <source>Show files that exist on right side only</source>
 <target>Mostrar sólo archivos existentes en la derecha</target>
 
-<source>Hide files that are newer on left</source>
-<target>Ocultar archivos más recientes en la izquierda</target>
-
 <source>Show files that are newer on left</source>
 <target>Mostrar archivos más recientes a la izquierda</target>
 
-<source>Hide files that are newer on right</source>
-<target>Ocultar archivos más recientes en la derecha</target>
-
 <source>Show files that are newer on right</source>
 <target>Mostrar archivos más recientes a la derecha</target>
 
-<source>Hide files that are equal</source>
-<target>Ocultar archivos iguales</target>
-
 <source>Show files that are equal</source>
 <target>Mostrar archivos iguales</target>
 
-<source>Hide files that are different</source>
-<target>Ocultar archivos diferentes</target>
-
 <source>Show files that are different</source>
 <target>Mostrar archivos diferentes</target>
 
-<source>Hide conflicts</source>
-<target>Ocultar conflictos</target>
-
 <source>Show conflicts</source>
 <target>Mostrar conflictos</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Ocultar archivos que serán creados en el lado izquierdo</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Mostrar archivos que serán creados en el lado izquierdo</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Ocultar archivos que serán creados en el lado derecho</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Mostrar archivos que serán creados en el lado derecho</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Ocultar archivos que serán eliminados en el lado izquierdo</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Mostrar archivos que serán eliminados en el lado izquierdo</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Ocultar archivos que serán eliminados en el lado derecho</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Mostrar archivos que serán eliminados en el lado derecho</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Ocultar archivos que serán sobreescritos en el lado izquierdo</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Mostrar archivos que serán sobreescritos en el lado izquierdo</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Ocultar archivos que serán sobreescritos en el lado derecho</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Mostrar archivos que serán sobreescritos en el lado derecho</target>
 
-<source>Hide files that won't be copied</source>
-<target>Ocultar archivos que no serán copiados</target>
-
 <source>Show files that won't be copied</source>
 <target>Mostrar archivos que no serán copiados</target>
 
+<source>Set as default</source>
+<target>Establecer por defecto</target>
+
 <source>All folders are in sync!</source>
 <target>¡Todas las carpetas están sincronizadas!</target>
 
@@ -972,14 +948,8 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>File list exported!</source>
 <target>¡Lista de archivos exportada!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>¡Objeto eliminado satisfactoriamente!</pluralform>
-<pluralform>¡%x objetos eliminados satisfactoriamente!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>Buscando actualizaciones del programa...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1014,6 +984,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>&Ignore</source>
 <target>&Ignorar</target>
 
+<source>Don't show this warning again</source>
+<target>No mostar más este aviso</target>
+
 <source>&Switch</source>
 <target>&Cambiar</target>
 
@@ -1032,9 +1005,6 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Comparing content...</source>
 <target>Comparando contenido...</target>
 
-<source>Copy</source>
-<target>Copiar</target>
-
 <source>Paused</source>
 <target>Pausado</target>
 
@@ -1117,35 +1087,38 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <target>¿Hacer visibles de nuevo los mensajes de alerta y diálogo?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>¿De verdad quiere mover el siguiente objeto a la papelera de reciclaje?</pluralform>
-<pluralform>¿De verdad quiere mover los siguientes %x objetos a la papelera de reciclaje?</pluralform>
+<pluralform>¿De verdad quiere mover el siguiente objecto a la papelera de reciclaje?</pluralform>
+<pluralform>¿De verdad quiere mover los siguientes objectos %x a la papelera de reciclaje?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>¿De verdad quiere eliminar el siguiente objeto?</pluralform>
-<pluralform>¿De verdad quiere eliminar los siguientes %x objetos?</pluralform>
+<pluralform>¿De verdad quiere eliminar los siguientes objetos?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Dejar como conflicto sin resolver</target>
 
+<source>Time stamp</source>
+<target>Intervalo de tiempo</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Incluir fecha y hora a cada nombre de archivo</target>
+
 <source>Replace</source>
 <target>Reemplazar</target>
 
 <source>Move files and replace if existing</source>
 <target>Mover archivos y reemplazar si ya existen</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Incluir fecha y hora a cada nombre de archivo</target>
-
 <source>Folder</source>
 <target>Carpeta</target>
 
@@ -1158,6 +1131,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Files</source>
 <target>Archivos</target>
 
+<source>Items</source>
+<target></target>
+
 <source>Percentage</source>
 <target>Porcentaje</target>
 
@@ -1260,6 +1236,12 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Cannot set privilege %x.</source>
 <target>No se puede asignar el privilegio %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Se ha fallado al intentar suspender el sistema.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>No se pudieron cambiar las priridades de E/S del proceso.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>¡Incapaz de mover %x a la Papelera de reciclaje!</target>
 
@@ -1278,14 +1260,38 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Fijando direcciones de sincronización por defecto: Los archivos viejos serán sobreescritos por los archivos nuevos.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Comprobando disponibilidad de la papelera de reciclaje para la carpeta %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Mover archivo %x a la papelera de reciclaje</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Mover carpeta %x a la papelera de reciclaje</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Mover enlace simbólico %x a la papelera de reciclaje</target>
+
+<source>Deleting file %x</source>
+<target>Borrar archivo %x</target>
+
+<source>Deleting folder %x</source>
+<target>Borrar carpeta %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Borrar enlace simbólico %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>¡La papelera de reciclaje no está disponible para las siguientes rutas! Los archivos serán eliminados permanentemente:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Puede ignorar este error al considerar vacía la carpeta.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>La siguiente carpeta será considerada como vacia.</target>
 
-<source>Cannot find folder %x.</source>
-<target>No se puede encontrar la carpeta %x.</target>
+<source>Cannot find the following folders:</source>
+<target>No se pudieron encontrar las siguiente carpetas:</target>
+
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Puede ignorar este error si considera la carpeta como vacia.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>¡Los directorios son dependientes! Tenga cuidado al establecer las reglas de sincronización:</target>
@@ -1293,8 +1299,8 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Start comparison</source>
 <target>Empezar comparación</target>
 
-<source>Preparing synchronization...</source>
-<target>Preparando sincronización...</target>
+<source>Calculating sync directions...</source>
+<target>Calculando direcciones de sincronización...</target>
 
 <source>Conflict detected:</source>
 <target>Conflicto detectado:</target>
@@ -1359,24 +1365,6 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Multiple...</source>
 <target>Múltiple...</target>
 
-<source>Deleting file %x</source>
-<target>Borrar archivo %x</target>
-
-<source>Deleting folder %x</source>
-<target>Borrar carpeta %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Borrar enlace simbólico %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Mover archivo %x a la papelera de reciclaje</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Mover carpeta %x a la papelera de reciclaje</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Mover enlace simbólico %x a la papelera de reciclaje</target>
-
 <source>Moving file %x to %y</source>
 <target>Mover archivo de %x a %y</target>
 
@@ -1389,9 +1377,6 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Removing old versions...</source>
 <target>Eliminando versiones antiguas...</target>
 
-<source>Creating file %x</source>
-<target>Creando archivo %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Creando enlace simbólico %x</target>
 
@@ -1410,6 +1395,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Updating attributes of %x</source>
 <target>Actualizar atributos de %x</target>
 
+<source>Cannot find %x.</source>
+<target>No se pudo encontrar %x.</target>
+
 <source>Target folder %x already existing.</source>
 <target>La carpeta de destino %x ya existe.</target>
 
@@ -1455,6 +1443,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Generating database...</source>
 <target>Generando base de datos...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Creando copia instantanea para %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Error de verificación de datos: ¡Los archivos de origen y destino tienen un contenido diferente!</target>
 
diff --git a/BUILD/Languages/swedish.lng b/BUILD/Languages/swedish.lng
index 9a727bfd..8e3a32a7 100644
--- a/BUILD/Languages/swedish.lng
+++ b/BUILD/Languages/swedish.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Total tid:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Kan inte låsa %x.</target>
+
 <source>Show in Explorer</source>
 <target>Visa i Utforskaren</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Fel</target>
 
+<source>Selected variant:</source>
+<target>Vald variant:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Välj alternativa jämförelseinställningar</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Rensa filterinställningar</target>
 
+<source>Copy</source>
+<target>Kopiera</target>
+
+<source>Paste</source>
+<target>Klistra in</target>
+
 <source>Save as batch job</source>
 <target>Spara som batch-fil</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Allvarligt fel</target>
 
-<source>Windows Error Code %x:</source>
-<target>Windows Felkod %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux Felkod %x:</target>
+<source>Error Code %x:</source>
+<target>Felkod %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Den symboliska länken %x kan inte matchas.</target>
@@ -160,8 +169,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Väntar medan mappen låses (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Kan inte låsa mappen %x.</target>
+<source>Creating file %x</source>
+<target>Skapar fil %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -193,9 +202,6 @@
 <source>/sec</source>
 <target>/s</target>
 
-<source>Cannot find file %x.</source>
-<target>Filen %x kan inte hittas</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Filen %x innehåller ingen giltig konfiguration.</target>
 
@@ -220,6 +226,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Kan inte läsa följande XML-element:</target>
 
+<source>Cannot find file %x.</source>
+<target>Filen %x kan inte hittas</target>
+
 <source>&Open...</source>
 <target>&Öppna...</target>
 
@@ -453,24 +462,21 @@ Kommandot triggas om:
 <source>&Advanced</source>
 <target>&Avancerat</target>
 
-<source>&Check for new version</source>
-<target>&Sök efter uppdatering</target>
+<source>&Check now</source>
+<target>&Sök nu</target>
 
-<source>Compare</source>
-<target>Jämför</target>
+<source>Check &automatically once a week</source>
+<target>Sök automatiskt en gång per vecka</target>
 
-<source>Compare both sides</source>
-<target>Jämför båda sidor</target>
+<source>Check for new version</source>
+<target>Sök efter ny version</target>
 
-<source>&Abort</source>
-<target>&Avbryt</target>
+<source>Compare</source>
+<target>Jämför</target>
 
 <source>Synchronize</source>
 <target>Synkronisera</target>
 
-<source>Start synchronization</source>
-<target>Starta synkronisering</target>
-
 <source>Add folder pair</source>
 <target>Lägg till mapp-par</target>
 
@@ -480,15 +486,6 @@ Kommandot triggas om:
 <source>Swap sides</source>
 <target>Byt sida</target>
 
-<source>Open</source>
-<target>Öppna</target>
-
-<source>Save</source>
-<target>Spara</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Senast använda konfigurationer (Tryck DEL för att ta bort)</target>
-
 <source>Hide excluded items</source>
 <target>Dölj undantagna objekt</target>
 
@@ -519,6 +516,18 @@ Kommandot triggas om:
 <source>Time elapsed:</source>
 <target>Förfluten tid:</target>
 
+<source>Synchronizing...</source>
+<target>Synkroniserar...</target>
+
+<source>On completion</source>
+<target>Vid slutfört</target>
+
+<source>Close</source>
+<target>Stäng</target>
+
+<source>&Pause</source>
+<target>&Paus</target>
+
 <source>Batch job</source>
 <target>Batch-jobb</target>
 
@@ -549,9 +558,6 @@ Kommandot triggas om:
 <source>Abort synchronization on first error</source>
 <target>Avbryt synkronisering vid första felet</target>
 
-<source>On completion</source>
-<target>Vid slutfört</target>
-
 <source>Show progress dialog</source>
 <target>Visa förloppsindikator</target>
 
@@ -609,8 +615,8 @@ Filerna betecknas som lika om,
 <source><- Two way -></source>
 <target><- Tvåvägs -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Använd en databas för att identifiera och sprida ändringar på båda sidor. Borttagning, namnbyte och konflikter upptäcks automatiskt</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Identifierar och sprider förändringar på båda sidor. Borttagningar, förflyttningar och konflikter detekteras automatiskt med hjälp av en databas.</target>
 
 <source>Mirror ->></source>
 <target>Spegla ->></target>
@@ -648,15 +654,12 @@ Filerna betecknas som lika om,
 <source>Versioning</source>
 <target>Versionshantering</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Flytta tidsstämplade filer till specificerad mapp</target>
+<source>Move files to user-defined folder</source>
+<target>Flytta filer till användardefinierad mapp</target>
 
 <source>Naming convention:</source>
 <target>Regler för namngivning</target>
 
-<source>Configuration</source>
-<target>Inställningar</target>
-
 <source>Item exists on left side only</source>
 <target>Objektet finns bara på vänster sida</target>
 
@@ -675,12 +678,6 @@ Filerna betecknas som lika om,
 <source>Conflict/item cannot be categorized</source>
 <target>Konflikten/Objektet kan inte kategoriseras</target>
 
-<source>Synchronizing...</source>
-<target>Synkroniserar...</target>
-
-<source>&Pause</source>
-<target>&Paus</target>
-
 <source>Source code written in C++ using:</source>
 <target>Källkod skriven i C++ med hjälp av:</target>
 
@@ -741,8 +738,8 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Maximum</source>
 <target>Maximum</target>
 
-<source>&Default</source>
-<target>&Standard</target>
+<source>&Clear</source>
+<target>&Rensa</target>
 
 <source>Fail-safe file copy</source>
 <target>Felsäker filkopiering</target>
@@ -771,6 +768,12 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Description</source>
 <target>Beskrivning</target>
 
+<source>&Default</source>
+<target>&Standard</target>
+
+<source>Start synchronization</source>
+<target>Starta synkronisering</target>
+
 <source>Variant</source>
 <target>Variant</target>
 
@@ -801,12 +804,24 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Overview</source>
 <target>Översikt</target>
 
+<source>Configuration</source>
+<target>Inställningar</target>
+
 <source>Filter files</source>
 <target>Undantag</target>
 
 <source>Select view</source>
 <target>Välj vy</target>
 
+<source>Open...</source>
+<target>Öppna...</target>
+
+<source>Save</source>
+<target>Spara</target>
+
+<source>Compare both sides</source>
+<target>Jämför båda sidor</target>
+
 <source>Set direction:</source>
 <target>Ange riktning:</target>
 
@@ -864,102 +879,63 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>FreeFileSync batch</source>
 <target>FreeFileSync batch</target>
 
-<source>Never save changes</source>
-<target>Spara aldrig ändringar</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Vill du spara ändringar till %x?</target>
 
 <source>Do&n't save</source>
 <target>Spara &inte</target>
 
+<source>Never save changes</source>
+<target>Spara aldrig ändringar</target>
+
 <source>Configuration loaded!</source>
 <target>Inställningar inlästa!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Visa inte filer som endast finns till vänster</target>
-
 <source>Show files that exist on left side only</source>
 <target>Visa filer som endast finns till vänster</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Visa inte filer som endast finns till höger</target>
-
 <source>Show files that exist on right side only</source>
 <target>Visa filer som endast finns till höger</target>
 
-<source>Hide files that are newer on left</source>
-<target>Visa inte filer som är nyare till vänster</target>
-
 <source>Show files that are newer on left</source>
 <target>Visa filer som är nyare till vänster</target>
 
-<source>Hide files that are newer on right</source>
-<target>Visa inte filer som är nyare till höger</target>
-
 <source>Show files that are newer on right</source>
 <target>Visa filer som är nyare till höger</target>
 
-<source>Hide files that are equal</source>
-<target>Visa inte filer som är lika</target>
-
 <source>Show files that are equal</source>
 <target>Visa filer som är lika</target>
 
-<source>Hide files that are different</source>
-<target>Visa inte filer som är olika</target>
-
 <source>Show files that are different</source>
 <target>Visa filer som är olika</target>
 
-<source>Hide conflicts</source>
-<target>Visa inte konflikter</target>
-
 <source>Show conflicts</source>
 <target>Visa konflikter</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Visa inte filer som kommer att skapas på vänster sida</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Visa filer som kommer att skapas till vänster</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Visa inte filer som kommer att skapas på höger sida</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Visa filer som kommer att skapas till höger</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Visa inte filer som kommer att tas bort på vänster sida</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Visa filer som kommer att tas bort till vänster</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Visa inte filer som kommer att tas bort på höger sida</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Visa filer som kommer att tas bort till höger</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Visa inte filer som kommer att skrivas över på vänster sida</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Visa filer som skrivas över till vänster</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Visa inte filer som kommer att skrivas över på höger sida</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Visa filer som skrivas över till höger</target>
 
-<source>Hide files that won't be copied</source>
-<target>Visa inte filer som som inte kopieras</target>
-
 <source>Show files that won't be copied</source>
 <target>Visa filer som inte kommer att kopieras</target>
 
+<source>Set as default</source>
+<target>Ange som standard</target>
+
 <source>All folders are in sync!</source>
 <target>Alla mappar är synkroniserade!</target>
 
@@ -972,14 +948,8 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>File list exported!</source>
 <target>Fillista exporterad!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Objektet borttaget!</pluralform>
-<pluralform>%x objekt borttagna!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>Söker efter programuppdateringar...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1014,6 +984,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>&Ignore</source>
 <target>&Ignorera</target>
 
+<source>Don't show this warning again</source>
+<target>Visa inte denna varning igen.</target>
+
 <source>&Switch</source>
 <target>&Växla</target>
 
@@ -1032,9 +1005,6 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Comparing content...</source>
 <target>Jämför innehåll...</target>
 
-<source>Copy</source>
-<target>Kopiera</target>
-
 <source>Paused</source>
 <target>Pausad</target>
 
@@ -1117,17 +1087,17 @@ OBS! Filnamnen måste anges relativt till basmappar
 <target>Vill du göra dolda varningar och dialoger, synliga igen?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Vill du verkligen flytta följande objekt till Papperskorgen?</pluralform>
-<pluralform>Vill du verkligen flytta följande %x objekt till Papperskorgen?</pluralform>
+<pluralform>Vill du verkligen flytta följande objekt till papperskorgen?</pluralform>
+<pluralform>Vill du verkligen flytta följande %x objekt till papperskorgen?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Vill du verkligen ta bort följande objekt?</pluralform>
@@ -1137,15 +1107,18 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Leave as unresolved conflict</source>
 <target>Ignorera konflikt</target>
 
+<source>Time stamp</source>
+<target>Tidsstämpel</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Lägg till en tidsstämpel till varje filnamn</target>
+
 <source>Replace</source>
 <target>Byt ut</target>
 
 <source>Move files and replace if existing</source>
 <target>Flytta filer och byt ut om de redan finns</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Lägg till en tidsstämpel till varje filnamn</target>
-
 <source>Folder</source>
 <target>Mapp</target>
 
@@ -1260,6 +1233,12 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Cannot set privilege %x.</source>
 <target>Kan inte att ange behörigheten %x.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Kunde inte avbryta systemet vänteläge</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Kan inte ändra process I/O-prioritet</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Kan inte flytta %x till Papperskorgen</target>
 
@@ -1278,14 +1257,38 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Standardsynkronisering: Gamla filer kommer att skrivas över av nyare versioner.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Kontrollerar papperskorgens tillgänglighet för %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Flyttar filen %x till papperskorgen</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Flyttar mappen %x till papperskorgen</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Flyttar den symboliska länken %x till papperskorgen</target>
+
+<source>Deleting file %x</source>
+<target>Tar bort filen %x</target>
+
+<source>Deleting folder %x</source>
+<target>Tar bort mappen %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Tar bort den symboliska länken %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Papperskorgen är inte tillgänglig för följande sökvägar! Filerna tas i stället bort permanent.</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Du kan ignorera detta fel och betrakta mappen som tom</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>Motsvarande mapp kommer att betraktas som tom.</target>
 
-<source>Cannot find folder %x.</source>
-<target>Kan inte hitta mappen %x.</target>
+<source>Cannot find the following folders:</source>
+<target>Kan inte hitta följande mappar:</target>
+
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Du kan ignorera det här felet och betrakta varje mappa som tom.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Mappar är beroende! Var försiktig när du sätter upp synkroniseringsregler:</target>
@@ -1293,8 +1296,8 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Start comparison</source>
 <target>Starta jämförelse</target>
 
-<source>Preparing synchronization...</source>
-<target>Förbereder synkronisering...</target>
+<source>Calculating sync directions...</source>
+<target>Beräknar synkroniseringsmappar...</target>
 
 <source>Conflict detected:</source>
 <target>Konflikt upptäckt:</target>
@@ -1359,24 +1362,6 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Multiple...</source>
 <target>Flera...</target>
 
-<source>Deleting file %x</source>
-<target>Tar bort filen %x</target>
-
-<source>Deleting folder %x</source>
-<target>Tar bort mappen %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Tar bort den symboliska länken %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Flyttar filen %x till papperskorgen</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Flyttar mappen %x till papperskorgen</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Flyttar den symboliska länken %x till papperskorgen</target>
-
 <source>Moving file %x to %y</source>
 <target>Flyttar filen %x till %y</target>
 
@@ -1389,9 +1374,6 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Removing old versions...</source>
 <target>Tar bort gamla versioner...</target>
 
-<source>Creating file %x</source>
-<target>Skapar fil %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Skapar den symboliska länken %x</target>
 
@@ -1410,6 +1392,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Updating attributes of %x</source>
 <target>Uppdaterar attribut för %x</target>
 
+<source>Cannot find %x.</source>
+<target>Kan inte hitta %x.</target>
+
 <source>Target folder %x already existing.</source>
 <target>Målmappen %x finns redan.</target>
 
@@ -1455,6 +1440,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Generating database...</source>
 <target>Skapar databas...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Skapar Volume Shadow Copy för %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Verifikationsfel: Källfil och målfil har olika innehåll!</target>
 
diff --git a/BUILD/Languages/turkish.lng b/BUILD/Languages/turkish.lng
index 570156c8..f3c87e86 100644
--- a/BUILD/Languages/turkish.lng
+++ b/BUILD/Languages/turkish.lng
@@ -19,14 +19,17 @@
 <source>Total time:</source>
 <target>Toplam süre:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>%x için klasör kilidi uygulanamıyor.</target>
+
 <source>Show in Explorer</source>
-<target>Tarayıcıda Göster</target>
+<target>Tarayıcıda Görüntüleyin</target>
 
 <source>Open with default application</source>
-<target>Varsayılan uygulama ile aç</target>
+<target>Varsayılan uygulama ile açın</target>
 
 <source>Browse directory</source>
-<target>Klasöre gözat</target>
+<target>Klasöre gözatın</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Vazgeçildi: Yürürlükteki işlemin bitmesi bekleniyor...</target>
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Hata</target>
 
+<source>Selected variant:</source>
+<target>Seçilmiş çeşit:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Alternatif karşılaştırma ayarlarını seçin</target>
 
@@ -53,13 +59,19 @@
 <target>Seçilmiş süzgeç yok</target>
 
 <source>Remove alternate settings</source>
-<target>Alternatif ayarları sil</target>
+<target>Alternatif ayarları silin</target>
 
 <source>Clear filter settings</source>
-<target>Süzgeç ayarlarını temizle</target>
+<target>Süzgeç ayarlarını temizleyin</target>
+
+<source>Copy</source>
+<target>Kopyalayın</target>
+
+<source>Paste</source>
+<target>Yapıştırın</target>
 
 <source>Save as batch job</source>
-<target>Toplu iş olarak kaydet</target>
+<target>Toplu iş olarak kaydedin</target>
 
 <source>Comparison settings</source>
 <target>Karşılaştırma ayarları</target>
@@ -80,7 +92,7 @@
 <target>Genel ayarlar</target>
 
 <source>Find</source>
-<target>Bul</target>
+<target>Arayın</target>
 
 <source>Select time span</source>
 <target>Zaman aralığı</target>
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Ölümcül Hata</target>
 
-<source>Windows Error Code %x:</source>
-<target>Windows Hata Kodu %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux Hata Kodu %x:</target>
+<source>Error Code %x:</source>
+<target>Hata Kodu %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>%x simge bağlantısı çözümlenemedi</target>
@@ -160,8 +169,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Klasör kilitli olduğundan bekleniyor (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>%x klasörü kilitlenemedi.</target>
+<source>Creating file %x</source>
+<target>%x dosyası ekleniyor</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -191,10 +200,7 @@
 </target>
 
 <source>/sec</source>
-<target>/san</target>
-
-<source>Cannot find file %x.</source>
-<target>%x dosyası bulunamadı.</target>
+<target>/saniye</target>
 
 <source>File %x does not contain a valid configuration.</source>
 <target>%x dosyası geçerli ayar bilgilerini içermiyor.</target>
@@ -220,14 +226,17 @@
 <source>Cannot read the following XML elements:</source>
 <target>Şu XML elemanları okunamadı:</target>
 
+<source>Cannot find file %x.</source>
+<target>%x dosyası bulunamadı.</target>
+
 <source>&Open...</source>
-<target>&Aç...</target>
+<target>&Açın...</target>
 
 <source>Save &as...</source>
-<target>F&arklı kaydet...</target>
+<target>F&arklı kaydedin...</target>
 
 <source>&Quit</source>
-<target>Çı&k</target>
+<target>Çı&kın</target>
 
 <source>&Program</source>
 <target>&Dosya</target>
@@ -260,13 +269,13 @@
 <target>İzlenecek klasörler</target>
 
 <source>Add folder</source>
-<target>Klasör ekle</target>
+<target>Klasör ekleyin</target>
 
 <source>Remove folder</source>
-<target>Klasörü sil</target>
+<target>Klasörü silin</target>
 
 <source>Browse</source>
-<target>Gözat</target>
+<target>Gözatın</target>
 
 <source>Select a folder</source>
 <target>Bir klasör seçin</target>
@@ -275,7 +284,7 @@
 <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ındaki bekleme süresi</target>
+<target>Son algılanan değişiklik ile komutun yürütülmesi arasında beklenecek süre</target>
 
 <source>Command line</source>
 <target>Komut satırı</target>
@@ -292,13 +301,13 @@ Komut şu durumlarda yürütülür:
 </target>
 
 <source>Start</source>
-<target>Başla</target>
+<target>Başlayın</target>
 
 <source>&Retry</source>
-<target>&Yeniden dene</target>
+<target>&Yeniden deneyin</target>
 
 <source>Cancel</source>
-<target>İptal</target>
+<target>İptal Edin</target>
 
 <source>Build: %x</source>
 <target>Yapım: %x</target>
@@ -307,10 +316,10 @@ Komut şu durumlarda yürütülür:
 <target>Tüm dosyalar</target>
 
 <source>&Restore</source>
-<target>Ge&ri yükle</target>
+<target>Ge&ri yükleyin</target>
 
 <source>&Exit</source>
-<target>Çı&kış</target>
+<target>Çı&kın</target>
 
 <source>Monitoring active...</source>
 <target>İzleme etkin...</target>
@@ -325,7 +334,7 @@ Komut şu durumlarda yürütülür:
 <target>Eşleştirme durduruldu!</target>
 
 <source>Synchronization completed with errors!</source>
-<target>Eşleştirme hatalarla tamamlandı!</target>
+<target>Eşleştirme bazı hatalarla tamamlandı!</target>
 
 <source>Synchronization completed with warnings.</source>
 <target>Eşleştirme işlemi bazı uyarılarla tamamlandı.</target>
@@ -340,7 +349,7 @@ Komut şu durumlarda yürütülür:
 <target>%x günlük dosyası kaydediliyor...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>FreeFileSync ana penceresindeki sorunları çözmek için "Değiştir" düğmesine tıklayın.</target>
+<target>FreeFileSync ana penceresindeki sorunları çözmek için "Değiştirin" düğmesine tıklayın.</target>
 
 <source>Switching to FreeFileSync main dialog...</source>
 <target>FreeFileSync ana penceresine geçiliyor...</target>
@@ -349,7 +358,7 @@ Komut şu durumlarda yürütülür:
 <target>Yeni bir FreeFileSync sürümü yayınlanmış:</target>
 
 <source>Download now?</source>
-<target>Şimdi indir?</target>
+<target>İndirilsin mi?</target>
 
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync güncel!</target>
@@ -412,34 +421,34 @@ Komut şu durumlarda yürütülür:
 <target>Klasör ya da dosyaları sürükleyip buraya bırakabilirsiniz</target>
 
 <source>Close progress dialog</source>
-<target>İşlem penceresini kapat</target>
+<target>İşlem penceresini kapatılsın</target>
 
 <source>Standby</source>
-<target>Uykuya dal</target>
+<target>Uykuya dalınsın</target>
 
 <source>Log off</source>
-<target>Oturumu kapat</target>
+<target>Oturum kapatılsın</target>
 
 <source>Shut down</source>
-<target>Bilgisayarı kapat</target>
+<target>Bilgisayar kapatılsın</target>
 
 <source>Hibernate</source>
-<target>Hazırda beklet</target>
+<target>Hazırda bekletilsin</target>
 
 <source>&New</source>
 <target>Ye&ni</target>
 
 <source>&Save</source>
-<target>&Kaydet</target>
+<target>&Kaydedin</target>
 
 <source>Save as &batch job...</source>
-<target>&Toplu iş olarak kaydet...</target>
+<target>&Toplu iş olarak kaydedin...</target>
 
 <source>1. &Compare</source>
-<target>1. &Karşılaştır</target>
+<target>1. &Karşılaştırın</target>
 
 <source>2. &Synchronize</source>
-<target>2. &Eşleştir</target>
+<target>2. &Eşleştirin</target>
 
 <source>&Language</source>
 <target>Di&l</target>
@@ -448,46 +457,34 @@ Komut şu durumlarda yürütülür:
 <target>&Genel ayarlar...</target>
 
 <source>&Export file list...</source>
-<target>Dosya list&esini ver...</target>
+<target>Dosya list&esini verin...</target>
 
 <source>&Advanced</source>
 <target>&Araçlar</target>
 
-<source>&Check for new version</source>
-<target>Yeni &sürüm denetimi</target>
+<source>&Check now</source>
+<target>Sürümü &Denetleyin</target>
 
-<source>Compare</source>
-<target>Karşılaştır</target>
+<source>Check &automatically once a week</source>
+<target>Kendiliğinden haftada bir denetlensin</target>
 
-<source>Compare both sides</source>
-<target>İki tarafı karşılaştırır</target>
+<source>Check for new version</source>
+<target>Yeni sürüm denetimi</target>
 
-<source>&Abort</source>
-<target>V&azgeç</target>
+<source>Compare</source>
+<target>Karşılaştırın</target>
 
 <source>Synchronize</source>
-<target>Eşleştir</target>
-
-<source>Start synchronization</source>
-<target>Eşleştirmeyi başlatır</target>
+<target>Eşleştirin</target>
 
 <source>Add folder pair</source>
-<target>Klasör çifti ekle</target>
+<target>Klasör çifti ekleyin</target>
 
 <source>Remove folder pair</source>
-<target>Klasör çiftini sil</target>
+<target>Klasör çiftini silin</target>
 
 <source>Swap sides</source>
-<target>Sağ ve sol tarafları değiştir</target>
-
-<source>Open</source>
-<target>Aç</target>
-
-<source>Save</source>
-<target>Kaydet</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>Son kullanılan ayarlar (listeden silmek için DEL tuşuna basın)</target>
+<target>Sağ ve sol tarafları değiştirin</target>
 
 <source>Hide excluded items</source>
 <target>Katılmayan ögeler görüntülensin</target>
@@ -519,11 +516,23 @@ Komut şu durumlarda yürütülür:
 <source>Time elapsed:</source>
 <target>Geçen süre:</target>
 
+<source>Synchronizing...</source>
+<target>Eşleştiriliyor...</target>
+
+<source>On completion</source>
+<target>İşlem tamamlandığında:</target>
+
+<source>Close</source>
+<target>Kapatılsın</target>
+
+<source>&Pause</source>
+<target>&Duraklatılsın</target>
+
 <source>Batch job</source>
 <target>Toplu iş</target>
 
 <source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
-<target>Toplu iş dosyası ile otomatik eşleştirme yapılabilir. Dosya, çift tıklanarak ya da sisteminizdeki görev zamanlayıcıya; FreeFileSync.exe <görev adı>.ffs_batch şeklinde eklenerek yürütülebilir.</target>
+<target>Toplu iş dosyası ile otomatik eşleştirme yapılabilir. Dosyadaki işlemler, çift tıklanarak ya da sisteminizdeki görev zamanlayıcıya; FreeFileSync.exe <görev adı>.ffs_batch şeklinde eklenerek yürütülebilir.</target>
 
 <source>Help</source>
 <target>Yardım</target>
@@ -532,31 +541,28 @@ Komut şu durumlarda yürütülür:
 <target>Hata olursa:</target>
 
 <source>Ignore</source>
-<target>Yoksay</target>
+<target>Yoksayılsın</target>
 
 <source>Hide all error and warning messages</source>
 <target>Tüm hata ve uyarı iletileri gizlenir</target>
 
 <source>Pop-up</source>
-<target>Görüntüle</target>
+<target>Görüntülensin</target>
 
 <source>Show pop-up on errors or warnings</source>
-<target>Hata ya da uyarılar açılır pencerede gösterilir</target>
+<target>Hata ya da uyarılar açılır pencerede görüntülenir</target>
 
 <source>Exit</source>
-<target>Çık</target>
+<target>Çıkın</target>
 
 <source>Abort synchronization on first error</source>
 <target>Oluşacak ilk hatada eşleştirme durdurulur</target>
 
-<source>On completion</source>
-<target>İşlem tamamlandığında:</target>
-
 <source>Show progress dialog</source>
-<target>İşlem penceresini görüntüle</target>
+<target>İşlem penceresi görüntülensin</target>
 
 <source>Save log</source>
-<target>Günlüğe kaydet</target>
+<target>Günlüğe kaydedilsin</target>
 
 <source>Select folder to save log files</source>
 <target>Günlük dosyalarının kaydedileceği klasörü seçin</target>
@@ -601,7 +607,7 @@ aynı olmalıdır
 <target>İçeriğe göre</target>
 
 <source>Symbolic Link handling</source>
-<target>Sembolik bağlantılar:</target>
+<target>Sembolik bağlantı işleme:</target>
 
 <source>OK</source>
 <target>Tamam</target>
@@ -609,17 +615,17 @@ aynı olmalıdır
 <source><- Two way -></source>
 <target><- Çift yönlü -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>İki taraftaki değişiklikler, bir veritabanı kullanarak belirlenir ve görüntülenir. Silme, yeniden adlandırma ve uyuşmazlık durumları kendiliğinden algılanır.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>İki taraftaki değişiklikler belirlenir ve kopyalanır. Silme, taşıma ve çakışmalar, veritabanı kullanılarak kendiliğinden algılanır.</target>
 
 <source>Mirror ->></source>
-<target>Yansıt ->></target>
+<target>Yansıtma ->></target>
 
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Sol taraftaki klasör sağ tarafa yansıtılır. Eşleştirme sonrası sağ klasör, sol klasörün tamamen aynısı olur.</target>
 
 <source>Update -></source>
-<target>Güncelle -></target>
+<target>Güncelleme -></target>
 
 <source>Copy new or updated files to right folder.</source>
 <target>Sol taraftaki yeni ya da güncellenmiş dosyalar sağ tarafa kopyalanır.</target>
@@ -628,35 +634,32 @@ aynı olmalıdır
 <target>Özel</target>
 
 <source>Configure your own synchronization rules.</source>
-<target>Eşleştirme kuralları istendiği şekilde ayarlanabilir.</target>
+<target>Eşleştirme kurallarını istediğiniz şekilde ayarlayabilirsiniz.</target>
 
 <source>Deletion handling</source>
-<target>Silinen dosyaları:</target>
+<target>Silinen dosyalar:</target>
 
 <source>Permanent</source>
-<target>Kalıcı olarak sil</target>
+<target>Kalıcı olarak silinsin</target>
 
 <source>Delete or overwrite files permanently</source>
 <target>Dosyalar kalıcı olarak silinir ya da üzerine yazılır</target>
 
 <source>Recycle Bin</source>
-<target>Geri dönüşüm kutusuna at</target>
+<target>Geri Dönüşüm Kutusuna gönderilsin</target>
 
 <source>Use Recycle Bin for deleted and overwritten files</source>
-<target>Silinen ve üzerine yazılan dosyalar Geri Dönüşüm Kutusuna atılır</target>
+<target>Silinen ve üzerine yazılan dosyalar Geri Dönüşüm Kutusuna gönderilir</target>
 
 <source>Versioning</source>
-<target>Eski sürüm olarak sakla</target>
+<target>Eski sürüm olarak saklansın</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Dosyalar, zaman damgası eklenerek belirtilen klasöre taşınır</target>
+<source>Move files to user-defined folder</source>
+<target>Dosyalar kullanıcı tarafından belirlenen bir klasöre taşınsın</target>
 
 <source>Naming convention:</source>
 <target>Adlandırma kuralı:</target>
 
-<source>Configuration</source>
-<target>İşlemler</target>
-
 <source>Item exists on left side only</source>
 <target>Sol taraftaki ögeler</target>
 
@@ -675,12 +678,6 @@ aynı olmalıdır
 <source>Conflict/item cannot be categorized</source>
 <target>Uyuşmayan/sınıflanamayan ögeler</target>
 
-<source>Synchronizing...</source>
-<target>Eşleştiriliyor...</target>
-
-<source>&Pause</source>
-<target>&Duraklat</target>
-
 <source>Source code written in C++ using:</source>
 <target>Kaynak kodu C++ kullanılarak yazılmıştır:</target>
 
@@ -688,7 +685,7 @@ aynı olmalıdır
 <target>FreeFileSync’i beğendiyseniz</target>
 
 <source>Donate with PayPal</source>
-<target>PayPal ile bağış yapın</target>
+<target>PayPal üzerinden bağış yapın</target>
 
 <source>Many thanks for localization:</source>
 <target>Çeviriler için çok teşekkürler:</target>
@@ -709,7 +706,7 @@ aynı olmalıdır
 <target>GNU Genel Kamu Lisansı koşulları altında yayınlanmıştır</target>
 
 <source>Delete on both sides</source>
-<target>Her iki taraftakini de sil</target>
+<target>Her iki taraftaki de silinsin</target>
 
 <source>Delete on both sides even if the file is selected on one side only</source>
 <target>Dosya yalnız bir tarafta seçili olsa bile her iki taraftaki de silinir</target>
@@ -741,14 +738,14 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Maximum</source>
 <target>En büyük</target>
 
-<source>&Default</source>
-<target>&Varsayılan</target>
+<source>&Clear</source>
+<target>&Temizleyin</target>
 
 <source>Fail-safe file copy</source>
 <target>Dosyalar hatasız kopyalansın</target>
 
 <source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
-<target>Kopyalama önce geçici bir dosyaya (*.ffs_tmp) yapılır. Sonra dosya yeniden adlandırılır. Böylece hatalara karşı daha sağlıklı bir ortam sağlanır.</target>
+<target>Kopyalama önce geçici bir dosyaya (*.ffs_tmp) yapılır. Sonra dosya yeniden adlandırılır. Böylece hatalara karşı daha sağlıklı bir çalışma ortamı sağlanır.</target>
 
 <source>Copy locked files</source>
 <target>Kilitli dosyalar da kopyalansın</target>
@@ -771,6 +768,12 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Description</source>
 <target>Açıklama</target>
 
+<source>&Default</source>
+<target>&Varsayılan</target>
+
+<source>Start synchronization</source>
+<target>Eşleştirmeyi başlatın</target>
+
 <source>Variant</source>
 <target>İşlem tipi</target>
 
@@ -778,16 +781,16 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>İstatistikler</target>
 
 <source>Don't show this dialog again</source>
-<target>Bu iletiyi bir daha gösterme</target>
+<target>Bu ileti artık görüntülenmesin</target>
 
 <source>Find what:</source>
 <target>Aranacak:</target>
 
 <source>Match case</source>
-<target>Büyük/küçük harf uydur</target>
+<target>Büyük/küçük harfe uyulsun</target>
 
 <source>&Find next</source>
-<target>&Sonrakini bul</target>
+<target>&Sonrakini bulun</target>
 
 <source>Operation aborted!</source>
 <target>İşlemden vazgeçildi!</target>
@@ -801,38 +804,50 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Overview</source>
 <target>Genel</target>
 
+<source>Configuration</source>
+<target>İşlemler</target>
+
 <source>Filter files</source>
 <target>Dosya süzgeci</target>
 
 <source>Select view</source>
 <target>Görünüm</target>
 
+<source>Open...</source>
+<target>Açın...</target>
+
+<source>Save</source>
+<target>Kaydedin</target>
+
+<source>Compare both sides</source>
+<target>İki tarafı karşılaştırır</target>
+
 <source>Set direction:</source>
 <target>Yönü seçin:</target>
 
 <source>Exclude temporarily</source>
-<target>Geçici olarak katma</target>
+<target>Geçici olarak katılmasın</target>
 
 <source>Include temporarily</source>
-<target>Geçici olarak kat</target>
+<target>Geçici olarak katılsın</target>
 
 <source>Exclude via filter:</source>
-<target>Süzerek dışarda bırak:</target>
+<target>Süzerek dışarda bırakılsın:</target>
 
 <source><multiple selection></source>
 <target><çoklu seçim></target>
 
 <source>Delete</source>
-<target>Sil</target>
+<target>Silin</target>
 
 <source>Include all</source>
-<target>Tümünü kat</target>
+<target>Tümü katılsın</target>
 
 <source>Exclude all</source>
-<target>Hiçbirini katma</target>
+<target>Hiçbiri katılmasın</target>
 
 <source>Show icons:</source>
-<target>Simgeleri göster:</target>
+<target>Simgeler görüntülensin:</target>
 
 <source>Small</source>
 <target>Küçük</target>
@@ -850,7 +865,7 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>Varsayılan görünüm</target>
 
 <source>Show "%x"</source>
-<target>"%x" panelini göster</target>
+<target>"%x" panelini görüntülensin</target>
 
 <source><Last session></source>
 <target><Önceki oturum></target>
@@ -864,102 +879,63 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync toplu işi</target>
 
-<source>Never save changes</source>
-<target>Asla değişiklikleri kaydetme</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Değişiklikleri %x dosyasına kaydetmek istiyor musunuz?</target>
 
 <source>Do&n't save</source>
-<target>Kaydetme</target>
+<target>Kaydedilmesin</target>
+
+<source>Never save changes</source>
+<target>Değişiklikler asla kaydedilmesin</target>
 
 <source>Configuration loaded!</source>
 <target>Ayarlar yüklendi!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Yalnız sol tarafta bulunan dosyalar gizlensin</target>
-
 <source>Show files that exist on left side only</source>
 <target>Yalnız sol tarafta bulunan dosyalar görüntülensin</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Yalnız sağ tarafta bulunan dosyalar gizlensin</target>
-
 <source>Show files that exist on right side only</source>
 <target>Yalnız sağ tarafta bulunan dosyalar görüntülensin</target>
 
-<source>Hide files that are newer on left</source>
-<target>Solda daha yeni olan dosyalar gizlensin</target>
-
 <source>Show files that are newer on left</source>
 <target>Solda daha yeni olan dosyalar görüntülensin</target>
 
-<source>Hide files that are newer on right</source>
-<target>Sağda daha yeni olan dosyalar gizlensin</target>
-
 <source>Show files that are newer on right</source>
 <target>Sağda daha yeni olan dosyalar görüntülensin</target>
 
-<source>Hide files that are equal</source>
-<target>Aynı olan dosyalar gizlensin</target>
-
 <source>Show files that are equal</source>
 <target>Aynı olan dosyalar görüntülensin</target>
 
-<source>Hide files that are different</source>
-<target>Farklı olan dosyalar gizlensin</target>
-
 <source>Show files that are different</source>
 <target>Farklı olan dosyalar görüntülensin</target>
 
-<source>Hide conflicts</source>
-<target>Uyuşmazlıklar gizlensin</target>
-
 <source>Show conflicts</source>
 <target>Uyuşmazlıklar görüntülensin</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Sol tarafa eklenecek dosyalar gizlensin</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Sol tarafa eklenecek dosyalar görüntülensin</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Sağ tarafa eklenecek dosyalar gizlensin</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Sağ tarafa eklenecek dosyalar görüntülensin</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Sol tarafta silinecek dosyalar gizlensin</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Sol tarafta silinecek dosyalar görüntülensin</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Sağ tarafta silinecek dosyalar gizlensin</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Sağ tarafta silinecek dosyalar görüntülensin</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Sol tarafta üzerine yazılacak dosyalar gizlensin</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Sol tarafta üzerine yazılacak dosyalar görüntülensin</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Sağ tarafta üzerine yazılacak dosyalar gizlensin</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Sağ tarafta üzerine yazılacak dosyalar görüntülensin</target>
 
-<source>Hide files that won't be copied</source>
-<target>Kopyalanmayacak dosyalar gizlensin</target>
-
 <source>Show files that won't be copied</source>
 <target>Kopyalanmayacak dosyalar görüntülensin</target>
 
+<source>Set as default</source>
+<target>Varsayılan olarak belirleyin</target>
+
 <source>All folders are in sync!</source>
 <target>Tüm klasörler eşleştirildi.</target>
 
@@ -970,16 +946,10 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>Gösterge</target>
 
 <source>File list exported!</source>
-<target>Dosya listesi verilmiş!</target>
+<target>Dosya listesi verildi!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>Nesne silindi!</pluralform>
-<pluralform>%x nesne silindi!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target>Yazılım güncellemesine bakılıyor...</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1009,13 +979,16 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 </target>
 
 <source>Ignore further errors</source>
-<target>Sonraki hataları yoksay</target>
+<target>Sonraki hatalar yoksayılsın</target>
 
 <source>&Ignore</source>
-<target>&Yoksay</target>
+<target>&Yoksayın</target>
+
+<source>Don't show this warning again</source>
+<target>Bu uyarı artık görüntülenmesin</target>
 
 <source>&Switch</source>
-<target>&Değiştir</target>
+<target>&Değiştirin</target>
 
 <source>Question</source>
 <target>Soru</target>
@@ -1032,9 +1005,6 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Comparing content...</source>
 <target>İçerik karşılaştırılıyor...</target>
 
-<source>Copy</source>
-<target>Kopyala</target>
-
 <source>Paused</source>
 <target>Duraklatıldı</target>
 
@@ -1048,10 +1018,10 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>Tamamlandı</target>
 
 <source>Continue</source>
-<target>Devam et</target>
+<target>Devam edin</target>
 
 <source>Pause</source>
-<target>Duraklat</target>
+<target>Duraklatın</target>
 
 <source>Logging</source>
 <target>Günlükleme</target>
@@ -1117,34 +1087,37 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>Gizlenmiş iletiler yeniden görüntülensin mi?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Şu ögeyi geri dönüşüm kutusuna taşımak istediğinizden emin misiniz?</pluralform>
-<pluralform>Şu %x ögeyi geri dönüşüm kutusuna taşımak istediğinizden emin misiniz?</pluralform>
+<pluralform>Aşağıdaki ögeyi Geri Dönüşüm Kutusuna göndermek istediğinize emin misiniz?</pluralform>
+<pluralform>Aşağıdaki ögeleri Geri Dönüşüm Kutusuna göndermek istediğinize emin misiniz?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Şu ögeyi silmek istiyor musunuz?</pluralform>
-<pluralform>Şu %x ögeyi silmek istiyor musunuz?</pluralform>
+<pluralform>Aşağıdaki ögeyi silmek istediğinize emin misiniz?</pluralform>
+<pluralform>Aşağıdaki ögeleri silmek istediğinize emin misiniz?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
-<target>Uyuşmazlık çözülmeden kalsın</target>
+<target>Uyuşmazlık çözülmeden bırakılsın</target>
+
+<source>Time stamp</source>
+<target>Zaman Damgası</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Dosya adlarına zaman damgası eklensin</target>
 
 <source>Replace</source>
-<target>Değiştir</target>
+<target>Değiştirin</target>
 
 <source>Move files and replace if existing</source>
-<target>Dosyaları taşı ve varsa üzerine yaz</target>
-
-<source>Append a timestamp to each file name</source>
-<target>Dosya adlarına zaman damgası ekle</target>
+<target>Dosyalar taşınsın ve varsa üzerine yazılsın</target>
 
 <source>Folder</source>
 <target>Klasör</target>
@@ -1260,6 +1233,12 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Cannot set privilege %x.</source>
 <target>%x izni verilemedi.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Sistem uyku kipine geçirilemedi.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Giriş/Çıkış işlemi öncelikleri değiştirilemedi</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>%x Geri Dönüşüm Kutusuna gönderilemedi</target>
 
@@ -1273,28 +1252,52 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>Son eşleştirmeden bu yana bir değişiklik olmamış!</target>
 
 <source>The corresponding database entries are not in sync considering current settings.</source>
-<target>Karşı düşen veritabanı kayıtları, geçerli ayarlar göz önüne alındığında eşleşmiyor.</target>
+<target>Geçerli ayarlar ile ilgili veritabanı kayıtları eşleşmiyor.</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Varsayılan eşleştirme yönleri ayarlanıyor: Yeni dosyalar eski dosyaların üzerine yazılacak.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target>%x klasörü için Geri Dönüşüm Kutusu kullanılabilir mi diye bakılıyor...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>%x dosyası geri dönüşüm kutusuna atılıyor</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>%x klasörü geri dönüşüm kutusuna atılıyor</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>%x sembolik bağlantısı geri dönüşüm kutusuna atılıyor</target>
+
+<source>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>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Şu yollar için geri dönüşüm kutusu kullanılamaz! Dosyalar anında ve tamamen silinir:</target>
+<target>Aşağıdaki yollar için Geri Dönüşüm Kutusu kullanılamaz! Dosyalar anında ve tamamen silinir:</target>
+
+<source>The corresponding folder will be considered as empty.</source>
+<target>Karşıdaki klasör boş olarak kabul edilecek.</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Bu hatayı yoksayarak, klasörün boş olarak kabul edilmesini sağlayabilirsiniz.</target>
+<source>Cannot find the following folders:</source>
+<target>Aşağıdaki klasörler bulunamadı:</target>
 
-<source>Cannot find folder %x.</source>
-<target>%x klasörü bulunamıyor.</target>
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Bu hatayı yok sayarak karşıdaki klasörleri boş kabul edebilirsiniz.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Klasörler bağımlı! Eşleştirme kurallarını koyarken dikkatli olun:</target>
 
 <source>Start comparison</source>
-<target>Karşılaştırmaya başla</target>
+<target>Karşılaştırmaya başlayın</target>
 
-<source>Preparing synchronization...</source>
-<target>Eşleştirmeye hazırlanıyor...</target>
+<source>Calculating sync directions...</source>
+<target>Eşleştirme yönleri hesaplanıyor...</target>
 
 <source>Conflict detected:</source>
 <target>Uyuşmazlık bulundu:</target>
@@ -1354,29 +1357,11 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>Soldaki öznitelikleri güncelle</target>
 
 <source>Update attributes on right</source>
-<target>Sağdaki öznitelikleri güncelle</target>
+<target>Sağdaki öznitelikler güncellensin</target>
 
 <source>Multiple...</source>
 <target>Çoklu...</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>Moving file %x to recycle bin</source>
-<target>%x dosyası geri dönüşüm kutusuna atılıyor</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>%x klasörü geri dönüşüm kutusuna atılıyor</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>%x sembolik bağlantısı geri dönüşüm kutusuna atılıyor</target>
-
 <source>Moving file %x to %y</source>
 <target>%x dosyası %y içine taşınıyor</target>
 
@@ -1389,9 +1374,6 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Removing old versions...</source>
 <target>Eski sürümler siliniyor...</target>
 
-<source>Creating file %x</source>
-<target>%x dosyası ekleniyor</target>
-
 <source>Creating symbolic link %x</source>
 <target>%x sembolik bağlantısı ekleniyor</target>
 
@@ -1410,6 +1392,9 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Updating attributes of %x</source>
 <target>%x öznitelikleri güncelleniyor</target>
 
+<source>Cannot find %x.</source>
+<target>%x bulunamadı.</target>
+
 <source>Target folder %x already existing.</source>
 <target>%x hedef klasörü zaten var.</target>
 
@@ -1455,6 +1440,9 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Generating database...</source>
 <target>Veri tabanı oluşturuluyor...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>%x için Birim Gölge Kopyası oluşturuluyor...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
-<target>Veri doğrulama hatası: Kaynak ve hedef dosyası içeriği farklı!</target>
+<target>Veri doğrulama hatası: Kaynak ve hedef dosyanın içerikleri farklı!</target>
 
diff --git a/BUILD/Languages/ukrainian.lng b/BUILD/Languages/ukrainian.lng
index a2a0923c..374e212e 100644
--- a/BUILD/Languages/ukrainian.lng
+++ b/BUILD/Languages/ukrainian.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>Загальний час:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Не вдається замкнути каталога %x.</target>
+
 <source>Show in Explorer</source>
 <target>Показати у Провіднику</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>Помилка</target>
 
+<source>Selected variant:</source>
+<target>Вибраний варіант:</target>
+
 <source>Select alternate comparison settings</source>
 <target>Вибрати альтернативні налаштування порівняння</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>Очистити налаштування фільтра</target>
 
+<source>Copy</source>
+<target>Копіювати</target>
+
+<source>Paste</source>
+<target>Вклеїти</target>
+
 <source>Save as batch job</source>
 <target>Зберегти як пакетне завдання</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>Критична помилка</target>
 
-<source>Windows Error Code %x:</source>
-<target>Код помилки Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Код помилки Linux %x:</target>
+<source>Error Code %x:</source>
+<target>Код помилки %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Не вдається вирішити символьне посилання %x.</target>
@@ -161,8 +170,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Очікування зняття блокування з каталогу (%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>Не вдається встановити блокування каталога %х.</target>
+<source>Creating file %x</source>
+<target>Створення файлу %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -196,9 +205,6 @@
 <source>/sec</source>
 <target>/сек</target>
 
-<source>Cannot find file %x.</source>
-<target>Не вдається знайти файлу %x.</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>Файл %x не містить правильної конфігурації.</target>
 
@@ -223,6 +229,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>Не вдається прочитати такі елементи XML:</target>
 
+<source>Cannot find file %x.</source>
+<target>Не вдається знайти файлу %x.</target>
+
 <source>&Open...</source>
 <target>Відкрити...</target>
 
@@ -445,35 +454,32 @@ The command is triggered if:
 <target>2. &Синхронізувати</target>
 
 <source>&Language</source>
-<target>&Мова</target>
+<target>Мова</target>
 
 <source>&Global settings...</source>
-<target>&Глобальні налаштування...</target>
+<target>Глобальні налаштування...</target>
 
 <source>&Export file list...</source>
-<target>&Експортувати список файлів...</target>
+<target>Експортувати список файлів...</target>
 
 <source>&Advanced</source>
-<target>&Додатково</target>
+<target>Додатково</target>
 
-<source>&Check for new version</source>
-<target>&Провірити наявність нової версії</target>
+<source>&Check now</source>
+<target>Перевірити тепер</target>
 
-<source>Compare</source>
-<target>Порівняти</target>
+<source>Check &automatically once a week</source>
+<target>Перевіряти автоматично щотижня</target>
 
-<source>Compare both sides</source>
-<target>Порівняти обидві сторони</target>
+<source>Check for new version</source>
+<target>Перевірити наявність нової версії</target>
 
-<source>&Abort</source>
-<target>&Припинити</target>
+<source>Compare</source>
+<target>Порівняти</target>
 
 <source>Synchronize</source>
 <target>Синхронізувати</target>
 
-<source>Start synchronization</source>
-<target>Розпочати синхронізацію</target>
-
 <source>Add folder pair</source>
 <target>Додати пару папок</target>
 
@@ -483,18 +489,6 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>Поміняти місцями</target>
 
-<source>Open</source>
-<target>Відкрити</target>
-
-<source>Save</source>
-<target>Зберегти</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>
-Останні використовувані налаштування синхронізації
-(тисніть DEL для вилучення зі списку)
-</target>
-
 <source>Hide excluded items</source>
 <target>Приховати виключені елементи</target>
 
@@ -525,6 +519,18 @@ The command is triggered if:
 <source>Time elapsed:</source>
 <target>Пройшло часу:</target>
 
+<source>Synchronizing...</source>
+<target>Синхронізація...</target>
+
+<source>On completion</source>
+<target>Після завершення</target>
+
+<source>Close</source>
+<target>Замкнути</target>
+
+<source>&Pause</source>
+<target>&Пауза</target>
+
 <source>Batch job</source>
 <target>Пакетне завдання</target>
 
@@ -555,9 +561,6 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>Перервати синхронізацію при першій помилці</target>
 
-<source>On completion</source>
-<target>Після завершення</target>
-
 <source>Show progress dialog</source>
 <target>Показувати вікно прогресу</target>
 
@@ -611,8 +614,8 @@ is the same
 <source><- Two way -></source>
 <target><- Обидва напрямки -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Виявити та поширити зміни на обидві сторони використовуючи базу даних. Видалення, перейменування та конфлікти визначаються автоматично.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target>Виявити та поширити зміни на обидві сторони. Видалення, перейменування та конфлікти визначаються автоматично використовуючи базу даних.</target>
 
 <source>Mirror ->></source>
 <target>Дзеркало ->></target>
@@ -650,15 +653,12 @@ is the same
 <source>Versioning</source>
 <target>Запис версій</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>Перемістити файли з часовою міткою у вказану папку</target>
+<source>Move files to user-defined folder</source>
+<target>Перемістити файли у визначену користувачем папку</target>
 
 <source>Naming convention:</source>
 <target>Метод іменування:</target>
 
-<source>Configuration</source>
-<target>Налаштування</target>
-
 <source>Item exists on left side only</source>
 <target>Елемент існує тільки ліворуч</target>
 
@@ -677,12 +677,6 @@ is the same
 <source>Conflict/item cannot be categorized</source>
 <target>Не вдається категоризувати конфлікт/елемент</target>
 
-<source>Synchronizing...</source>
-<target>Синхронізація...</target>
-
-<source>&Pause</source>
-<target>&Пауза</target>
-
 <source>Source code written in C++ using:</source>
 <target>Код програми написаний на C++ з використанням:</target>
 
@@ -743,8 +737,8 @@ Note: File names must be relative to base directories!
 <source>Maximum</source>
 <target>Максимум</target>
 
-<source>&Default</source>
-<target>&За замовчуванням</target>
+<source>&Clear</source>
+<target>Очистити</target>
 
 <source>Fail-safe file copy</source>
 <target>Безпечне копіювання файлів</target>
@@ -773,6 +767,12 @@ Note: File names must be relative to base directories!
 <source>Description</source>
 <target>Опис</target>
 
+<source>&Default</source>
+<target>&За замовчуванням</target>
+
+<source>Start synchronization</source>
+<target>Розпочати синхронізацію</target>
+
 <source>Variant</source>
 <target>Варіант</target>
 
@@ -803,17 +803,23 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>Головна</target>
 
+<source>Configuration</source>
+<target>Налаштування</target>
+
 <source>Filter files</source>
 <target>Фільтр файлів</target>
 
 <source>Select view</source>
 <target>Список файлів</target>
 
-<source>Deleting file %x</source>
-<target>Вилучення файлу %x</target>
+<source>Open...</source>
+<target>Відкрити...</target>
 
-<source>Deleting %x</source>
-<target></target>
+<source>Save</source>
+<target>Зберегти</target>
+
+<source>Compare both sides</source>
+<target>Порівняти обидві сторони</target>
 
 <source>Set direction:</source>
 <target>Виберіть напрям:</target>
@@ -872,104 +878,62 @@ Note: File names must be relative to base directories!
 <source>FreeFileSync batch</source>
 <target>Командний файл FreeFileSync</target>
 
-<source>Never save changes</source>
-<target>Ніколи не зберігати змін</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>Зберегти зміни в %x?</target>
 
 <source>Do&n't save</source>
 <target>Не зберігати</target>
 
+<source>Never save changes</source>
+<target>Ніколи не зберігати змін</target>
+
 <source>Configuration loaded!</source>
 <target>Налаштування синхронізації загружено!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>Приховати файли, які є тільки ліворуч</target>
-
 <source>Show files that exist on left side only</source>
 <target>Показати файли, які є тільки ліворуч</target>
 
-<source>Hide files that exist on right side only</source>
-<target>Приховати файли, які є тільки праворуч</target>
-
 <source>Show files that exist on right side only</source>
 <target>Показати файли, які є тільки праворуч</target>
 
-<source>Hide files that are newer on left</source>
-<target>Приховати файли, котрі новіші ліворуч</target>
-
 <source>Show files that are newer on left</source>
 <target>Показати файли, які новіші ліворуч</target>
 
-<source>Hide files that are newer on right</source>
-<target>Приховати файли, котрі новіші праворуч</target>
-
 <source>Show files that are newer on right</source>
 <target>Показати файли, які новіші праворуч</target>
 
-<source>Hide files that are equal</source>
-<target>Приховати однакові файли</target>
-
 <source>Show files that are equal</source>
 <target>Показати однакові файли</target>
 
-<source>Hide files that are different</source>
-<target>Приховати файли з відмінностями</target>
-
 <source>Show files that are different</source>
 <target>Показати різні файли</target>
 
-<source>Hide conflicts</source>
-<target>Приховати конфлікти</target>
-
 <source>Show conflicts</source>
 <target>Показати конфлікти</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>Приховати файли, які будуть створені ліворуч</target>
-
 <source>Show files that will be created on the left side</source>
 <target>Показати файли, які будуть створені ліворуч</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>Приховати файли, які будуть створені праворуч</target>
-
 <source>Show files that will be created on the right side</source>
 <target>Показати файли, які будуть створені праворуч</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>Приховати файли, які будуть вилучені ліворуч</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>Показати файли, які будуть вилучені ліворуч</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>Приховати файли, які будуть вилучені праворуч</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>Показати файли, які будуть вилучені праворуч</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>Приховати файли, які будуть перезаписані ліворуч</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>Показати файли, які будуть перезаписані ліворуч</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>Приховати файли, які будуть перезаписані праворуч</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>Показати файли, які будуть перезаписані праворуч</target>
 
-<source>Hide files that won't be copied</source>
-<target>Приховати файли, які не будуть зкопійовані</target>
-
 <source>Show files that won't be copied</source>
 <target>Показати файли, які не будуть зкопійовані</target>
 
 <source>Set as default</source>
-<target></target>
+<target>Встановити за замовчуванням</target>
 
 <source>All folders are in sync!</source>
 <target>Всі папки синхронізовано!</target>
@@ -983,6 +947,9 @@ Note: File names must be relative to base directories!
 <source>File list exported!</source>
 <target>Список файлів експортовано!</target>
 
+<source>Searching for program updates...</source>
+<target>Пошук оновлень програми ...</target>
+
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
@@ -1019,6 +986,9 @@ Note: File names must be relative to base directories!
 <source>&Ignore</source>
 <target>&Ігнорувати</target>
 
+<source>Don't show this warning again</source>
+<target>Не показувати більше це попередження</target>
+
 <source>&Switch</source>
 <target>&Змінити</target>
 
@@ -1037,9 +1007,6 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>Порівнювання вмісту...</target>
 
-<source>Copy</source>
-<target>Копія</target>
-
 <source>Paused</source>
 <target>Призупинено</target>
 
@@ -1122,37 +1089,40 @@ Note: File names must be relative to base directories!
 <target>Зробити приховані попередження та діалоги ​​знову видимими?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
 </source>
 <target>
-<pluralform>Ви справді хочете перемістити у Корзину цей %x об'єкт?</pluralform>
-<pluralform>Ви справді хочете перемістити у Корзину ці %x об'єкти?</pluralform>
-<pluralform>Ви справді хочете перемістити у Корзину ці %x об'єктів?</pluralform>
+<pluralform>Ви дійсно хочете перемістити цей елемент до Корзини?</pluralform>
+<pluralform>Ви дійсно хочете перемістити ці %x елементи до Корзини?</pluralform>
+<pluralform>Ви дійсно хочете перемістити ці %x елементів до Корзини?</pluralform>
 </target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<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>Ви справді хочете вилучити цей %x об'єкт?</pluralform>
-<pluralform>Ви справді хочете вилучити ці %x об'єкти?</pluralform>
-<pluralform>Ви справді хочете вилучити ці %x об'єктів?</pluralform>
+<pluralform>Ви дійсно хочете вилучити цей елемент?</pluralform>
+<pluralform>Ви дійсно хочете вилучити ці %x елементи?</pluralform>
+<pluralform>Ви дійсно хочете вилучити ці %x елементів?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Залишити як невирішений конфлікт</target>
 
+<source>Time stamp</source>
+<target>Часова мітка</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Додати часову мітку до кожного імені файлу</target>
+
 <source>Replace</source>
 <target>Замінити</target>
 
 <source>Move files and replace if existing</source>
 <target>Перемістити файли замінюючи існуючі</target>
 
-<source>Append a timestamp to each file name</source>
-<target>Додати часову мітку до кожного імені файлу</target>
-
 <source>Folder</source>
 <target>Папка</target>
 
@@ -1165,6 +1135,9 @@ Note: File names must be relative to base directories!
 <source>Files</source>
 <target>Файли</target>
 
+<source>Items</source>
+<target></target>
+
 <source>Percentage</source>
 <target>Проценти</target>
 
@@ -1270,6 +1243,12 @@ Note: File names must be relative to base directories!
 <source>Cannot set privilege %x.</source>
 <target>Не вдається встановити привілеї %х.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target>Не вдалося призупинити режим сну системи.</target>
+
+<source>Cannot change process I/O priorities.</source>
+<target>Не вдалося змінити пріоритетів Вх/Вих процесу.</target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Не вдається перенести %x до Корзини!</target>
 
@@ -1292,16 +1271,37 @@ Note: File names must be relative to base directories!
 </target>
 
 <source>Checking recycle bin availability for folder %x...</source>
-<target></target>
+<target>Перевірка доступності Корзини для папки %x...</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Переміщення файлу %x у Корзину</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Переміщення папки %x у Корзину</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Переміщення символьного посилання %x у Корзину</target>
+
+<source>Deleting file %x</source>
+<target>Вилучення файлу %x</target>
+
+<source>Deleting folder %x</source>
+<target>Вилучення папки %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Вилучення символьного посилання %x</target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Корзина для цього шляху недоступна. Файли будуть вилучені назавжди:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>Ви можете ігнорувати цю помилку вважаючи папку порожньою.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>Відповідна папка буде вважатися порожньою.</target>
+
+<source>Cannot find the following folders:</source>
+<target>Не вдається знайти такі папки:</target>
 
-<source>Cannot find folder %x.</source>
-<target>Не вдається знайти папку %x.</target>
+<source>You can ignore this error to consider each folder as empty.</source>
+<target>Ви можете ігнорувати цю помилку, вважаючи кожну папку порожньою.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Залежні каталоги! Будьте уважні при налаштуванні правил синхронізації:</target>
@@ -1309,8 +1309,8 @@ Note: File names must be relative to base directories!
 <source>Start comparison</source>
 <target>Розпочати порівняння</target>
 
-<source>Preparing synchronization...</source>
-<target>Підготовка до синхронізації...</target>
+<source>Calculating sync directions...</source>
+<target>Встановлення напрямку синхронізації...</target>
 
 <source>Conflict detected:</source>
 <target>Виявлено конфлікт:</target>
@@ -1375,21 +1375,6 @@ Note: File names must be relative to base directories!
 <source>Multiple...</source>
 <target>Різні варіанти...</target>
 
-<source>Deleting folder %x</source>
-<target>Вилучення папки %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Вилучення символьного посилання %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Переміщення файлу %x у Корзину</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Переміщення папки %x у Корзину</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Переміщення символьного посилання %x у Корзину</target>
-
 <source>Moving file %x to %y</source>
 <target>Переміщення файлу %x до %y</target>
 
@@ -1402,9 +1387,6 @@ Note: File names must be relative to base directories!
 <source>Removing old versions...</source>
 <target>Видалення старих версій...</target>
 
-<source>Creating file %x</source>
-<target>Створення файлу %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Створення символьного посилання %x</target>
 
@@ -1423,6 +1405,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>Оновлення атрибутів %x</target>
 
+<source>Cannot find %x.</source>
+<target>Не вдається знайти %x.</target>
+
 <source>Target folder %x already existing.</source>
 <target>Цільова папка %x вже існує.</target>
 
@@ -1468,6 +1453,9 @@ Note: File names must be relative to base directories!
 <source>Generating database...</source>
 <target>Створення бази даних...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Створення Тому тіньового копіювання для %x...</target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>Помилка перевірки даних: вхідний і вихідний файли мають різний вміст!</target>