5.16

31 files changed, 3933 insertions, 2660 deletions

diff --git a/BUILD/Languages/arabic.lng b/BUILD/Languages/arabic.lng
index 668ee713..b4301431 100644
--- a/BUILD/Languages/arabic.lng
+++ b/BUILD/Languages/arabic.lng
@@ -20,7 +20,7 @@
 <target>مجموع الوقت:</target>
 
 <source>Cannot set directory lock for %x.</source>
-<target></target>
+<target>تعذر إنشاء قفل للمسار %x.</target>
 
 <source>Show in Explorer</source>
 <target>إظهار في المستكشف</target>
@@ -68,7 +68,7 @@
 <target>نسخ</target>
 
 <source>Paste</source>
-<target></target>
+<target>لصق</target>
 
 <source>Save as batch job</source>
 <target>حفظ كمهمة دفعية</target>
@@ -115,28 +115,28 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>لا يمكن حل الارتباط الرمزي  %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
-
-<source>%x GB</source>
-<target>%x GB</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
 </source>
 <target>
-<pluralform>%x Bytes</pluralform>
+<pluralform>0 Bytes</pluralform>
 <pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>2 Bytes</pluralform>
 <pluralform>%x Bytes</pluralform>
 <pluralform>%x Bytes</pluralform>
 <pluralform>%x Bytes</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>ملف قاعدة البيانات  %x غير متوافق.</target>
 
@@ -173,44 +173,44 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>في انتظار تأمين قفل للمسار (%x)...</target>
 
-<source>Creating file %x</source>
-<target>إنشاء الملف %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
 </source>
 <target>
-<pluralform>ولا ثانية</pluralform>
-<pluralform>ثانية واحدة</pluralform>
-<pluralform>ثانيتين</pluralform>
+<pluralform>0 ثانية</pluralform>
+<pluralform>1 ثانية واحدة</pluralform>
+<pluralform>2 ثانيتين</pluralform>
 <pluralform>%x ثواني</pluralform>
 <pluralform>%x ثانية</pluralform>
 <pluralform>%x ثانية</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>إنشاء الملف %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>حدث خطأ أثناء تحليل الملف  %x، الصف  %y، و العمود  %z.</target>
 
 <source>Scanning:</source>
 <target>الفحص:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>ترميز المعلومات الموسعة للوقت: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
 </source>
 <target>
-<pluralform>ولا بند</pluralform>
-<pluralform>بند واحد</pluralform>
-<pluralform>بندان</pluralform>
-<pluralform>%x بنداً</pluralform>
+<pluralform>0 بند</pluralform>
+<pluralform>1 بند واحد</pluralform>
+<pluralform>2 بندان</pluralform>
+<pluralform>%x بنود</pluralform>
 <pluralform>%x بنداً</pluralform>
 <pluralform>%x بند</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>ترميز المعلومات الموسعة للوقت: %x</target>
+
 <source>/sec</source>
 <target>\ثانية</target>
 
@@ -424,7 +424,7 @@ The command is triggered if:
 <target>التاريخ:</target>
 
 <source>Action</source>
-<target>نشاط</target>
+<target>التصرف</target>
 
 <source>Category</source>
 <target>الفئة</target>
@@ -475,13 +475,13 @@ The command is triggered if:
 <target>&متقدم</target>
 
 <source>&Check now</source>
-<target></target>
+<target>&تحقق الآن</target>
 
 <source>Check &automatically once a week</source>
-<target></target>
+<target>تحقق &أوتوماتيكياً بشكل أسبوعي</target>
 
 <source>Check for new version</source>
-<target></target>
+<target>التحقق من وجود نسخة جديدة</target>
 
 <source>Compare</source>
 <target>قارن</target>
@@ -602,7 +602,7 @@ are the same
 </target>
 
 <source>File time and size</source>
-<target>وقت الملف و حجمه</target>
+<target>تاريخ الملف و حجمه</target>
 
 <source>
 Files are found equal if
@@ -622,19 +622,19 @@ is the same
 <target>التعامل مع الارتباط رمزي</target>
 
 <source>OK</source>
-<target>حسناً</target>
+<target>موافق</target>
 
 <source><- Two way -></source>
 <target><- بالاتجاهين -></target>
 
 <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
-<target></target>
+<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>
@@ -667,22 +667,22 @@ is the same
 <target>الوسم برقم الإصدار</target>
 
 <source>Move files to user-defined folder</source>
-<target></target>
+<target>نقل الملفات إلى مجلد يحدده المستخدم</target>
 
 <source>Naming convention:</source>
 <target>اصطلاح التسمية:</target>
 
 <source>Item exists on left side only</source>
-<target>العنصر موجود على الجانب الأيسر فقط</target>
+<target>العنصر موجود على الجانب الأيمن فقط</target>
 
 <source>Item exists on right side only</source>
-<target>العنصر موجود في الجانب الأيمن فقط</target>
+<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>
@@ -751,7 +751,7 @@ Note: File names must be relative to base directories!
 <target>الحد الأقصى</target>
 
 <source>&Clear</source>
-<target></target>
+<target>&إزالة</target>
 
 <source>Fail-safe file copy</source>
 <target>نسخ ملفات آمن من الفشل</target>
@@ -790,7 +790,7 @@ Note: File names must be relative to base directories!
 <target>المتغير</target>
 
 <source>Statistics</source>
-<target>الإحصاءات</target>
+<target>إحصائيات</target>
 
 <source>Don't show this dialog again</source>
 <target>عدم إظهار نافذة الحوار هذه مرة أخرى</target>
@@ -804,9 +804,6 @@ Note: File names must be relative to base directories!
 <source>&Find next</source>
 <target>&بحث عن التالي</target>
 
-<source>Operation aborted!</source>
-<target>تم إحباط العملية!</target>
-
 <source>Main bar</source>
 <target>الشريط الرئيسي</target>
 
@@ -834,6 +831,45 @@ Note: File names must be relative to base directories!
 <source>Compare both sides</source>
 <target>مقارنة بين كلا الجانبين</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>0 مسار</pluralform>
+<pluralform>1 مسار واحد</pluralform>
+<pluralform>2 مساران</pluralform>
+<pluralform>%x مسارات</pluralform>
+<pluralform>%x مساراً</pluralform>
+<pluralform>%x مسار</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>0 ملف</pluralform>
+<pluralform>1 ملف واحد</pluralform>
+<pluralform>2 ملفان</pluralform>
+<pluralform>%x ملفات</pluralform>
+<pluralform>%x ملفاً</pluralform>
+<pluralform>%x ملف</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>الظاهر %y من أصل 0 سطر</pluralform>
+<pluralform>الظاهر %y من أصل 1 (سطر وحيد)</pluralform>
+<pluralform>الظاهر %y من أصل 2 (سطرين)</pluralform>
+<pluralform>الظاهر %y من أصل %x سطور</pluralform>
+<pluralform>الظاهر %y من أصل %x سطراً</pluralform>
+<pluralform>الظاهر %y من أصل %x سطر</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>تحديد الاتجاه:</target>
 
@@ -904,16 +940,16 @@ Note: File names must be relative to base directories!
 <target>تم فتح التكوين!</target>
 
 <source>Show files that exist on left side only</source>
-<target>إظهار الملفات الموجودة في الجانب الأيسر فقط</target>
+<target>إظهار الملفات الموجودة في الجانب الأيمن فقط</target>
 
 <source>Show files that exist on right side only</source>
-<target>إظهار الملفات الموجودة في الجانب الأيمن فقط</target>
+<target>إظهار الملفات الموجودة في الجانب الأيسر فقط</target>
 
 <source>Show files that are newer on left</source>
-<target>إظهار الملفات الأحدث في اليسار</target>
+<target>إظهار الملفات الأحدث في اليمين</target>
 
 <source>Show files that are newer on right</source>
-<target>إظهار الملفات الأحدث في اليمين</target>
+<target>إظهار الملفات الأحدث في اليسار</target>
 
 <source>Show files that are equal</source>
 <target>إظهار الملفات المتماثلة على الطرفين</target>
@@ -925,22 +961,22 @@ Note: File names must be relative to base directories!
 <target>إظهار الاختلافات</target>
 
 <source>Show files that will be created on the left side</source>
-<target>إظهار الملفات التي سيتم إنشاؤها في الجانب الأيسر</target>
+<target>إظهار الملفات التي سيتم إنشاؤها في الجانب الأيمن</target>
 
 <source>Show files that will be created on the right side</source>
-<target>إظهار الملفات التي سيتم إنشاؤها في الجانب الأيمن</target>
+<target>إظهار الملفات التي سيتم إنشاؤها في الجانب الأيسر</target>
 
 <source>Show files that will be deleted on the left side</source>
-<target>إظهار الملفات التي سيتم حذفها من من الجانب الأيسر</target>
+<target>إظهار الملفات التي سيتم حذفها من من الجانب الأيمن</target>
 
 <source>Show files that will be deleted on the right side</source>
-<target>إظهار الملفات التي سيتم حذفها من الجانب الأيمن</target>
+<target>إظهار الملفات التي سيتم حذفها من الجانب الأيسر</target>
 
 <source>Show files that will be overwritten on left side</source>
-<target>إظهار الملفات التي سيتم الكتابة فوقها في الجانب الأيسر</target>
+<target>إظهار الملفات التي سيتم الكتابة فوقها في الجانب الأيمن</target>
 
 <source>Show files that will be overwritten on right side</source>
-<target>إظهار الملفات التي سيتم الكتابة فوقها في الجانب الأيمن</target>
+<target>إظهار الملفات التي سيتم الكتابة فوقها في الجانب الأيسر</target>
 
 <source>Show files that won't be copied</source>
 <target>إظهار الملفات التي لن يتم نسخها</target>
@@ -948,6 +984,9 @@ Note: File names must be relative to base directories!
 <source>Set as default</source>
 <target>تحديد كوضع افتراضي</target>
 
+<source>Operation aborted!</source>
+<target>تم إحباط العملية!</target>
+
 <source>All folders are in sync!</source>
 <target>جميع المجلدات متزامنة!</target>
 
@@ -961,46 +1000,7 @@ Note: File names must be relative to base directories!
 <target>تم تصدير قائمة الملفات!</target>
 
 <source>Searching for program updates...</source>
-<target></target>
-
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>ولا مسار</pluralform>
-<pluralform>مسار واحد</pluralform>
-<pluralform>مساران</pluralform>
-<pluralform>%x مسارات</pluralform>
-<pluralform>%x مساراً</pluralform>
-<pluralform>%x مسار</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>ولا ملف</pluralform>
-<pluralform>ملف واحد</pluralform>
-<pluralform>ملفان</pluralform>
-<pluralform>%x ملفات</pluralform>
-<pluralform>%x ملفاً</pluralform>
-<pluralform>%x ملف</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>عرض %x من ولا صف</pluralform>
-<pluralform>عرض %x من صف واحد</pluralform>
-<pluralform>عرض %x من صفين</pluralform>
-<pluralform>عرض %x من %y صفاً</pluralform>
-<pluralform>عرض %x من %y صفاً</pluralform>
-<pluralform>عرض %x من %y صفاً</pluralform>
-</target>
+<target>جاري البحث عن تحديثات للبرنامج...</target>
 
 <source>Ignore further errors</source>
 <target>تجاهل أي أخطاء أخرى</target>
@@ -1009,7 +1009,7 @@ Note: File names must be relative to base directories!
 <target>&تجاهل</target>
 
 <source>Don't show this warning again</source>
-<target></target>
+<target>لا تظهر هذا التنبيه ثانية</target>
 
 <source>&Switch</source>
 <target>&تبديل</target>
@@ -1083,6 +1083,32 @@ Note: File names must be relative to base directories!
 <source>Filter</source>
 <target>عامل التصفية</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>هل تريد حقاً نقل 0 ملف التالي إلى سلة المهملات ؟</pluralform>
+<pluralform>هل تريد حقاً نقل الملف 1 التالي إلى سلة المهملات ؟</pluralform>
+<pluralform>هل تريد حقاً نقل الملفين 2 التاليين إلى سلة المهملات ؟</pluralform>
+<pluralform>هل تريد حقاً نقل الـ %x ملفات التالية إلى سلة المهملات ؟</pluralform>
+<pluralform>هل تريد حقاً نقل الـ %x ملفاً التالية إلى سلة المهملات ؟</pluralform>
+<pluralform>هل تريد حقاً نقل الـ %x ملف التالية إلى سلة المهملات ؟</pluralform>
+</target>
+
+<source>
+<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>هل تريد حقاً حذف 0 ملف التالي ؟</pluralform>
+<pluralform>هل تريد حقاً حذف الملف 1 التالي ؟</pluralform>
+<pluralform>هل تريد حقاً حذف الملفين 2 التاليين ؟</pluralform>
+<pluralform>هل تريد حقاً حذف الـ %x ملفات التالية ؟</pluralform>
+<pluralform>هل تريد حقاً حذف الـ %x ملفاً التالية ؟</pluralform>
+<pluralform>هل تريد حقاً حذف الـ %x ملف التالية ؟</pluralform>
+</target>
+
 <source>Direct</source>
 <target>مباشر</target>
 
@@ -1110,23 +1136,11 @@ Note: File names must be relative to base directories!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>جعل التحذيرات و نوافذ الحوارات المخفية مرئية من جديد؟</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target></target>
-
 <source>Leave as unresolved conflict</source>
 <target>ترك كاختلافات من دون حل</target>
 
 <source>Time stamp</source>
-<target></target>
+<target>البصمة الزمنية</target>
 
 <source>Append a timestamp to each file name</source>
 <target>إلحاق طابع زمني اسم كل ملف</target>
@@ -1149,6 +1163,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>
 
@@ -1218,17 +1235,14 @@ Note: File names must be relative to base directories!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
 </source>
 <target>
-<pluralform>ولا دقيقة</pluralform>
-<pluralform>دقيقة واحدة</pluralform>
-<pluralform>دقيقتان</pluralform>
+<pluralform>0 دقيقة</pluralform>
+<pluralform>1 دقيقة واحدة</pluralform>
+<pluralform>2 دقيقتان</pluralform>
 <pluralform>%x دقائق</pluralform>
 <pluralform>%x دقيقة</pluralform>
 <pluralform>%x دقيقة</pluralform>
@@ -1239,9 +1253,9 @@ Note: File names must be relative to base directories!
 <pluralform>%x hours</pluralform>
 </source>
 <target>
-<pluralform>ولا ساعة</pluralform>
-<pluralform>ساعة واحدة</pluralform>
-<pluralform>ساعتين</pluralform>
+<pluralform>0 ساعة</pluralform>
+<pluralform>1 ساعة واحدة</pluralform>
+<pluralform>2 ساعتين</pluralform>
 <pluralform>%x ساعات</pluralform>
 <pluralform>%x ساعة</pluralform>
 <pluralform>%x ساعة</pluralform>
@@ -1252,9 +1266,9 @@ Note: File names must be relative to base directories!
 <pluralform>%x days</pluralform>
 </source>
 <target>
-<pluralform>ولا يوم</pluralform>
-<pluralform>يوم واحد</pluralform>
-<pluralform>يومان</pluralform>
+<pluralform>0 يوم</pluralform>
+<pluralform>1 يوم واحد</pluralform>
+<pluralform>2 يومان</pluralform>
 <pluralform>%x أيام</pluralform>
 <pluralform>%x يوماً</pluralform>
 <pluralform>%x يوم</pluralform>
@@ -1312,13 +1326,13 @@ Note: File names must be relative to base directories!
 <target>سلة المهملات غير متوفر للمسارات التالية! سيتم حذف الملفات بشكل دائم بدلاً من ذلك:</target>
 
 <source>The corresponding folder will be considered as empty.</source>
-<target></target>
+<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>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>المسارات تلعية! كن حذراً عند إعداد قواعد المزامنة:</target>
@@ -1327,7 +1341,7 @@ Note: File names must be relative to base directories!
 <target>ابدأ المقارنة</target>
 
 <source>Calculating sync directions...</source>
-<target></target>
+<target>جاري حساب اتجاهات المزامنة...</target>
 
 <source>Conflict detected:</source>
 <target>تم الكشف عن تعارض:</target>
@@ -1357,37 +1371,37 @@ Note: File names must be relative to base directories!
 <target>كلا الجانبين متماثلان</target>
 
 <source>Copy new item to left</source>
-<target>نسخ عنصر جديد إلى اليسار</target>
+<target>نسخ عنصر جديد إلى اليمين</target>
 
 <source>Copy new item to right</source>
-<target>نسخ عنصر جديد إلى اليمين</target>
+<target>نسخ عنصر جديد إلى اليسار</target>
 
 <source>Delete left item</source>
-<target>حذف العنصر الأيسر</target>
+<target>حذف العنصر الأيمن</target>
 
 <source>Delete right item</source>
-<target>حذف العنصر الأيمن</target>
+<target>حذف العنصر الأيسر</target>
 
 <source>Move file on left</source>
-<target>نقل ملف على اليسار</target>
+<target>نقل ملف على اليمين</target>
 
 <source>Move file on right</source>
-<target>نقل ملف على اليمين</target>
+<target>نقل ملف على اليسار</target>
 
 <source>Overwrite left item</source>
-<target>الكتابة فوق العنصر الأيسر</target>
+<target>الكتابة فوق العنصر الأيمن</target>
 
 <source>Overwrite right item</source>
-<target>الكتابة فوق العنصر الأيمن</target>
+<target>الكتابة فوق العنصر الأيسر</target>
 
 <source>Do nothing</source>
 <target>لا تفعل شيئا</target>
 
 <source>Update attributes on left</source>
-<target>تحديث السمات على اليسار</target>
+<target>تحديث السمات على اليمين</target>
 
 <source>Update attributes on right</source>
-<target>تحديث السمات على اليمين</target>
+<target>تحديث السمات على اليسار</target>
 
 <source>Multiple...</source>
 <target>متعددة...</target>
@@ -1458,12 +1472,6 @@ Note: File names must be relative to base directories!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>سيتم تعديل مجلد الذي هو جزء من أزواج المجلدات المتعددة. الرجاء مراجعة إعدادات المزامنة.</target>
 
-<source>Left</source>
-<target>اليسار</target>
-
-<source>Right</source>
-<target>حق</target>
-
 <source>Synchronizing folder pair:</source>
 <target>مزامنة زوج مجلدات:</target>
 
@@ -1471,7 +1479,7 @@ Note: File names must be relative to base directories!
 <target>إنشاء قاعدة بيانات...</target>
 
 <source>Creating Volume Shadow Copy for %x...</source>
-<target></target>
+<target>جاري إنشاء نسخة ظلية لـ %x...</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 3d0f0d25..0f87d315 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -20,7 +20,7 @@
 <target>总共时间:</target>
 
 <source>Cannot set directory lock for %x.</source>
-<target></target>
+<target>无法为 %x 设置目录锁定.</target>
 
 <source>Show in Explorer</source>
 <target>在Explorer中显示</target>
@@ -44,7 +44,7 @@
 <target>错误</target>
 
 <source>Selected variant:</source>
-<target></target>
+<target>选定的变化:</target>
 
 <source>Select alternate comparison settings</source>
 <target>选择替换的比较设置</target>
@@ -68,7 +68,7 @@
 <target>复制</target>
 
 <source>Paste</source>
-<target></target>
+<target>粘贴</target>
 
 <source>Save as batch job</source>
 <target>另存为批处理作业</target>
@@ -110,11 +110,19 @@
 <target>致命错误</target>
 
 <source>Error Code %x:</source>
-<target></target>
+<target>错误代码 %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>无法解决符号连接 %x.</target>
 
+<source>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
+</source>
+<target>
+<pluralform>%x 字节</pluralform>
+</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -124,14 +132,6 @@
 <source>%x GB</source>
 <target>%x GB</target>
 
-<source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</source>
-<target>
-<pluralform>%x 字节</pluralform>
-</target>
-
 <source>Database file %x is incompatible.</source>
 <target>数据库文件 %x 不兼容.</target>
 
@@ -168,9 +168,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>由于目录已锁定而正在等待(%x)...</target>
 
-<source>Creating file %x</source>
-<target>正在创建文件 %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -179,15 +176,15 @@
 <pluralform>%x 秒</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>正在创建文件 %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>当分析文件 %x , 行 %y, 列 %z 时出错.</target>
 
 <source>Scanning:</source>
 <target>扫描中:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>正在编码扩展时间信息:%x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -196,6 +193,9 @@
 <pluralform>[%x 线程]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>正在编码扩展时间信息:%x</target>
+
 <source>/sec</source>
 <target>/秒</target>
 
@@ -460,13 +460,13 @@ The command is triggered if:
 <target>高级(&A)</target>
 
 <source>&Check now</source>
-<target></target>
+<target>现在检查(&C)</target>
 
 <source>Check &automatically once a week</source>
-<target></target>
+<target>每周自动检查一次(&A)</target>
 
 <source>Check for new version</source>
-<target></target>
+<target>检查新版本</target>
 
 <source>Compare</source>
 <target>比较</target>
@@ -520,7 +520,7 @@ The command is triggered if:
 <target>在完成时</target>
 
 <source>Close</source>
-<target></target>
+<target>关闭</target>
 
 <source>&Pause</source>
 <target>暂停(&P)</target>
@@ -613,7 +613,7 @@ is the same
 <target><-双向-></target>
 
 <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
-<target></target>
+<target>识别和传播两侧的变化. 删除, 移动和冲突会使用一个数据库来自动检测.</target>
 
 <source>Mirror ->></source>
 <target>镜像 ->></target>
@@ -652,7 +652,7 @@ is the same
 <target>保留历史版本</target>
 
 <source>Move files to user-defined folder</source>
-<target></target>
+<target>移动文件至用户定义文件夹</target>
 
 <source>Naming convention:</source>
 <target>命名规则:</target>
@@ -736,7 +736,7 @@ Note: File names must be relative to base directories!
 <target>最大</target>
 
 <source>&Clear</source>
-<target></target>
+<target>清除(&C)</target>
 
 <source>Fail-safe file copy</source>
 <target>无风险的文件复制</target>
@@ -811,7 +811,7 @@ Note: File names must be relative to base directories!
 <target>选择视图</target>
 
 <source>Open...</source>
-<target></target>
+<target>打开...</target>
 
 <source>Save</source>
 <target>保存</target>
@@ -819,6 +819,30 @@ Note: File names must be relative to base directories!
 <source>Compare both sides</source>
 <target>比较两侧</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x 目录</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x 文件</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%x 中的 %y 行在视图中</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>设置方向:</target>
 
@@ -931,7 +955,7 @@ Note: File names must be relative to base directories!
 <target>显示将不被复制的文件</target>
 
 <source>Set as default</source>
-<target></target>
+<target>设置为默认值</target>
 
 <source>All folders are in sync!</source>
 <target>所有文件夹都是同步的!</target>
@@ -946,31 +970,7 @@ Note: File names must be relative to base directories!
 <target>文件清单已经导出!</target>
 
 <source>Searching for program updates...</source>
-<target></target>
-
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x 目录</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x 文件</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%y 中的 %x 行可见</pluralform>
-</target>
+<target>正在搜索程序的更新...</target>
 
 <source>Ignore further errors</source>
 <target>忽略之后出现的错误</target>
@@ -979,7 +979,7 @@ Note: File names must be relative to base directories!
 <target>忽略(&I)</target>
 
 <source>Don't show this warning again</source>
-<target></target>
+<target>不要再显示这个警告</target>
 
 <source>&Switch</source>
 <target>切换(&S)</target>
@@ -1053,6 +1053,22 @@ Note: File names must be relative to base directories!
 <source>Filter</source>
 <target>过滤器</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>是否真的要移动如下 %x 个项目到回收站?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>是否真的要删除如下 %x 个项目?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>直接</target>
 
@@ -1080,23 +1096,11 @@ Note: File names must be relative to base directories!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>重新让已经隐藏的警告和对话框变为可见?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target></target>
-
 <source>Leave as unresolved conflict</source>
 <target>遗留为未解决的冲突</target>
 
 <source>Time stamp</source>
-<target></target>
+<target>时间戳</target>
 
 <source>Append a timestamp to each file name</source>
 <target>附加时间戳到每一个文件名</target>
@@ -1119,6 +1123,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>
 
@@ -1188,9 +1195,6 @@ Note: File names must be relative to base directories!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1219,10 +1223,10 @@ Note: File names must be relative to base directories!
 <target>无法设置 %x 的特权.</target>
 
 <source>Failed to suspend system sleep mode.</source>
-<target></target>
+<target>中止系统睡眠模式失败.</target>
 
 <source>Cannot change process I/O priorities.</source>
-<target></target>
+<target>无法更改进程的I/O优先级.</target>
 
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>无法移动 %x 到回收站!</target>
@@ -1243,7 +1247,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>
@@ -1267,13 +1271,13 @@ Note: File names must be relative to base directories!
 <target>如下路径的回收站不可用! 文件会被永久删除:</target>
 
 <source>The corresponding folder will be considered as empty.</source>
-<target></target>
+<target>相应的文件夹将被视为空.</target>
 
 <source>Cannot find the following folders:</source>
-<target></target>
+<target>无法找到如下文件夹:</target>
 
-<source>You can ignore this error to consider each folder as empty.</source>
-<target></target>
+<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>你可忽略此错误而将每个文件夹视为空. 这些文件夹将会在同步过程中被自动创建.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>目录有依赖性！在设立同步规则时请小心:</target>
@@ -1282,7 +1286,7 @@ Note: File names must be relative to base directories!
 <target>开始比较</target>
 
 <source>Calculating sync directions...</source>
-<target></target>
+<target>正在计算同步方向...</target>
 
 <source>Conflict detected:</source>
 <target>检测到的冲突:</target>
@@ -1378,7 +1382,7 @@ Note: File names must be relative to base directories!
 <target>更新 %x 的属性</target>
 
 <source>Cannot find %x.</source>
-<target></target>
+<target>无法找到 %x.</target>
 
 <source>Target folder %x already existing.</source>
 <target>目标文件夹 %x 已经存在.</target>
@@ -1426,7 +1430,7 @@ Note: File names must be relative to base directories!
 <target>正在生成数据库...</target>
 
 <source>Creating Volume Shadow Copy for %x...</source>
-<target></target>
+<target>正在为 %x 创建卷影响复制...</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 2a63530b..763359ae 100644
--- a/BUILD/Languages/chinese_traditional.lng
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -113,7 +113,15 @@
 <target>錯誤代碼 %x：</target>
 
 <source>Cannot resolve symbolic link %x.</source>
-<target>無法解析符號連結 %X。</target>
+<target>無法解析符號連結 %x。</target>
+
+<source>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
+</source>
+<target>
+<pluralform>%x 位元組</pluralform>
+</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -124,14 +132,6 @@
 <source>%x GB</source>
 <target>%x GB</target>
 
-<source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</source>
-<target>
-<pluralform>%x 位元組</pluralform>
-</target>
-
 <source>Database file %x is incompatible.</source>
 <target>資料庫檔案 %x 是不相容的。</target>
 
@@ -148,10 +148,10 @@
 <target>記憶體不足！</target>
 
 <source>Cannot write file %x.</source>
-<target>無法寫入檔案 %X。</target>
+<target>無法寫入檔案 %x。</target>
 
 <source>Cannot read file %x.</source>
-<target>無法讀取檔案 %X。</target>
+<target>無法讀取檔案 %x。</target>
 
 <source>Database files do not share a common session.</source>
 <target>資料庫檔案不會共享一個共同的連線。</target>
@@ -168,9 +168,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>等待同時目錄被鎖定(%x)...</target>
 
-<source>Creating file %x</source>
-<target>正在新建檔案 %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -179,15 +176,15 @@
 <pluralform>%x 秒</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>正在新建檔案 %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>解析 %x 檔案，第 %y 列，第 %z 行出現錯誤。</target>
 
 <source>Scanning:</source>
 <target>正在掃瞄：</target>
 
-<source>Encoding extended time information: %x</source>
-<target>編碼延長時間資訊：%x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -196,6 +193,9 @@
 <pluralform>[%x 個執行緒]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>編碼延長時間資訊：%x</target>
+
 <source>/sec</source>
 <target>/秒</target>
 
@@ -367,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>
@@ -439,7 +439,7 @@ The command is triggered if:
 <target>儲存(&S)</target>
 
 <source>Save as &batch job...</source>
-<target>另存為批次處理作業(&B)</target>
+<target>另存為批次處理作業(&b)</target>
 
 <source>1. &Compare</source>
 <target>1. 比對(&C)</target>
@@ -493,7 +493,7 @@ The command is triggered if:
 <target>將被新建的檔案和資料夾數量</target>
 
 <source>Number of files that will be overwritten</source>
-<target>一些檔案和目錄將被覆蓋</target>
+<target>一些檔案和目錄會被覆蓋</target>
 
 <source>Number of files and folders that will be deleted</source>
 <target>將被刪除的檔案和資料夾數量</target>
@@ -780,9 +780,6 @@ Note: File names must be relative to base directories!
 <source>&Find next</source>
 <target>找下一個(&F)</target>
 
-<source>Operation aborted!</source>
-<target>操作已中止！</target>
-
 <source>Main bar</source>
 <target>主欄位</target>
 
@@ -810,6 +807,30 @@ Note: File names must be relative to base directories!
 <source>Compare both sides</source>
 <target>比對兩邊</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x 個目錄</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x 個檔案</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>視圖中的第 %x 列中的第 %y 列</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>設定方向：</target>
 
@@ -924,6 +945,9 @@ Note: File names must be relative to base directories!
 <source>Set as default</source>
 <target>設為預設值</target>
 
+<source>Operation aborted!</source>
+<target>操作已中止！</target>
+
 <source>All folders are in sync!</source>
 <target>所有資料夾都是同步的！</target>
 
@@ -939,30 +963,6 @@ Note: File names must be relative to base directories!
 <source>Searching for program updates...</source>
 <target>正在搜尋程式更新...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x 個目錄</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x 個檔案</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>檢視中的 %x 之 %y 列</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>忽略進一步錯誤</target>
 
@@ -1044,6 +1044,22 @@ Note: File names must be relative to base directories!
 <source>Filter</source>
 <target>篩選器</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>您確定要將下列 %x 項目移動到資源回收筒嗎？</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>您確定要將下列 %x 項目刪除嗎？</pluralform>
+</target>
+
 <source>Direct</source>
 <target>直接</target>
 
@@ -1071,22 +1087,6 @@ Note: File names must be relative to base directories!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>使隱藏的警告和對話框再次可見？</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>您確定要將下列 %x 項目移動到資源回收筒嗎？</pluralform>
-</target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<pluralform>您確定要將下列 %x 項目刪除嗎？</pluralform>
-</target>
-
 <source>Leave as unresolved conflict</source>
 <target>保留給未解決的衝突</target>
 
@@ -1114,6 +1114,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>
 
@@ -1183,9 +1186,6 @@ Note: File names must be relative to base directories!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1217,7 +1217,7 @@ Note: File names must be relative to base directories!
 <target>中止系統睡眠模式失敗。</target>
 
 <source>Cannot change process I/O priorities.</source>
-<target>無法更改 I/O 處理優先順序。</target>
+<target>無法更改I/O處理優先順序。</target>
 
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>無法將 %x 移動到資源回收筒！</target>
@@ -1232,7 +1232,7 @@ Note: File names must be relative to base directories!
 <target>自上次同步以來都沒有變更！</target>
 
 <source>The corresponding database entries are not in sync considering current settings.</source>
-<target>相應的資料庫條目在同步時，不考慮到目前的設定。</target>
+<target>相應的資料庫條目在同步時，不會考慮到目前的設定。</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>設定預設同步方向：舊檔案會被較新的檔案覆蓋。</target>
@@ -1267,8 +1267,8 @@ Note: File names must be relative to base directories!
 <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>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>目錄有依靠性！請小心設定同步規則：</target>
@@ -1394,7 +1394,7 @@ Note: File names must be relative to base directories!
 <target>檢測到顯著的差異：</target>
 
 <source>More than 50% of the total number of files will be copied or deleted!</source>
-<target>超過總數 50% 以上的檔案將被複製或刪除！</target>
+<target>超過總數 50% 以上的檔案會被複製或刪除！</target>
 
 <source>Not enough free disk space available in:</source>
 <target>沒有足夠的可用空間：</target>
@@ -1408,12 +1408,6 @@ Note: File names must be relative to base directories!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>一個將被修改的資料夾，是多個配對資料夾的一部分。請檢查同步設定。</target>
 
-<source>Left</source>
-<target>左邊</target>
-
-<source>Right</source>
-<target>右邊</target>
-
 <source>Synchronizing folder pair:</source>
 <target>同步配對資料夾：</target>
 
diff --git a/BUILD/Languages/croatian.lng b/BUILD/Languages/croatian.lng
index 766107d6..9fefb3ed 100644
--- a/BUILD/Languages/croatian.lng
+++ b/BUILD/Languages/croatian.lng
@@ -113,16 +113,13 @@
 <target>Pogreška broj %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
-<target>Ne mogu riješiti simboličnu poveznicu</target>
+<target>Ne mogu odrediti poveznicu %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
+<source>Cannot determine final path for %x.</source>
+<target></target>
 
-<source>%x GB</source>
-<target>%x GB</target>
+<source>Cannot find system function %x.</source>
+<target>Ne mogu pronaći sistemsku funkciju %x.</target>
 
 <source>
 <pluralform>1 Byte</pluralform>
@@ -134,6 +131,15 @@
 <pluralform>%x Bajtova</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Datoteka baze %x je nekompatibilna</target>
 
@@ -150,10 +156,10 @@
 <target>Nedostatak memorije</target>
 
 <source>Cannot write file %x.</source>
-<target>Ne mogu zapisati datoteku</target>
+<target>Ne mogu zapisati datoteku %x.</target>
 
 <source>Cannot read file %x.</source>
-<target>Ne mogu čitati datoteku</target>
+<target>Ne mogu čitati datoteku %x.</target>
 
 <source>Database files do not share a common session.</source>
 <target>Datoteke baze ne dijele zajednički protokol</target>
@@ -170,9 +176,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Čekam dok se direktorij zaključava (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Izrađujem datoteku %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -183,15 +186,15 @@
 <pluralform>%x sek</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Izrađujem datoteku %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Greška u analizi datoteke %x, red %y, stupac %z.</target>
 
 <source>Scanning:</source>
 <target>Pretražujem:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>:Spremam informacije o vremenu %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,9 +202,12 @@
 <target>
 <pluralform>%x Stavka</pluralform>
 <pluralform>%x Stavke</pluralform>
-<pluralform>% Stavki</pluralform>
+<pluralform>%x Stavki</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>:Spremam informacije o vremenu %x</target>
+
 <source>/sec</source>
 <target>/sek</target>
 
@@ -414,12 +420,12 @@ Naredba će biti pokrenuta ako se:
 <source>Date:</source>
 <target>Datum:</target>
 
-<source>Action</source>
-<target>Radnja</target>
-
 <source>Category</source>
 <target>Kategorija</target>
 
+<source>Action</source>
+<target>Radnja</target>
+
 <source>Drag && drop</source>
 <target>Povuci && ispusti</target>
 
@@ -795,12 +801,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>&Find next</source>
 <target>&Nađi slijedeće</target>
 
-<source>Operation aborted!</source>
-<target>Operacija otkazana!</target>
-
-<source>Main bar</source>
-<target>Glavna traka</target>
-
 <source>Folder pairs</source>
 <target>Par mape</target>
 
@@ -810,6 +810,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Configuration</source>
 <target>Postavke</target>
 
+<source>Main bar</source>
+<target>Glavna traka</target>
+
 <source>Filter files</source>
 <target>Filtriraj datoteke</target>
 
@@ -825,6 +828,32 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Compare both sides</source>
 <target>Usporedi obje strane</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x direktorij</pluralform>
+<pluralform>%x direktorija</pluralform>
+<pluralform>%x direktorija</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x datoteka</pluralform>
+<pluralform>%x datoteke</pluralform>
+<pluralform>%x datoteka</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target></target>
+
 <source>Set direction:</source>
 <target>Odaberi smijer:</target>
 
@@ -939,51 +968,21 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Set as default</source>
 <target>Postavi kao zadano</target>
 
+<source>Operation aborted!</source>
+<target>Operacija otkazana!</target>
+
 <source>All folders are in sync!</source>
 <target>Sve mape su u sinkronizaciji!</target>
 
 <source>Comma separated list</source>
 <target>Zarezom odvojene liste</target>
 
-<source>Legend</source>
-<target>Legenda</target>
-
 <source>File list exported!</source>
 <target>Datotečna lista izvezena!</target>
 
 <source>Searching for program updates...</source>
 <target>Pretražujem ažuriranja programa...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x direktorij</pluralform>
-<pluralform>%x direktorija</pluralform>
-<pluralform>%x direktorija</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x datoteka</pluralform>
-<pluralform>%x datoteke</pluralform>
-<pluralform>%x datoteka</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x od %y red u prikazu</pluralform>
-<pluralform>%x od %y reda u prikazu</pluralform>
-<pluralform>%x od %y redova u prikazu</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Zanemari buduće greške</target>
 
@@ -1065,6 +1064,18 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Filter</source>
 <target>Filtriranje</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target></target>
+
 <source>Direct</source>
 <target>Neposredno</target>
 
@@ -1092,33 +1103,21 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Vrati skrivena upozorenja i dijaloški okvir ponovno vidljivim?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target></target>
-
 <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>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>Folder</source>
 <target>Mapa</target>
 
@@ -1132,7 +1131,7 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <target>Datoteke</target>
 
 <source>Items</source>
-<target></target>
+<target>Stavke</target>
 
 <source>Percentage</source>
 <target>Postotak</target>
@@ -1161,9 +1160,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Cannot write modification time of %x.</source>
 <target>Ne mogu zapisati vrijeme izmjene %x.</target>
 
-<source>Cannot find system function %x.</source>
-<target>Ne mogu pronaći sistemsku funkciju %x.</target>
-
 <source>Cannot read security context of %x.</source>
 <target>Ne mogu čitati zaštićeni sadržaj %x.</target>
 
@@ -1179,8 +1175,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Cannot create directory %x.</source>
 <target>Ne mogu izraditi mapu %x.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Ne mogu kopirati simboličnu poveznicu %x na %y.</target>
+<source>Cannot create symbolic link %x.</source>
+<target></target>
 
 <source>Cannot copy file %x to %y.</source>
 <target>Ne mogu kopirati datoteku %x na %y.</target>
@@ -1203,9 +1199,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1246,7 +1239,7 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <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>
+<target>Nije moguće premjestiti %x u koš za smeće!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Obje su strane promjenjene od posljednje sinkronizacije!</target>
@@ -1294,17 +1287,11 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <target>Ne mogu pronaći slijedeće mape:</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>
+<target>Možete ignorirati ovu pogrešku te uzeti u obzir svaku mapu praznom. Mape se tada stvaraju automatski tokom sinkronizacije.</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>
 
-<source>Start comparison</source>
-<target>Započni usporedbu</target>
-
-<source>Calculating sync directions...</source>
-<target>Izračunavam smjerove sinkronizacije...</target>
-
 <source>Conflict detected:</source>
 <target>Sukob pronađen:</target>
 
@@ -1317,18 +1304,21 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Items differ in attributes only</source>
 <target>Stavke se razlikuju samo u atributima</target>
 
-<source>Symbolic links %x have the same date but a different target.</source>
-<target>Simbolične poveznice %x imaju isti datum ali drugačiji cilj</target>
+<source>Resolving symbolic link %x</source>
+<target></target>
 
 <source>Comparing content of files %x</source>
 <target>Uspoređujem sadržaj datoteka %x</target>
 
-<source>Comparing files by content failed.</source>
-<target>Usporedba datoteka prema sadržaju nije uspjela.</target>
-
 <source>Generating file list...</source>
 <target>Generiram listu datoteka...</target>
 
+<source>Start comparison</source>
+<target>Započni usporedbu</target>
+
+<source>Calculating sync directions...</source>
+<target>Izračunavam smjerove sinkronizacije...</target>
+
 <source>Both sides are equal</source>
 <target>Obje strane su jednake</target>
 
@@ -1434,12 +1424,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Mapa će biti uređena koja je dio više pari mapa. Molimo provjerite sinkronizacijske postavke.</target>
 
-<source>Left</source>
-<target>Lijevo</target>
-
-<source>Right</source>
-<target>Desno</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Par sinkronizirane mape:</target>
 
diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng
index 092ed55d..33ea5144 100644
--- a/BUILD/Languages/czech.lng
+++ b/BUILD/Languages/czech.lng
@@ -115,15 +115,6 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Nelze najít odkaz zástupce %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
-
-<source>%x GB</source>
-<target>%x GB</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -134,6 +125,15 @@
 <pluralform>%x B</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Chybný formát databáze %x.</target>
 
@@ -170,9 +170,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Čekání na uzamčení adresáře (%x)</target>
 
-<source>Creating file %x</source>
-<target>Vytváření souboru %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -183,15 +180,15 @@
 <pluralform>%x sekund</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Vytváření souboru %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Chyba zpracování souboru %x: na řádku %y ve sloupci %z</target>
 
 <source>Scanning:</source>
 <target>Zpracováváno:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Zpracování rozšířené informace o čase: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -202,6 +199,9 @@
 <pluralform>[%x procesů]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Zpracování rozšířené informace o čase: %x</target>
+
 <source>/sec</source>
 <target>/s</target>
 
@@ -266,7 +266,7 @@
 <target>3. Zmáčkněte 'Start'</target>
 
 <source>To get started just import a .ffs_batch file.</source>
-<target>Můžete načíst také konfigurační soubor soubor .ffs_batch</target>
+<target>Můžete načíst také konfigurační soubor .ffs_batch</target>
 
 <source>Folders to watch</source>
 <target>Složka ke sledování</target>
@@ -469,7 +469,7 @@ Příkaz je spuštěn když:
 <target>Zkontrolovat &nyní</target>
 
 <source>Check &automatically once a week</source>
-<target>Kontrolovat &automaticky jendou týdně</target>
+<target>Kontrolovat &automaticky jednou týdně</target>
 
 <source>Check for new version</source>
 <target>&Zkontrolovat aktualizace</target>
@@ -550,7 +550,7 @@ Příkaz je spuštěn když:
 <target>Skrýt všechny chyby a varování</target>
 
 <source>Pop-up</source>
-<target>Hlašení</target>
+<target>Hlášení</target>
 
 <source>Show pop-up on errors or warnings</source>
 <target>Zobrazit hlášení při chybě nebo varování</target>
@@ -760,7 +760,7 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <target>Kopírovat přístupová oprávnění k souborům</target>
 
 <source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Přenést přístupová oprávnění souborů a složek (Vyžaduje administrátorké oprávnění)</target>
+<target>Přenést přístupová oprávnění souborů a složek (Vyžaduje administrátorské oprávnění)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Obnovit skryté dialogy</target>
@@ -795,9 +795,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>&Find next</source>
 <target>&Najít další</target>
 
-<source>Operation aborted!</source>
-<target>Operace zrušena!</target>
-
 <source>Main bar</source>
 <target>Hlavní lišta</target>
 
@@ -825,6 +822,36 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Compare both sides</source>
 <target>Porovnat obě strany</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 adresář</pluralform>
+<pluralform>%x adresáře</pluralform>
+<pluralform>%x adresářů</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 soubor</pluralform>
+<pluralform>%x soubory</pluralform>
+<pluralform>%x souborů</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y z 1 řádku</pluralform>
+<pluralform>%y z %x řádků</pluralform>
+<pluralform>%y z %x řádků</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Nastavit adresář:</target>
 
@@ -939,6 +966,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Set as default</source>
 <target>Nastavit jako výchozí</target>
 
+<source>Operation aborted!</source>
+<target>Operace zrušena!</target>
+
 <source>All folders are in sync!</source>
 <target>Všechny složky jsou synchronizovány!</target>
 
@@ -954,36 +984,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Searching for program updates...</source>
 <target>Hledání aktualizací programu ...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 adresář</pluralform>
-<pluralform>%x adresáře</pluralform>
-<pluralform>%x adresářů</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 soubor</pluralform>
-<pluralform>%x soubory</pluralform>
-<pluralform>%x souborů</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x z 1 řádku</pluralform>
-<pluralform>%x z %y řádků</pluralform>
-<pluralform>%x z %y řádků</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Přeskočit další chyby</target>
 
@@ -1065,6 +1065,26 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Filter</source>
 <target>Filtr</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<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 item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<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>Direct</source>
 <target>Zachovat</target>
 
@@ -1092,26 +1112,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Povolit opět zobrazování skrytých dialogů a hlášení?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>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 item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<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>
 
@@ -1140,7 +1140,7 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <target>Soubory</target>
 
 <source>Items</source>
-<target></target>
+<target>Položky</target>
 
 <source>Percentage</source>
 <target>Procentní podíl</target>
@@ -1188,7 +1188,7 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <target>Nelze vytvořit adresář %x.</target>
 
 <source>Cannot copy symbolic link %x to %y.</source>
-<target>Nelze kopítovat zástupce %x do %y.</target>
+<target>Nelze kopírovat zástupce %x do %y.</target>
 
 <source>Cannot copy file %x to %y.</source>
 <target>Nelze kopírovat soubor %x do %y.</target>
@@ -1211,9 +1211,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1278,7 +1275,7 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <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>
+<target>Přesouvání adresář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>
@@ -1301,8 +1298,8 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <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>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>Tuto chybu můžete přeskočit a považovat neexistující složku za prázdnou. Složka pak bude vytvořena při synchronizaci automaticky.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Adresáře jsou závislé! Buďte opatrní s definicí synchronizačních pravidel:</target>
@@ -1341,16 +1338,16 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <target>Obě strany jsou shodné</target>
 
 <source>Copy new item to left</source>
-<target>Kopírovat novou položku do leva</target>
+<target>Kopírovat novou položku doleva</target>
 
 <source>Copy new item to right</source>
-<target>Kopírovat novou položku do prava</target>
+<target>Kopírovat novou položku doprava</target>
 
 <source>Delete left item</source>
-<target>Smazat položku z leva</target>
+<target>Smazat položku zleva</target>
 
 <source>Delete right item</source>
-<target>Smazat položku z prava</target>
+<target>Smazat položku zprava</target>
 
 <source>Move file on left</source>
 <target>Přesunout soubor nalevo</target>
@@ -1359,19 +1356,19 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <target>Přesunout soubor napravo</target>
 
 <source>Overwrite left item</source>
-<target>Přepsat levou položku tou z prava</target>
+<target>Přepsat levou položku tou zprava</target>
 
 <source>Overwrite right item</source>
-<target>Přepsat pravou položku tou z leva</target>
+<target>Přepsat pravou položku tou zleva</target>
 
 <source>Do nothing</source>
 <target>Nic nedělat</target>
 
 <source>Update attributes on left</source>
-<target>Nastavit vlastnosti v levo</target>
+<target>Nastavit vlastnosti vlevo</target>
 
 <source>Update attributes on right</source>
-<target>Nastavit vlastnoti v pravo</target>
+<target>Nastavit vlastnosti vpravo</target>
 
 <source>Multiple...</source>
 <target>Různé...</target>
@@ -1410,7 +1407,7 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <target>Nelze najít %x.</target>
 
 <source>Target folder %x already existing.</source>
-<target>Cílova složka %x již existuje.</target>
+<target>Cílová složka %x již existuje.</target>
 
 <source>Target folder input field must not be empty.</source>
 <target>Cílová složka nesmí být prázdná.</target>
@@ -1440,7 +1437,7 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <target>K dispozici</target>
 
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
-<target>Bude změněna složka, která je součástí adresářového páru vícenásobného porovnání. Prosím zkontrolujte si nastavení synchronizacem.</target>
+<target>Bude změněna složka, která je součástí adresářového páru vícenásobného porovnání. Prosím zkontrolujte si nastavení synchronizace.</target>
 
 <source>Left</source>
 <target>Levý</target>
diff --git a/BUILD/Languages/danish.lng b/BUILD/Languages/danish.lng
index 43e5de24..aa57a5c9 100644
--- a/BUILD/Languages/danish.lng
+++ b/BUILD/Languages/danish.lng
@@ -115,15 +115,6 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Kan ikke følge symlinket %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
-
-<source>%x GB</source>
-<target>%x GB</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -133,6 +124,15 @@
 <pluralform>%x byte</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Databasefilen %x er inkompatibel.</target>
 
@@ -169,9 +169,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Venter mens mappe låses (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Opretter filen %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +178,15 @@
 <pluralform>%x sek</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Opretter filen %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Behandlingsfejl i filen %x, række %y, kolonne %z.</target>
 
 <source>Scanning:</source>
 <target>Skanner:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Opretter udvidet tidsinformation: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +196,9 @@
 <pluralform>[%x tråde]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Opretter udvidet tidsinformation: %x</target>
+
 <source>/sec</source>
 <target>/sek</target>
 
@@ -209,10 +209,10 @@
 <target>Indstillingsfilen %x er kun delvist indlæst.</target>
 
 <source>Cannot access Volume Shadow Copy Service.</source>
-<target>Kan ikke opnå adgang til VVS.</target>
+<target>Kan ikke opnå adgang til VSS.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
-<target>Brug FreeFileSync 64-bit til at lave VVS kopier på dette system.</target>
+<target>Brug FreeFileSync 64-bit til at lave VSS kopier på dette system.</target>
 
 <source>Cannot load file %x.</source>
 <target>Kan ikke indlæse filen %x.</target>
@@ -328,7 +328,7 @@ Kommandoen udføres hvis:
 <target>Venter på manglende mapper...</target>
 
 <source>A folder input field is empty.</source>
-<target>Der findes et udefineret mappevalg.</target>
+<target>Der er ikke valgt nogen mapper.</target>
 
 <source>Synchronization aborted!</source>
 <target>Synkronisering afbrudt!</target>
@@ -751,7 +751,7 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <target>Kopier låste filer</target>
 
 <source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Kopier delte eller låste filer ved hjælp af VVS (kræver administrative rettigheder)</target>
+<target>Kopier delte eller låste filer ved hjælp af VSS (kræver administrative rettigheder)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopier adgangstilladelser</target>
@@ -792,9 +792,6 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>&Find next</source>
 <target>Find næste</target>
 
-<source>Operation aborted!</source>
-<target>Handling afbrudt!</target>
-
 <source>Main bar</source>
 <target>Hovedlinie</target>
 
@@ -822,6 +819,33 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Compare both sides</source>
 <target>Analyser begge sider</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 mappe</pluralform>
+<pluralform>%x mapper</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 fil</pluralform>
+<pluralform>%x filer</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y af 1 række i visning</pluralform>
+<pluralform>%y af %x rækker i visning</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Retning:</target>
 
@@ -936,6 +960,9 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Set as default</source>
 <target>Sæt som standard</target>
 
+<source>Operation aborted!</source>
+<target>Handling afbrudt!</target>
+
 <source>All folders are in sync!</source>
 <target>Alle mapper er synkrone</target>
 
@@ -951,33 +978,6 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Searching for program updates...</source>
 <target>Søger efter opdatering...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 mappe</pluralform>
-<pluralform>%x mapper</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 fil</pluralform>
-<pluralform>%x filer</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x af 1 række</pluralform>
-<pluralform>%x af %y rækker</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ignorer fremtidige fejl</target>
 
@@ -1059,6 +1059,24 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Filter</source>
 <target>Filter</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Vil du flytte emnet til papirkurven?</pluralform>
+<pluralform>Vil du flytte følgende %x emner til papirkurven?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Vil du slette følgende emne?</pluralform>
+<pluralform>Vil du slette følgende %x emner?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Direkte</target>
 
@@ -1086,24 +1104,6 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Vis skjulte advarsler og dialoger igen?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>Vil du flytte emnet til papirkurven?</pluralform>
-<pluralform>Vil du flytte følgende %x emner til papirkurven?</pluralform>
-</target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<pluralform>Vil du slette følgende emne?</pluralform>
-<pluralform>Vil du slette følgende %x emner?</pluralform>
-</target>
-
 <source>Leave as unresolved conflict</source>
 <target>Efterlad som uløst konflikt</target>
 
@@ -1131,6 +1131,9 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>Files</source>
 <target>Filer</target>
 
+<source>Items</source>
+<target>Emner</target>
+
 <source>Percentage</source>
 <target>Procent</target>
 
@@ -1200,9 +1203,6 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1287,8 +1287,8 @@ Bemærk: Filnavne skal relatere til grundmapperne!
 <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>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>Ignorer denne fejl for at betragte hver mappe som tom. Mapperne bliver så automatisk oprettet ved synkronisering.</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>
diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng
index 4bb61171..cec09b84 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -115,15 +115,6 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Kan snelkoppeling %x niet vinden.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
-
-<source>%x GB</source>
-<target>%x GB</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -133,6 +124,15 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Databasebestand %x is niet compatibel.</target>
 
@@ -169,9 +169,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Wachten totdat map is vergrendeld (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Bestand %x wordt aangemaakt</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +178,15 @@
 <pluralform>%x sec</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Bestand %x wordt aangemaakt</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Fout bij het parsen van bestand %x, rij %y, kolom %z.</target>
 
 <source>Scanning:</source>
 <target>Doorzoekt:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Coderen uitgebreide tijdinformatie: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +196,9 @@
 <pluralform>[%x Threads]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Coderen uitgebreide tijdinformatie: %x</target>
+
 <source>/sec</source>
 <target>/sec</target>
 
@@ -822,6 +822,33 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Compare both sides</source>
 <target>Vergelijk beide zijdes</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 map</pluralform>
+<pluralform>%x mappen</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 bestand</pluralform>
+<pluralform>%x bestanden</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y van 1 rij in weergave</pluralform>
+<pluralform>%y van %x rijen in weergave</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Stel richting in:</target>
 
@@ -951,33 +978,6 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Searching for program updates...</source>
 <target>Bezig met zoeken naar programma updates...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 map</pluralform>
-<pluralform>%x mappen</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 bestand</pluralform>
-<pluralform>%x bestanden</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x van 1 rij in het overzicht</pluralform>
-<pluralform>%x van %y rijen in het overzicht</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Negeer verdere foutmeldingen</target>
 
@@ -1059,6 +1059,24 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Filter</source>
 <target>Filter</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Weet u zeker dat u het volgende item naar de Prullebak wilt verplaatsen?</pluralform>
+<pluralform>Weet u zeker dat u de volgende %x items naar de Prullebak wilt verplaatsen?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Wilt u het volgende item echt verwijderen?</pluralform>
+<pluralform>Wilt u echt de volgende %x items verwijderen?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Direct</target>
 
@@ -1086,24 +1104,6 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Verborgen waarschuwingen en dialogen zichtbaar maken?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>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 item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<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>
 
@@ -1131,6 +1131,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Files</source>
 <target>Bestanden</target>
 
+<source>Items</source>
+<target>Items</target>
+
 <source>Percentage</source>
 <target>Percentage</target>
 
@@ -1200,9 +1203,6 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1287,8 +1287,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <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>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>U kunt deze foutmelding negeren om elke map als leeg te markeren. De mappen worden dan automatisch aangemaakt tijdens de synchronisatie.</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>
diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index 93340c36..43cf6f51 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -115,14 +115,11 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Cannot resolve symbolic link %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
+<source>Cannot determine final path for %x.</source>
+<target>Cannot determine final path for %x.</target>
 
-<source>%x GB</source>
-<target>%x GB</target>
+<source>Cannot find system function %x.</source>
+<target>Cannot find system function %x.</target>
 
 <source>
 <pluralform>1 Byte</pluralform>
@@ -133,6 +130,15 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Database file %x is incompatible.</target>
 
@@ -169,9 +175,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Waiting while directory is locked (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Creating file %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +184,15 @@
 <pluralform>%x sec</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Creating file %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Error parsing file %x, row %y, column %z.</target>
 
 <source>Scanning:</source>
 <target>Scanning:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Encoding extended time information: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +202,9 @@
 <pluralform>[%x Threads]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Encoding extended time information: %x</target>
+
 <source>/sec</source>
 <target>/sec</target>
 
@@ -411,12 +417,12 @@ The command is triggered if:
 <source>Date:</source>
 <target>Date:</target>
 
-<source>Action</source>
-<target>Action</target>
-
 <source>Category</source>
 <target>Category</target>
 
+<source>Action</source>
+<target>Action</target>
+
 <source>Drag && drop</source>
 <target>Drag && drop</target>
 
@@ -792,12 +798,6 @@ Note: File names must be relative to base directories!
 <source>&Find next</source>
 <target>&Find next</target>
 
-<source>Operation aborted!</source>
-<target>Operation aborted!</target>
-
-<source>Main bar</source>
-<target>Main bar</target>
-
 <source>Folder pairs</source>
 <target>Folder pairs</target>
 
@@ -807,6 +807,9 @@ Note: File names must be relative to base directories!
 <source>Configuration</source>
 <target>Configuration</target>
 
+<source>Main bar</source>
+<target>Main bar</target>
+
 <source>Filter files</source>
 <target>Filter files</target>
 
@@ -822,6 +825,33 @@ Note: File names must be relative to base directories!
 <source>Compare both sides</source>
 <target>Compare both sides</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Set direction:</target>
 
@@ -936,48 +966,21 @@ Note: File names must be relative to base directories!
 <source>Set as default</source>
 <target>Set as default</target>
 
+<source>Operation aborted!</source>
+<target>Operation aborted!</target>
+
 <source>All folders are in sync!</source>
 <target>All folders are in sync!</target>
 
 <source>Comma separated list</source>
 <target>Comma separated list</target>
 
-<source>Legend</source>
-<target>Legend</target>
-
 <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>
-</source>
-<target>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ignore further errors</target>
 
@@ -1059,6 +1062,24 @@ Note: File names must be relative to base directories!
 <source>Filter</source>
 <target>Filter</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Direct</target>
 
@@ -1086,39 +1107,21 @@ Note: File names must be relative to base directories!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Make hidden warnings and dialogues visible again?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>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 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 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>
-
 <source>Replace</source>
 <target>Replace</target>
 
 <source>Move files and replace if existing</source>
 <target>Move files and replace if existing</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>
+
 <source>Folder</source>
 <target>Folder</target>
 
@@ -1131,6 +1134,9 @@ Note: File names must be relative to base directories!
 <source>Files</source>
 <target>Files</target>
 
+<source>Items</source>
+<target>Items</target>
+
 <source>Percentage</source>
 <target>Percentage</target>
 
@@ -1158,9 +1164,6 @@ Note: File names must be relative to base directories!
 <source>Cannot write modification time of %x.</source>
 <target>Cannot write modification time of %x.</target>
 
-<source>Cannot find system function %x.</source>
-<target>Cannot find system function %x.</target>
-
 <source>Cannot read security context of %x.</source>
 <target>Cannot read security context of %x.</target>
 
@@ -1176,8 +1179,8 @@ Note: File names must be relative to base directories!
 <source>Cannot create directory %x.</source>
 <target>Cannot create directory %x.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Cannot copy symbolic link %x to %y.</target>
+<source>Cannot create symbolic link %x.</source>
+<target>Cannot create symbolic link %x.</target>
 
 <source>Cannot copy file %x to %y.</source>
 <target>Cannot copy file %x to %y.</target>
@@ -1191,18 +1194,12 @@ Note: File names must be relative to base directories!
 <source>Cannot enumerate directory %x.</source>
 <target>Cannot enumerate directory %x.</target>
 
-<source>Detected endless directory recursion.</source>
-<target>Detected endless directory recursion.</target>
-
 <source>%x TB</source>
 <target>%x TB</target>
 
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1287,18 +1284,12 @@ Note: File names must be relative to base directories!
 <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>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronisation.</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>Calculating sync directions...</source>
-<target>Calculating sync directions...</target>
-
 <source>Conflict detected:</source>
 <target>Conflict detected:</target>
 
@@ -1311,18 +1302,21 @@ Note: File names must be relative to base directories!
 <source>Items differ in attributes only</source>
 <target>Items differ in attributes only</target>
 
-<source>Symbolic links %x have the same date but a different target.</source>
-<target>Symbolic links %x have the same date but a different target.</target>
+<source>Resolving symbolic link %x</source>
+<target>Resolving symbolic link %x</target>
 
 <source>Comparing content of files %x</source>
 <target>Comparing content of files %x</target>
 
-<source>Comparing files by content failed.</source>
-<target>Comparing files by content failed.</target>
-
 <source>Generating file list...</source>
 <target>Generating file list...</target>
 
+<source>Start comparison</source>
+<target>Start comparison</target>
+
+<source>Calculating sync directions...</source>
+<target>Calculating sync directions...</target>
+
 <source>Both sides are equal</source>
 <target>Both sides are equal</target>
 
@@ -1428,12 +1422,6 @@ Note: File names must be relative to base directories!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>A folder will be modified which is part of multiple folder pairs. Please review synchronisation settings.</target>
 
-<source>Left</source>
-<target>Left</target>
-
-<source>Right</source>
-<target>Right</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Synchronising folder pair:</target>
 
diff --git a/BUILD/Languages/finnish.lng b/BUILD/Languages/finnish.lng
index 5d82fab5..8c594d10 100644
--- a/BUILD/Languages/finnish.lng
+++ b/BUILD/Languages/finnish.lng
@@ -115,15 +115,6 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Tämä linkki on virheellinen %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
-
-<source>%x GB</source>
-<target>%x GB</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -133,6 +124,15 @@
 <pluralform>%x tavua</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Tietokanta %x vierasta muotoa.</target>
 
@@ -161,7 +161,7 @@
 <target>Virhe havaittu!</target>
 
 <source>Cannot read file attributes of %x.</source>
-<target>x% -ominaisuudet ei tunnisteta.</target>
+<target>Tiedoston %x määritteitä ei voitu lukea.</target>
 
 <source>Cannot get process information.</source>
 <target>Prosessin tietoja ei saada.</target>
@@ -169,9 +169,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Odotan hakemiston lukitusta (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Luodaan tiedosto %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +178,15 @@
 <pluralform>%x s</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Luodaan tiedosto %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Virhe jäsennys tiedo %x, rivi %y, sarake %z.</target>
 
 <source>Scanning:</source>
 <target>Skannaus:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Tulkitaan laajennettua aikatietoa: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +196,9 @@
 <pluralform>[%x säijettä]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Tulkitaan laajennettua aikatietoa: %x</target>
+
 <source>/sec</source>
 <target>/s</target>
 
@@ -792,9 +792,6 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>&Find next</source>
 <target>&Etsi seuraava</target>
 
-<source>Operation aborted!</source>
-<target>Toiminto lopetettiin!</target>
-
 <source>Main bar</source>
 <target>Pääpalkki</target>
 
@@ -822,6 +819,33 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Compare both sides</source>
 <target>Vertaile molemmat puolet</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 hakemisto</pluralform>
+<pluralform>%x hakemistoja</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 tiedosto</pluralform>
+<pluralform>%x tiedostoja</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y rivi 1:stä näytetään</pluralform>
+<pluralform>%y riviä %x:stä näytetään</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Aseta suunta:</target>
 
@@ -936,6 +960,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Set as default</source>
 <target>Aseta oletukseksi</target>
 
+<source>Operation aborted!</source>
+<target>Toiminto lopetettiin!</target>
+
 <source>All folders are in sync!</source>
 <target>Kaikki hakemistot täsmäytetty!</target>
 
@@ -951,33 +978,6 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Searching for program updates...</source>
 <target>Ohjelmapäivytys haetaa...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 hakemisto</pluralform>
-<pluralform>%x hakemistoja</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 tiedosto</pluralform>
-<pluralform>%x tiedostoja</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x / 1:stä rivistä näytössä</pluralform>
-<pluralform>%x / %y:tä rivistä näytössä</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Hylkää toistuvat virheviestit</target>
 
@@ -1059,6 +1059,24 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Filter</source>
 <target>Suodin</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<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 item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Haluatko todella poistta tämä?</pluralform>
+<pluralform>Haluatko todella poistaa nämä %x kohdetta?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Suoraan</target>
 
@@ -1086,24 +1104,6 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Näytä piiloitetut varoitukset/ikkunnat uudestaan?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>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 item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<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>
 
@@ -1132,7 +1132,7 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <target>Tiedostot</target>
 
 <source>Items</source>
-<target></target>
+<target>Kappaletta</target>
 
 <source>Percentage</source>
 <target>Prosenttia</target>
@@ -1192,7 +1192,7 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <target>Hakemistoa %x ei voida avata.</target>
 
 <source>Cannot enumerate directory %x.</source>
-<target>Hakemistoa ei voida luetella.</target>
+<target>Hakemistoa %x ei voitu luetella.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Päättymätön hakemiston toisto.</target>
@@ -1203,9 +1203,6 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1290,8 +1287,8 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Cannot find the following folders:</source>
 <target>Hakemistot 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>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>Voit ohita virhe olettamalla hakemistot tyhjiksi. Hakemistot luodaan täsmäytyksen aikana.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Hakemistot riippuvuussuhteessa! Aseta täsmäyssääntöjä varovasti:</target>
@@ -1431,20 +1428,11 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Moniosaisen hakemistoparin hakemistoa muutetaan. Tarkista täsmäytyksen asetuksia.</target>
 
-<source>Left</source>
-<target>Vasen</target>
-
-<source>Right</source>
-<target>Oikea</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Täsmäytetään  hakemistoparia:</target>
 
 <source>Generating database...</source>
-<target>
-Tietokanta luodaan.
-..
-</target>
+<target>Tietokanta luodaan...</target>
 
 <source>Creating Volume Shadow Copy for %x...</source>
 <target>Luodaan Volume Shadow Copy %x:lle...</target>
diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng
index 2bbb75d9..b6f7d90d 100644
--- a/BUILD/Languages/french.lng
+++ b/BUILD/Languages/french.lng
@@ -115,15 +115,6 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Impossible de résoudre le lien symbolique %x.</target>
 
-<source>%x MB</source>
-<target>%x Mo</target>
-
-<source>%x KB</source>
-<target>%x Ko</target>
-
-<source>%x GB</source>
-<target>%x Go</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -133,6 +124,15 @@
 <pluralform>%x octets</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x Mo</target>
+
+<source>%x KB</source>
+<target>%x Ko</target>
+
+<source>%x GB</source>
+<target>%x Go</target>
+
 <source>Database file %x is incompatible.</source>
 <target>La base de données %x n'est pas compatible.</target>
 
@@ -169,9 +169,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>En attente tant que le répertoire est verrouillé (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Création du fichier %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +178,15 @@
 <pluralform>%x sec</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Création du fichier %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Erreur lors de l'analyse du fichier %x, ligne %y, colonne %z.</target>
 
 <source>Scanning:</source>
 <target>Lecture en cours :</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Codage de l'heure au format étendu : %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +196,9 @@
 <pluralform>[%x Tâches]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Codage de l'heure au format étendu : %x</target>
+
 <source>/sec</source>
 <target>/sec</target>
 
@@ -792,9 +792,6 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>&Find next</source>
 <target>&Chercher le suivant</target>
 
-<source>Operation aborted!</source>
-<target>Opération abandonnée !</target>
-
 <source>Main bar</source>
 <target>Barre principale</target>
 
@@ -822,6 +819,33 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Compare both sides</source>
 <target>Comparer les deux listes</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x répertoire</pluralform>
+<pluralform>%x répertoires</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x fichier</pluralform>
+<pluralform>%x fichiers</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>vue de %y ligne sur %x</pluralform>
+<pluralform>vue de %y lignes sur %x</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Choix de la direction :</target>
 
@@ -936,6 +960,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Set as default</source>
 <target>Définir par défaut</target>
 
+<source>Operation aborted!</source>
+<target>Opération abandonnée !</target>
+
 <source>All folders are in sync!</source>
 <target>Tous les dossiers sont synchronisés !</target>
 
@@ -951,33 +978,6 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Searching for program updates...</source>
 <target>Recherche de mises à jour ...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x répertoire</pluralform>
-<pluralform>%x répertoires</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x fichier</pluralform>
-<pluralform>%x fichiers</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x of %y ligne affichée</pluralform>
-<pluralform>%x of %y lignes affichées</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ignorer les erreurs suivantes</target>
 
@@ -1059,6 +1059,24 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Filter</source>
 <target>Filtre</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Voulez-vous vraiment mettre dans la corbeille %x élément ?</pluralform>
+<pluralform>Voulez-vous vraiment mettre dans la corbeille ces %x éléments ?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Voulez-vous vraiment supprimer %x élément ?</pluralform>
+<pluralform>Voulez-vous vraiment supprimer ces %x éléments ?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Direct</target>
 
@@ -1081,29 +1099,11 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <target>- Duplication vers %item_path%</target>
 
 <source>- Other side's counterpart to %item_folder%</source>
-<target>Duplication vers %item_folder%</target>
+<target>- Duplication vers %item_folder%</target>
 
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Voulez-vous réafficher les avertissements et les boîtes de dialogue ?</target>
 
-<source>
-<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 à 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 item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<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>
 
@@ -1131,6 +1131,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Files</source>
 <target>Fichiers</target>
 
+<source>Items</source>
+<target>Éléments</target>
+
 <source>Percentage</source>
 <target>Pourcentage</target>
 
@@ -1180,7 +1183,7 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <target>Impossible de copier le lien symbolique %x vers %y.</target>
 
 <source>Cannot copy file %x to %y.</source>
-<target>Impossible de copier le fichier %X vers %y.</target>
+<target>Impossible de copier le fichier %x vers %y.</target>
 
 <source>Type of item %x is not supported:</source>
 <target>Le type de l'élément %x n'est pas accepté :</target>
@@ -1200,9 +1203,6 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>%x PB</source>
 <target>%x Po</target>
 
-<source>%x%</source>
-<target>%x %</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1287,8 +1287,8 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Cannot find the following folders:</source>
 <target>Impossible de trouver les dossiers suivants :</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>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>Vous pouvez ignorer cette erreur en considérant chaque dossier comme vide. Les dossiers seront automatiquement créés pendant la synchronisation.</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>
@@ -1428,12 +1428,6 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Un dossier faisant partie de paires multiples sera modifié. Veuillez vérifier les paramètres de synchronisation.</target>
 
-<source>Left</source>
-<target>Gauche</target>
-
-<source>Right</source>
-<target>Droite</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Synchronisation de la paire de dossiers</target>
 
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index 706736c4..c068055f 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -115,14 +115,11 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Der Symbolische Link %x kann nicht aufgelöst werden.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
+<source>Cannot determine final path for %x.</source>
+<target>Der endgültige Pfad für %x kann nicht ermittelt werden.</target>
 
-<source>%x GB</source>
-<target>%x GB</target>
+<source>Cannot find system function %x.</source>
+<target>Die Systemfunktion %x wurde nicht gefunden.</target>
 
 <source>
 <pluralform>1 Byte</pluralform>
@@ -133,6 +130,15 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Die Datenbankdatei %x ist nicht kompatibel.</target>
 
@@ -169,9 +175,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Warte während Verzeichnis gesperrt ist (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Erstelle Datei %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +184,15 @@
 <pluralform>%x Sek.</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Erstelle Datei %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Fehler beim Auswerten der Datei %x, Zeile %y, Spalte %z.</target>
 
 <source>Scanning:</source>
 <target>Suche Dateien:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Speichere erweiterte Zeitinformation: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +202,9 @@
 <pluralform>[%x Threads]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Speichere erweiterte Zeitinformation: %x</target>
+
 <source>/sec</source>
 <target>/s</target>
 
@@ -411,12 +417,12 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Date:</source>
 <target>Datum:</target>
 
-<source>Action</source>
-<target>Aktion</target>
-
 <source>Category</source>
 <target>Kategorie</target>
 
+<source>Action</source>
+<target>Aktion</target>
+
 <source>Drag && drop</source>
 <target>Drag && Drop</target>
 
@@ -792,12 +798,6 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>&Find next</source>
 <target>&Weitersuchen</target>
 
-<source>Operation aborted!</source>
-<target>Vorgang abgebrochen!</target>
-
-<source>Main bar</source>
-<target>Hauptleiste</target>
-
 <source>Folder pairs</source>
 <target>Ordnerpaare</target>
 
@@ -807,6 +807,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Configuration</source>
 <target>Konfiguration</target>
 
+<source>Main bar</source>
+<target>Hauptleiste</target>
+
 <source>Filter files</source>
 <target>Dateien filtern</target>
 
@@ -822,6 +825,33 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Compare both sides</source>
 <target>Beide Seiten vergleichen</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 Verzeichnis</pluralform>
+<pluralform>%x Verzeichnisse</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 Datei</pluralform>
+<pluralform>%x Dateien</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>Zeige %y von 1 Zeile</pluralform>
+<pluralform>Zeige %y von %x Zeilen</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Setze Richtung:</target>
 
@@ -886,7 +916,7 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <target>&Nicht speichern</target>
 
 <source>Never save changes</source>
-<target>Änderungen niemals speichern</target>
+<target>Änderungen nie speichern</target>
 
 <source>Configuration loaded!</source>
 <target>Konfiguration geladen!</target>
@@ -936,48 +966,21 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Set as default</source>
 <target>Als Standard festlegen</target>
 
+<source>Operation aborted!</source>
+<target>Vorgang abgebrochen!</target>
+
 <source>All folders are in sync!</source>
 <target>Alle Ordner sind synchron!</target>
 
 <source>Comma separated list</source>
 <target>Kommagetrennte Liste</target>
 
-<source>Legend</source>
-<target>Legende</target>
-
 <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>
-</source>
-<target>
-<pluralform>1 Verzeichnis</pluralform>
-<pluralform>%x Verzeichnisse</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 Datei</pluralform>
-<pluralform>%x Dateien</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>Zeige %x von 1 Zeile</pluralform>
-<pluralform>Zeige %x von %y Zeilen</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Weitere Fehler ignorieren</target>
 
@@ -1059,6 +1062,24 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Filter</source>
 <target>Filter</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Soll das folgende Element wirklich in den Papierkorb verschoben werden?</pluralform>
+<pluralform>Sollen die folgenden %x Elemente wirklich in den Papierkorb verschoben werden?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Soll das folgende Element wirklich gelöscht werden?</pluralform>
+<pluralform>Sollen die folgenden %x Elemente wirklich gelöscht werden?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Direkt</target>
 
@@ -1086,39 +1107,21 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Versteckte Warnungen und Dialoge wieder sichtbar machen?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>Soll das folgende Element wirklich in den Papierkorb verschoben werden?</pluralform>
-<pluralform>Sollen die folgenden %x Elemente wirklich in den Papierkorb verschoben werden?</pluralform>
-</target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<pluralform>Soll das folgende Element wirklich gelöscht werden?</pluralform>
-<pluralform>Sollen die folgenden %x Elemente wirklich gelöscht werden?</pluralform>
-</target>
-
 <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 anhängen</target>
-
 <source>Replace</source>
 <target>Ersetzen</target>
 
 <source>Move files and replace if existing</source>
 <target>Dateien verschieben und vorhandene ersetzen</target>
 
+<source>Time stamp</source>
+<target>Zeitstempel</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Einen Zeitstempel an jeden Dateinamen anhängen</target>
+
 <source>Folder</source>
 <target>Ordner</target>
 
@@ -1161,9 +1164,6 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Cannot write modification time of %x.</source>
 <target>Die Änderungszeit von %x kann nicht geschrieben werden.</target>
 
-<source>Cannot find system function %x.</source>
-<target>Die Systemfunktion %x wurde nicht gefunden.</target>
-
 <source>Cannot read security context of %x.</source>
 <target>Der Sicherheitskontext von %x kann nicht gelesen werden.</target>
 
@@ -1179,8 +1179,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Cannot create directory %x.</source>
 <target>Das Verzeichnis %x kann nicht erstellt werden.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Der Symbolische Link %x kann nicht nach %y kopiert werden.</target>
+<source>Cannot create symbolic link %x.</source>
+<target>Der Symbolische Link %x kann nicht erstellt werden.</target>
 
 <source>Cannot copy file %x to %y.</source>
 <target>Die Datei %x kann nicht nach %y kopiert werden.</target>
@@ -1194,18 +1194,12 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Cannot enumerate directory %x.</source>
 <target>Das Verzeichnis %x kann nicht gelistet werden.</target>
 
-<source>Detected endless directory recursion.</source>
-<target>Eine endlose Verzeichnisrekursion wurde erkannt.</target>
-
 <source>%x TB</source>
 <target>%x TB</target>
 
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1296,12 +1290,6 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <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>Calculating sync directions...</source>
-<target>Berechne Synchronisationsrichtungen...</target>
-
 <source>Conflict detected:</source>
 <target>Ein Konflikt wurde erkannt:</target>
 
@@ -1314,18 +1302,21 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Items differ in attributes only</source>
 <target>Die Elemente unterscheiden sich nur in Attributen</target>
 
-<source>Symbolic links %x have the same date but a different target.</source>
-<target>Die Symbolischen Links %x haben dasselbe Datum, aber ein unterschiedliches Ziel.</target>
+<source>Resolving symbolic link %x</source>
+<target>Folge dem Symbolischen Link %x</target>
 
 <source>Comparing content of files %x</source>
 <target>Vergleiche Inhalt der Dateien %x</target>
 
-<source>Comparing files by content failed.</source>
-<target>Vergleich nach Dateiinhalt ist fehlgeschlagen.</target>
-
 <source>Generating file list...</source>
 <target>Erzeuge Dateiliste...</target>
 
+<source>Start comparison</source>
+<target>Starte Vergleich</target>
+
+<source>Calculating sync directions...</source>
+<target>Berechne Synchronisationsrichtungen...</target>
+
 <source>Both sides are equal</source>
 <target>Beide Seiten sind gleich</target>
 
@@ -1431,12 +1422,6 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Ein Ordner wird verändert werden, der Teil mehrerer Ordnerpaare ist. Bitte überprüfen Sie die Synchronisationseinstellungen.</target>
 
-<source>Left</source>
-<target>Links</target>
-
-<source>Right</source>
-<target>Rechts</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Synchronisiere Ordnerpaar:</target>
 
diff --git a/BUILD/Languages/greek.lng b/BUILD/Languages/greek.lng
index 51650524..3dc272d9 100644
--- a/BUILD/Languages/greek.lng
+++ b/BUILD/Languages/greek.lng
@@ -115,15 +115,6 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Ο συμβολικός δεσμός %x δεν μπορεί να επιλυθεί</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
-
-<source>%x GB</source>
-<target>%x GB</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -133,6 +124,15 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Το αρχείο βάσης δεδομένων %x δεν είναι συμβατό</target>
 
@@ -169,9 +169,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Αναμονή μέχρι να κλειδωθεί ο υποκατάλογος (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Δημιουργία του αρχείου %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +178,15 @@
 <pluralform>%x δ/λεπτα</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Δημιουργία του αρχείου %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Σφάλμα κατά την ανάλυση του αρχείου %x, γραμμή %y, στήλη %z.</target>
 
 <source>Scanning:</source>
 <target>Ανίχνευση:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Κωδικοποίηση εκτεταμένων πληροφοριών για την ώρα: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +196,9 @@
 <pluralform>[%x Νήματα]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Κωδικοποίηση εκτεταμένων πληροφοριών για την ώρα: %x</target>
+
 <source>/sec</source>
 <target>/δευτερόλεπτο</target>
 
@@ -822,6 +822,33 @@ Note: File names must be relative to base directories!
 <source>Compare both sides</source>
 <target>Σύγκριση των δύο πλευρών</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 υποκατάλογος</pluralform>
+<pluralform>%x υποκατάλογοι</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 αρχείο</pluralform>
+<pluralform>%x αρχεία</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y από τη 1 φανερή γραμμή</pluralform>
+<pluralform>%y από τις %x φανερές γραμμές</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Επιλογή κατεύθυνσης:</target>
 
@@ -951,33 +978,6 @@ Note: File names must be relative to base directories!
 <source>Searching for program updates...</source>
 <target>Αναζήτηση καινούριας έκδοσης...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 υποκατάλογος</pluralform>
-<pluralform>%x υποκατάλογοι</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 αρχείο</pluralform>
-<pluralform>%x αρχεία</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x από τη 1 φανερή γραμμή</pluralform>
-<pluralform>%x από τις %y φανερές γραμμές</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Αγνόηση επόμενων σφαλμάτων</target>
 
@@ -1059,6 +1059,24 @@ Note: File names must be relative to base directories!
 <source>Filter</source>
 <target>Φίλτρο</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Είσαι σίγουρος ότι θέλεις να μεταφερθεί το ακόλουθο αντικείμενο στον Κάδο Ανακύκλωσης;</pluralform>
+<pluralform>Είσαι σίγουρος ότι θέλεις να μεταφερθούν τα ακόλουθα %x αντικείμενα στον Κάδο Ανακύκλωσης;</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Είσαι σίγουρος ότι θέλεις να διαγραφεί το ακόλουθο αντικείμενο;</pluralform>
+<pluralform>Είσαι σίγουρος ότι θέλεις να διαγραφούν τα ακόλουθα %x αντικείμενα;</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Ως δεσμού</target>
 
@@ -1086,24 +1104,6 @@ Note: File names must be relative to base directories!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Να επανεμφανιστούν τα κρυμμένα μηνύματα και προειδοποιήσεις;</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>Είσαι σίγουρος ότι θέλεις να μεταφερθεί το ακόλουθο αντικείμενο στον Κάδο Ανακύκλωσης;</pluralform>
-<pluralform>Είσαι σίγουρος ότι θέλεις να μεταφερθούν τα ακόλουθα %x αντικείμενα στον Κάδο Ανακύκλωσης;</pluralform>
-</target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<pluralform>Είσαι σίγουρος ότι θέλεις να διαγραφεί το ακόλουθο αντικείμενο;</pluralform>
-<pluralform>Είσαι σίγουρος ότι θέλεις να διαγραφούν τα ακόλουθα %x αντικείμενα;</pluralform>
-</target>
-
 <source>Leave as unresolved conflict</source>
 <target>Παράβλεψη ως ανεπίλυτη διένεξη</target>
 
@@ -1131,6 +1131,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>
 
@@ -1162,10 +1165,10 @@ Note: File names must be relative to base directories!
 <target>Δεν ανευρίσκεται η λειτουργία συστήματος %x.</target>
 
 <source>Cannot read security context of %x.</source>
-<target>Δεν μπορεί να αναγνωσθεί το περιβάλλον ασφαλείας του x%.</target>
+<target>Δεν μπορεί να αναγνωσθεί το περιβάλλον ασφαλείας του %x.</target>
 
 <source>Cannot write security context of %x.</source>
-<target>Δεν μπορεί να γίνει εγγραφή του περιβάλλοντος ασφαλείας του x%.</target>
+<target>Δεν μπορεί να γίνει εγγραφή του περιβάλλοντος ασφαλείας του %x.</target>
 
 <source>Cannot read permissions of %x.</source>
 <target>Δεν μπορούν να αναγνωσθούν οι άδειες προσπέλασης του %x.</target>
@@ -1200,9 +1203,6 @@ Note: File names must be relative to base directories!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1287,8 +1287,8 @@ Note: File names must be relative to base directories!
 <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>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>Οι υποκατάλογοι είναι εξαρτώμενοι. Προσοχή κατά την εισαγωγή των κανόνων συγχρονισμού:</target>
diff --git a/BUILD/Languages/hebrew.lng b/BUILD/Languages/hebrew.lng
index 89c5ab1c..cdaf1dea 100644
--- a/BUILD/Languages/hebrew.lng
+++ b/BUILD/Languages/hebrew.lng
@@ -115,15 +115,6 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>לא יכול לפענח את הקישור הסימבולי %x.</target>
 
-<source>%x MB</source>
-<target>%x מגה בייט</target>
-
-<source>%x KB</source>
-<target>%x קילו בייט</target>
-
-<source>%x GB</source>
-<target>%x גיגה בייט</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -133,6 +124,15 @@
 <pluralform>%x בייט</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x מגה בייט</target>
+
+<source>%x KB</source>
+<target>%x קילו בייט</target>
+
+<source>%x GB</source>
+<target>%x גיגה בייט</target>
+
 <source>Database file %x is incompatible.</source>
 <target>קובץ מסד נתונים %x אינו במבנה מתאים.</target>
 
@@ -169,9 +169,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>ממתין כאשר  מחיצה נעולה (%x)...</target>
 
-<source>Creating file %x</source>
-<target>יוצר קובץ %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +178,15 @@
 <pluralform>%x שניות</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>יוצר קובץ %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>שגיאה בפענוח קובץ %x, שורה %y, טור %z.</target>
 
 <source>Scanning:</source>
 <target>סורק:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>מקודד אינפורמצית זמן מורחבת: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +196,9 @@
 <pluralform>[%x תהליכונים]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>מקודד אינפורמצית זמן מורחבת: %x</target>
+
 <source>/sec</source>
 <target>/שנ</target>
 
@@ -411,12 +411,12 @@ The command is triggered if:
 <source>Date:</source>
 <target>תאריך:</target>
 
-<source>Action</source>
-<target>פעולה</target>
-
 <source>Category</source>
 <target>קטגוריה</target>
 
+<source>Action</source>
+<target>פעולה</target>
+
 <source>Drag && drop</source>
 <target>גרור והשלך</target>
 
@@ -792,9 +792,6 @@ Note: File names must be relative to base directories!
 <source>&Find next</source>
 <target>&מצא הבא</target>
 
-<source>Operation aborted!</source>
-<target>הפעולה בוטלה!</target>
-
 <source>Main bar</source>
 <target>סרגל ראשי</target>
 
@@ -822,6 +819,33 @@ Note: File names must be relative to base directories!
 <source>Compare both sides</source>
 <target>השווה בין שני הצדדים</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 מחיצה</pluralform>
+<pluralform>%x מחיצות</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 קובץ</pluralform>
+<pluralform>%x קבצים</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y של שורה 1 במראה</pluralform>
+<pluralform>%y של %x שורות במראה</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>בחר כוון:</target>
 
@@ -936,6 +960,9 @@ Note: File names must be relative to base directories!
 <source>Set as default</source>
 <target>הגדר כברירת מחדל</target>
 
+<source>Operation aborted!</source>
+<target>הפעולה בוטלה!</target>
+
 <source>All folders are in sync!</source>
 <target>כל התיקיות מסונכרנות</target>
 
@@ -951,33 +978,6 @@ Note: File names must be relative to base directories!
 <source>Searching for program updates...</source>
 <target>מחפש עידכוני תוכנה...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 מחיצה</pluralform>
-<pluralform>%x מחיצות</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 קובץ</pluralform>
-<pluralform>%x קבצים</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x מתוך 1 שורה בתצוגה</pluralform>
-<pluralform>%x מתוך %y שורות בתצוגה</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>התעלם משגיאות נוספות</target>
 
@@ -1059,6 +1059,24 @@ Note: File names must be relative to base directories!
 <source>Filter</source>
 <target>מסנן</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>האם ברצונך להעביר את הפריט הבא לסל המיחזור?</pluralform>
+<pluralform>האם ברצונך להעביר את הפריטים %x הבאים לסל המיחזור?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>האם ברצונך למחוק את הפריט הבא?</pluralform>
+<pluralform>האם ברצונך למחוק את הפריטים %x הבאים?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>כוון</target>
 
@@ -1086,39 +1104,21 @@ Note: File names must be relative to base directories!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>להפוך דיאלוגים מוסתרים ואזהרות לגלויים שוב?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>האם ברצונך להעביר את הפריט הבא לסל המיחזור?</pluralform>
-<pluralform>האם ברצונך להעביר את הפריטים %x הבאים לסל המיחזור?</pluralform>
-</target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<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>Time stamp</source>
+<target>תג זמן</target>
+
+<source>Append a timestamp to each file name</source>
+<target>הצמד תג זמן לכל שם קובץ</target>
+
 <source>Folder</source>
 <target>תיקייה</target>
 
@@ -1131,6 +1131,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>
 
@@ -1200,9 +1203,6 @@ Note: File names must be relative to base directories!
 <source>%x PB</source>
 <target>%x פטה בייט</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1287,8 +1287,8 @@ Note: File names must be relative to base directories!
 <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>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>מחיצות תלויות! זהירות בהגדרת כללי סנכרון:</target>
@@ -1428,12 +1428,6 @@ Note: File names must be relative to base directories!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>התיקייה שתשתנה היא חלק מריבוי זוגות תיקיות. אנא סקור מחדש הגדרות סינכרון.</target>
 
-<source>Left</source>
-<target>ימין</target>
-
-<source>Right</source>
-<target>שמאל</target>
-
 <source>Synchronizing folder pair:</source>
 <target>מסנכרן זוג תיקיות:</target>
 
diff --git a/BUILD/Languages/hungarian.lng b/BUILD/Languages/hungarian.lng
index 58600506..e407e030 100644
--- a/BUILD/Languages/hungarian.lng
+++ b/BUILD/Languages/hungarian.lng
@@ -115,14 +115,11 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Sikertelen a következő symlink feloldása: %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
+<source>Cannot determine final path for %x.</source>
+<target></target>
 
-<source>%x GB</source>
-<target>%x GB</target>
+<source>Cannot find system function %x.</source>
+<target>Nem található a következő rendszerfunkció: %x.</target>
 
 <source>
 <pluralform>1 Byte</pluralform>
@@ -133,6 +130,15 @@
 <pluralform>%x Bájt</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Inkompatibilis adatbázisfájl: %x.</target>
 
@@ -169,9 +175,6 @@
 <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>Creating file %x</source>
-<target>%x fájl létrehozása</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +184,15 @@
 <pluralform>%x másodperc</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>%x fájl létrehozása</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Hiba történt a fájl feldolgozása közben: %x fájl, %y sor, %z oszlop.</target>
 
 <source>Scanning:</source>
 <target>Vizsgálat:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Kibővített időinformációk kódolása: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +202,9 @@
 <pluralform>[%x szál]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Kibővített időinformációk kódolása: %x</target>
+
 <source>/sec</source>
 <target>/másodperc</target>
 
@@ -411,12 +417,12 @@ A parancs végrehajtódik, ha:
 <source>Date:</source>
 <target>Dátum:</target>
 
-<source>Action</source>
-<target>Művelet</target>
-
 <source>Category</source>
 <target>Kategória</target>
 
+<source>Action</source>
+<target>Művelet</target>
+
 <source>Drag && drop</source>
 <target>Húzd && Ejtsd</target>
 
@@ -790,12 +796,6 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>&Find next</source>
 <target>&Következő keresése</target>
 
-<source>Operation aborted!</source>
-<target>Művelet megszakítva!</target>
-
-<source>Main bar</source>
-<target>Fő panel</target>
-
 <source>Folder pairs</source>
 <target>Mappa párok</target>
 
@@ -805,6 +805,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Configuration</source>
 <target>Beállítás</target>
 
+<source>Main bar</source>
+<target>Fő panel</target>
+
 <source>Filter files</source>
 <target>Fájlok szűrése</target>
 
@@ -820,6 +823,33 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Compare both sides</source>
 <target>Mindkét oldal összehasonlítása</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 mappát</pluralform>
+<pluralform>%x mappát</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 fájlt</pluralform>
+<pluralform>%x fájlt</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y sor látható</pluralform>
+<pluralform>%x sorból %y látható</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Irány</target>
 
@@ -934,48 +964,21 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Set as default</source>
 <target>Beállítás alapértelmezettként</target>
 
+<source>Operation aborted!</source>
+<target>Művelet megszakítva!</target>
+
 <source>All folders are in sync!</source>
 <target>Minden mappa szinkronban!</target>
 
 <source>Comma separated list</source>
 <target>Comma separated values</target>
 
-<source>Legend</source>
-<target>Előzmény</target>
-
 <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>
-</source>
-<target>
-<pluralform>1 mappát</pluralform>
-<pluralform>%x mappát</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 fájlt</pluralform>
-<pluralform>%x fájlt</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x/1 sor a nézetben</pluralform>
-<pluralform>%x/%y sor a nézetben</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>További hibák figyelmen kívül hagyása</target>
 
@@ -1057,6 +1060,24 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Filter</source>
 <target>Szűrő</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Valóban a Lomtárba akarod mozgatni a következő elemet?</pluralform>
+<pluralform>Valóban a Lomtárba akarod mozgatni a következő %x elemet?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>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>Direct</source>
 <target>Közvetlen</target>
 
@@ -1084,39 +1105,21 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Make hidden warnings and dialogs visible again?</source>
 <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 item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>Valóban a Lomtárba akarod mozgatni a következő elemet?</pluralform>
-<pluralform>Valóban a Lomtárba akarod mozgatni a következő %x elemet?</pluralform>
-</target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<pluralform>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>
-
 <source>Replace</source>
 <target>Felülírás</target>
 
 <source>Move files and replace if existing</source>
 <target>Fájlok mozgatása és felülírása létezés esetén</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>
+
 <source>Folder</source>
 <target>Mappa</target>
 
@@ -1130,7 +1133,7 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <target>Fájlok</target>
 
 <source>Items</source>
-<target></target>
+<target>Elemek</target>
 
 <source>Percentage</source>
 <target>Százalék</target>
@@ -1159,9 +1162,6 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Cannot write modification time of %x.</source>
 <target>Az utolsó módosítás dátumának a beállítása sikertelen a következő fájlnál: %x.</target>
 
-<source>Cannot find system function %x.</source>
-<target>Nem található a következő rendszerfunkció: %x.</target>
-
 <source>Cannot read security context of %x.</source>
 <target>A következő fájl biztonsági tulajdonságainak olvasása sikertelen: %x.</target>
 
@@ -1177,8 +1177,8 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Cannot create directory %x.</source>
 <target>A következő mappa létrehozása sikertelen: %x.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>%x symlink másolása a(z) %y symlinkbe sikertelen.</target>
+<source>Cannot create symbolic link %x.</source>
+<target></target>
 
 <source>Cannot copy file %x to %y.</source>
 <target>%x fájl másolása a(z) %y fájlba sikertelen.</target>
@@ -1192,18 +1192,12 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Cannot enumerate directory %x.</source>
 <target>A következő mappa sorszámozása sikertelen: %x.</target>
 
-<source>Detected endless directory recursion.</source>
-<target>Végtelen mapparekurzió detektálva.</target>
-
 <source>%x TB</source>
 <target>%x TB</target>
 
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1289,17 +1283,11 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <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>
+<target>Figyelmen kívül hagyhatod ezt a hibát ezzel üresnek tekintve a mappákat. Később a mappák létre lesznek hozva automatikusan a szinkronizálás közben.</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>
 
-<source>Start comparison</source>
-<target>Összehasonlítás megkezdé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>
 
@@ -1312,18 +1300,21 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Items differ in attributes only</source>
 <target>Az elemek csak attribútumaikban különböznek</target>
 
-<source>Symbolic links %x have the same date but a different target.</source>
-<target>A következő symlinkeknek megegyezik a dátuma, de a célpontjuk különböző: %x.</target>
+<source>Resolving symbolic link %x</source>
+<target></target>
 
 <source>Comparing content of files %x</source>
 <target>%x fájlok tartalmának összehasonlítása</target>
 
-<source>Comparing files by content failed.</source>
-<target>Sikertelen a fájlok összehasonlítása tartalom alapján.</target>
-
 <source>Generating file list...</source>
 <target>Fájllista generálása...</target>
 
+<source>Start comparison</source>
+<target>Összehasonlítás megkezdése</target>
+
+<source>Calculating sync directions...</source>
+<target>Szinkronizációs irányok számítása...</target>
+
 <source>Both sides are equal</source>
 <target>Mindkét oldal egyforma</target>
 
@@ -1429,12 +1420,6 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Egy olyan mappa kerül módosításra, amely része több mappapárnak. Kérjük, ellenőrizze a szinkronizációs beállításokat.</target>
 
-<source>Left</source>
-<target>Bal oldal</target>
-
-<source>Right</source>
-<target>Jobb oldal</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Mappapár szinkronizálása:</target>
 
diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng
index 0bd4d263..f0f8aa0d 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -115,14 +115,11 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Impossibile risolvere collegamento %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
+<source>Cannot determine final path for %x.</source>
+<target></target>
 
-<source>%x GB</source>
-<target>%x GB</target>
+<source>Cannot find system function %x.</source>
+<target>Impossibile trovare funzione di sistema %x.</target>
 
 <source>
 <pluralform>1 Byte</pluralform>
@@ -133,6 +130,15 @@
 <pluralform>%x Byte</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Il file database %x non è compatibile.</target>
 
@@ -169,9 +175,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Attendi mentre la cartella è bloccata (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Creazione file %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +184,15 @@
 <pluralform>%x sec</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Creazione file %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Errore nel parsing del file %x, riga %y, colonna %z.</target>
 
 <source>Scanning:</source>
 <target>Analisi di:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Codifica estesa informazioni orario: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +202,9 @@
 <pluralform>[%x threads]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Codifica estesa informazioni orario: %x</target>
+
 <source>/sec</source>
 <target>/sec</target>
 
@@ -411,12 +417,12 @@ Il comando è attivato se:
 <source>Date:</source>
 <target>Data:</target>
 
-<source>Action</source>
-<target>Azioni</target>
-
 <source>Category</source>
 <target>Categoria</target>
 
+<source>Action</source>
+<target>Azioni</target>
+
 <source>Drag && drop</source>
 <target>Trascina</target>
 
@@ -792,12 +798,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>&Find next</source>
 <target>&Trova successivo</target>
 
-<source>Operation aborted!</source>
-<target>Operazione abortita!</target>
-
-<source>Main bar</source>
-<target>Barra principale</target>
-
 <source>Folder pairs</source>
 <target>Coppia di cartelle</target>
 
@@ -807,6 +807,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Configuration</source>
 <target>Configurazione</target>
 
+<source>Main bar</source>
+<target>Barra principale</target>
+
 <source>Filter files</source>
 <target>Filtro dei file</target>
 
@@ -822,6 +825,30 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Compare both sides</source>
 <target>Compara le due liste</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 cartella</pluralform>
+<pluralform>%x cartelle</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 file</pluralform>
+<pluralform>%x file</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target></target>
+
 <source>Set direction:</source>
 <target>Imposta direzione:</target>
 
@@ -936,48 +963,21 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Set as default</source>
 <target>Imposta come predefinito</target>
 
+<source>Operation aborted!</source>
+<target>Operazione abortita!</target>
+
 <source>All folders are in sync!</source>
 <target>Tutte le cartelle sono sincronizzate!</target>
 
 <source>Comma separated list</source>
 <target>Elenco elementi separati da virgola</target>
 
-<source>Legend</source>
-<target>Legenda</target>
-
 <source>File list exported!</source>
 <target>Elenco file esportato!</target>
 
 <source>Searching for program updates...</source>
 <target>Ricerca di aggiornamenti al programma...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 cartella</pluralform>
-<pluralform>%x cartelle</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 file</pluralform>
-<pluralform>%x file</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x di 1 riga nella vista</pluralform>
-<pluralform>%x di %y righe nella vista</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ignora i prossimi errori</target>
 
@@ -1059,6 +1059,24 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Filter</source>
 <target>Filtro</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Vuoi 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 item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Vuoi veramente eliminare il seguente oggetto?</pluralform>
+<pluralform>Vuoi veramente eliminare i seguenti %x oggetti?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Diretto</target>
 
@@ -1086,39 +1104,21 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Vuoi visualizzare nuovamente i dialoghi e avvisi nascosti?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>Vuoi 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 item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<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>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>Folder</source>
 <target>Cartella</target>
 
@@ -1161,9 +1161,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Cannot write modification time of %x.</source>
 <target>Impossibile scrivere data e ora di modifica di %x.</target>
 
-<source>Cannot find system function %x.</source>
-<target>Impossibile trovare funzione di sistema %x.</target>
-
 <source>Cannot read security context of %x.</source>
 <target>Impossibile leggere il contesto di protezione di %x.</target>
 
@@ -1179,8 +1176,8 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Cannot create directory %x.</source>
 <target>Impossibile creare cartella %x.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Impossibile copiare collegamento %x su %y.</target>
+<source>Cannot create symbolic link %x.</source>
+<target></target>
 
 <source>Cannot copy file %x to %y.</source>
 <target>Impossibile copiare file %x in %y.</target>
@@ -1203,9 +1200,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1296,12 +1290,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <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>
 
-<source>Start comparison</source>
-<target>Inizia comparazione</target>
-
-<source>Calculating sync directions...</source>
-<target>Calcolo della direzione di sincronizzazione...</target>
-
 <source>Conflict detected:</source>
 <target>Rilevato conflitto:</target>
 
@@ -1314,18 +1302,21 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Items differ in attributes only</source>
 <target>Gli oggetti differiscono solo negli attributi</target>
 
-<source>Symbolic links %x have the same date but a different target.</source>
-<target>Il collegamento %x ha stessa data ma un diverso puntamento.</target>
+<source>Resolving symbolic link %x</source>
+<target></target>
 
 <source>Comparing content of files %x</source>
 <target>Comparazione contenuto del file %x</target>
 
-<source>Comparing files by content failed.</source>
-<target>Comparazione file in base al contenuto fallita.</target>
-
 <source>Generating file list...</source>
 <target>Generazione elenco file...</target>
 
+<source>Start comparison</source>
+<target>Inizia comparazione</target>
+
+<source>Calculating sync directions...</source>
+<target>Calcolo della direzione di sincronizzazione...</target>
+
 <source>Both sides are equal</source>
 <target>Entrambi i lati sono uguali</target>
 
@@ -1431,12 +1422,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Verrà modificata una cartella che è parte di molteplici coppie di cartelle. Controlla le impostazioni di sincronizzazione.</target>
 
-<source>Left</source>
-<target>Sinistra</target>
-
-<source>Right</source>
-<target>Destra</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Sincronizzazione della coppia di cartelle:</target>
 
diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng
index 01b596e0..3b855ea5 100644
--- a/BUILD/Languages/japanese.lng
+++ b/BUILD/Languages/japanese.lng
@@ -115,6 +115,14 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>シンボリックリンク %x を解決できません.</target>
 
+<source>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
+</source>
+<target>
+<pluralform>%x バイト</pluralform>
+</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -124,14 +132,6 @@
 <source>%x GB</source>
 <target>%x GB</target>
 
-<source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</source>
-<target>
-<pluralform>%x バイト</pluralform>
-</target>
-
 <source>Database file %x is incompatible.</source>
 <target>データベース %x とは互換性がありません.</target>
 
@@ -168,9 +168,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>待機時間中ディレクトリはロックされます(%x)...</target>
 
-<source>Creating file %x</source>
-<target>ファイル %x を作成中</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -179,15 +176,15 @@
 <pluralform>%x 秒.</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>ファイル %x を作成中</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>ファイル %x の構文解析エラー, 行 %y, 列 %z.</target>
 
 <source>Scanning:</source>
 <target>スキャン:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>拡張された時間情報のエンコーディング: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -196,6 +193,9 @@
 <pluralform>[%x スレッド]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>拡張された時間情報のエンコーディング: %x</target>
+
 <source>/sec</source>
 <target>/秒</target>
 
@@ -819,6 +819,30 @@ Note: File names must be relative to base directories!
 <source>Compare both sides</source>
 <target>両方を比較</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x ディレクトリ</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x ファイル</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y の %x 行(表示内)</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>方向の設定:</target>
 
@@ -948,30 +972,6 @@ Note: File names must be relative to base directories!
 <source>Searching for program updates...</source>
 <target>アップデートを検索しています...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x ディレクトリ</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x ファイル</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x / %y 行を表示</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>以降のエラーを無視</target>
 
@@ -1053,6 +1053,22 @@ Note: File names must be relative to base directories!
 <source>Filter</source>
 <target>フィルター</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>本当に以下の %x 個の項目をゴミ箱に移動しますか</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>本当に以下の %x 個の項目を削除しますか</pluralform>
+</target>
+
 <source>Direct</source>
 <target>ダイレクト</target>
 
@@ -1080,22 +1096,6 @@ Note: File names must be relative to base directories!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>非表示にした警告ダイアログを再び表示しますか?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>本当に以下の %x 個の項目をゴミ箱に移動しますか</pluralform>
-</target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<pluralform>本当に以下の %x 個の項目を削除しますか</pluralform>
-</target>
-
 <source>Leave as unresolved conflict</source>
 <target>未解決の競合はそのまま残す</target>
 
@@ -1123,6 +1123,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>
 
@@ -1192,9 +1195,6 @@ Note: File names must be relative to base directories!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1276,8 +1276,8 @@ Note: File names must be relative to base directories!
 <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>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>ディレクトリが依存関係にあります! 同期規則の設定時には注意してください:</target>
@@ -1313,7 +1313,7 @@ Note: File names must be relative to base directories!
 <target>ファイル一覧を作成中...</target>
 
 <source>Both sides are equal</source>
-<target>両側とも等しく</target>
+<target>両側とも等しい</target>
 
 <source>Copy new item to left</source>
 <target>新しい項目を左にコピー</target>
diff --git a/BUILD/Languages/korean.lng b/BUILD/Languages/korean.lng
index 07cc454e..e47f241d 100644
--- a/BUILD/Languages/korean.lng
+++ b/BUILD/Languages/korean.lng
@@ -115,6 +115,14 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>심볼릭 링크 %x 을(를) 해결할 수 없습니다.</target>
 
+<source>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
+</source>
+<target>
+<pluralform>%x 바이트</pluralform>
+</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -124,14 +132,6 @@
 <source>%x GB</source>
 <target>%x GB</target>
 
-<source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</source>
-<target>
-<pluralform>%x 바이트</pluralform>
-</target>
-
 <source>Database file %x is incompatible.</source>
 <target>데이터베이스 파일 %x 은(는) 호환 불가능합니다.</target>
 
@@ -168,9 +168,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>디렉토리 잠금 대기 중 (%x)...</target>
 
-<source>Creating file %x</source>
-<target>파일 %x 생성 중</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -179,15 +176,15 @@
 <pluralform>%x초</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>파일 %x 생성 중</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>분석 오류 - 파일: %x; 행: %y; 열: %z</target>
 
 <source>Scanning:</source>
 <target>스캔 :</target>
 
-<source>Encoding extended time information: %x</source>
-<target>인코딩 확장 시간 정보 : %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -196,6 +193,9 @@
 <pluralform>[%x 스레드]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>인코딩 확장 시간 정보 : %x</target>
+
 <source>/sec</source>
 <target>/초</target>
 
@@ -819,6 +819,30 @@ Note: File names must be relative to base directories!
 <source>Compare both sides</source>
 <target>양측 비교</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x개 디렉토리</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x개 파일</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>보기에 나타난 %x 행의 %y</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>방향 설정 :</target>
 
@@ -948,30 +972,6 @@ Note: File names must be relative to base directories!
 <source>Searching for program updates...</source>
 <target>프로그램 업데이트 검색 중...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x개 디렉토리</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x개 파일</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>보기에 나타난 %y개 행의 %x개 대상</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>더 이상의 오류는 무시</target>
 
@@ -1053,6 +1053,22 @@ Note: File names must be relative to base directories!
 <source>Filter</source>
 <target>필터</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>정말로 다음 %x 항목(들)을 휴지통으로 이동하시겠습니까?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>정말로 다음 %x 항목(들)을 삭제하시겠습니까?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>다이렉트</target>
 
@@ -1080,22 +1096,6 @@ Note: File names must be relative to base directories!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>숨겨진 경고 창 또는 대화 창을 다시 보이게 하시겠습니까?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>정말로 다음 %x 항목(들)을 휴지통으로 이동하시겠습니까?</pluralform>
-</target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<pluralform>정말로 다음 %x 항목(들)을 삭제하시겠습니까?</pluralform>
-</target>
-
 <source>Leave as unresolved conflict</source>
 <target>미해결 충돌로 놔두기</target>
 
@@ -1123,6 +1123,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>
 
@@ -1192,9 +1195,6 @@ Note: File names must be relative to base directories!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1276,8 +1276,8 @@ Note: File names must be relative to base directories!
 <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>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>디렉토리가 의존 관계에 있습니다. 동기화 규칙 설정시 주의하십시오.</target>
diff --git a/BUILD/Languages/lithuanian.lng b/BUILD/Languages/lithuanian.lng
index c652bf6f..6c4ca60a 100644
--- a/BUILD/Languages/lithuanian.lng
+++ b/BUILD/Languages/lithuanian.lng
@@ -113,16 +113,13 @@
 <target>Klaidos kodas %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
-<target>Nepavyksta išspręsti simbolinės nuorodos.</target>
+<target></target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
+<source>Cannot determine final path for %x.</source>
+<target></target>
 
-<source>%x GB</source>
-<target>%x GB</target>
+<source>Cannot find system function %x.</source>
+<target>Nepavyksta rasti sistemos funkcijos %x.</target>
 
 <source>
 <pluralform>1 Byte</pluralform>
@@ -135,6 +132,15 @@
 <pluralform>%x Baitas</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Duomenų bazė %x yra netinkama.</target>
 
@@ -163,7 +169,7 @@
 <target>Atsirado išimtis!</target>
 
 <source>Cannot read file attributes of %x.</source>
-<target>Nepavyksta nuskaityti failo atributų</target>
+<target></target>
 
 <source>Cannot get process information.</source>
 <target>Nepavyksta gauti eigos informacijos.</target>
@@ -171,9 +177,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Laikiama kol katalogas bus užrakintas (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Kuriamas failas %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -185,15 +188,15 @@
 <pluralform>%x sek</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Kuriamas failas %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Klaida trinant failą %x, eilė %y, stulpelis %z.</target>
 
 <source>Scanning:</source>
 <target>Skenuojama:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Koduojama išplėstinė laiko informacija: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -205,6 +208,9 @@
 <pluralform>[%x Grėsmė]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Koduojama išplėstinė laiko informacija: %x</target>
+
 <source>/sec</source>
 <target>/sek.</target>
 
@@ -417,12 +423,12 @@ Komanda inicijuojama jei:
 <source>Date:</source>
 <target>Data:</target>
 
-<source>Action</source>
-<target>Veiksmas</target>
-
 <source>Category</source>
 <target>Kategorija</target>
 
+<source>Action</source>
+<target>Veiksmas</target>
+
 <source>Drag && drop</source>
 <target>Vilkti ir numesti</target>
 
@@ -798,12 +804,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>&Find next</source>
 <target>&Rasti kitą</target>
 
-<source>Operation aborted!</source>
-<target>Operacija nutraukta!</target>
-
-<source>Main bar</source>
-<target>Pagrindinė juosta</target>
-
 <source>Folder pairs</source>
 <target>Aplankų poros</target>
 
@@ -813,6 +813,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Configuration</source>
 <target>Nustatymai</target>
 
+<source>Main bar</source>
+<target>Pagrindinė juosta</target>
+
 <source>Filter files</source>
 <target>Filtruoti failus</target>
 
@@ -828,6 +831,34 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Compare both sides</source>
 <target>Sulyginti abi puses</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 katalogas</pluralform>
+<pluralform>%x katalogai</pluralform>
+<pluralform>%x katalogų</pluralform>
+<pluralform>%x katalogas</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 failas</pluralform>
+<pluralform>%x failai</pluralform>
+<pluralform>%x failų</pluralform>
+<pluralform>%x failas</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target></target>
+
 <source>Set direction:</source>
 <target>Nustatyti kryptį:</target>
 
@@ -942,54 +973,21 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Set as default</source>
 <target>Nustatyti kaip numatytą</target>
 
+<source>Operation aborted!</source>
+<target>Operacija nutraukta!</target>
+
 <source>All folders are in sync!</source>
 <target>Visi aplankai susinchronizuoti!</target>
 
 <source>Comma separated list</source>
 <target>Kableliais atksirtas sąrašas</target>
 
-<source>Legend</source>
-<target>Legenda</target>
-
 <source>File list exported!</source>
 <target>Failų sąrašas eksportuotas!</target>
 
 <source>Searching for program updates...</source>
 <target>Ieškoma programos atnaujinimų...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 katalogas</pluralform>
-<pluralform>%x katalogai</pluralform>
-<pluralform>%x katalogų</pluralform>
-<pluralform>%x katalogas</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 failas</pluralform>
-<pluralform>%x failai</pluralform>
-<pluralform>%x failų</pluralform>
-<pluralform>%x failas</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x iš 1 eilės rodmenyje</pluralform>
-<pluralform>%x iš %y eilių rodmenyje</pluralform>
-<pluralform>%x iš %y eilių rodmenyje</pluralform>
-<pluralform>%x iš %y eilės rodmenyje</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ignoruoti tolimesnes klaidas</target>
 
@@ -1071,6 +1069,28 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Filter</source>
 <target>Filtras</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Ar tikrai norite perkelti šį elementą į šiukšliadėžę?</pluralform>
+<pluralform>Ar tikrai norite perkelti šiuos %x elementus į šiukšliadėžę?</pluralform>
+<pluralform>Ar tikrai norite perkelti šiuos %x elementų į šiukšliadėžę?</pluralform>
+<pluralform>Ar tikrai norite perkelti šį %x elementą į šiukšliadėžę?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>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>Direct</source>
 <target>Tiesiogiai</target>
 
@@ -1098,43 +1118,21 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Ar vėl rodyti paslėptus perspėjimus ir langus?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>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 item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<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>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>Folder</source>
 <target>Aplankas</target>
 
@@ -1147,6 +1145,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Files</source>
 <target>Failai</target>
 
+<source>Items</source>
+<target></target>
+
 <source>Percentage</source>
 <target>Procentai</target>
 
@@ -1174,9 +1175,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Cannot write modification time of %x.</source>
 <target>Nepavyksta šrašyti pakeitimo datos %x.</target>
 
-<source>Cannot find system function %x.</source>
-<target>Nepavyksta rasti sistemos funkcijos %x.</target>
-
 <source>Cannot read security context of %x.</source>
 <target>Nepavyksta perskaityti %x saugumo konteksto.</target>
 
@@ -1192,8 +1190,8 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Cannot create directory %x.</source>
 <target>Nepavyksta sukurti katalogo %x.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Nepavyksta nukopijuoti simbolinės nuorodos %x į %y.</target>
+<source>Cannot create symbolic link %x.</source>
+<target></target>
 
 <source>Cannot copy file %x to %y.</source>
 <target>Nepavyksta nukopijuoti failo %x į %y.</target>
@@ -1216,9 +1214,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1309,18 +1304,12 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Cannot find the following folders:</source>
 <target>Nepavyksta rasti šių aplankų:</target>
 
-<source>You can ignore this error to consider each folder as empty.</source>
-<target>Galite ignoruoti šią klaidą, kad kiekvienas aplankas būtų laikomas tuščiu.</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>Katalogai yra priklausomi! Būkite atsargūs nustatydami sinchronizavimo taisykles:</target>
 
-<source>Start comparison</source>
-<target>Pradėti palyginimą</target>
-
-<source>Calculating sync directions...</source>
-<target>Apskaičiuojamos sinchrinizacijos kryptys...</target>
-
 <source>Conflict detected:</source>
 <target>Aptiktas konfliktas:</target>
 
@@ -1333,18 +1322,21 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Items differ in attributes only</source>
 <target>Elementai skiriasi tik atributais</target>
 
-<source>Symbolic links %x have the same date but a different target.</source>
-<target>Simbolinės nuorodos %x turi tokią pačią datą bet skirtingus tikslus</target>
+<source>Resolving symbolic link %x</source>
+<target></target>
 
 <source>Comparing content of files %x</source>
 <target>Sulyginamas failų turinys %x</target>
 
-<source>Comparing files by content failed.</source>
-<target>Nepavyko failų sulyginimas pagal turinį.</target>
-
 <source>Generating file list...</source>
 <target>Generuojamas failų sąrašas...</target>
 
+<source>Start comparison</source>
+<target>Pradėti palyginimą</target>
+
+<source>Calculating sync directions...</source>
+<target>Apskaičiuojamos sinchrinizacijos kryptys...</target>
+
 <source>Both sides are equal</source>
 <target>Abi pusės yra lygios</target>
 
@@ -1450,12 +1442,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Aplankas, kuris yra dalis keletos aplankų porų, bus pakeistas. Prašome peržiūrėti sinchronizavimo nustatymus.</target>
 
-<source>Left</source>
-<target>Kairė</target>
-
-<source>Right</source>
-<target>Dešinė</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Sinchrinizuojama aplankų pora:</target>
 
diff --git a/BUILD/Languages/norwegian.lng b/BUILD/Languages/norwegian.lng
index c85b7f9f..d453b110 100644
--- a/BUILD/Languages/norwegian.lng
+++ b/BUILD/Languages/norwegian.lng
@@ -115,14 +115,11 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Kan ikke følge symbolsk lenke %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
+<source>Cannot determine final path for %x.</source>
+<target></target>
 
-<source>%x GB</source>
-<target>%x GB</target>
+<source>Cannot find system function %x.</source>
+<target>Kan ikke finne systemfunksjonen %x.</target>
 
 <source>
 <pluralform>1 Byte</pluralform>
@@ -133,6 +130,15 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Databasefil %x er inkompatibel.</target>
 
@@ -169,9 +175,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Venter mens mappe er låst (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Oppretter fil %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +184,15 @@
 <pluralform>%x sekunder</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Oppretter fil %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Feil ved analysering av fil %x, rekke %y, kolonne %z.</target>
 
 <source>Scanning:</source>
 <target>Skanner:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Koder utvided tidsinformasjon: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +202,9 @@
 <pluralform>[%x Tråder]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Koder utvided tidsinformasjon: %x</target>
+
 <source>/sec</source>
 <target>/sekund</target>
 
@@ -411,12 +417,12 @@ Kommandoen utløses hvis:
 <source>Date:</source>
 <target>Dato:</target>
 
-<source>Action</source>
-<target>Handling</target>
-
 <source>Category</source>
 <target>Kategori</target>
 
+<source>Action</source>
+<target>Handling</target>
+
 <source>Drag && drop</source>
 <target>Dra && slipp</target>
 
@@ -792,12 +798,6 @@ Merk: Filnavn må være relative til basismapper!
 <source>&Find next</source>
 <target>&Søk neste</target>
 
-<source>Operation aborted!</source>
-<target>Handling avbrutt!</target>
-
-<source>Main bar</source>
-<target>Hovedverktøylinje</target>
-
 <source>Folder pairs</source>
 <target>Mappepar</target>
 
@@ -807,6 +807,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Configuration</source>
 <target>Innstilling</target>
 
+<source>Main bar</source>
+<target>Hovedverktøylinje</target>
+
 <source>Filter files</source>
 <target>Filtrer filer</target>
 
@@ -822,6 +825,30 @@ Merk: Filnavn må være relative til basismapper!
 <source>Compare both sides</source>
 <target>Sammenlign begge sider</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 mappe</pluralform>
+<pluralform>%x mapper</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 fil</pluralform>
+<pluralform>%x filer</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target></target>
+
 <source>Set direction:</source>
 <target>Still inn retningen:</target>
 
@@ -936,48 +963,21 @@ Merk: Filnavn må være relative til basismapper!
 <source>Set as default</source>
 <target>Set som standard</target>
 
+<source>Operation aborted!</source>
+<target>Handling avbrutt!</target>
+
 <source>All folders are in sync!</source>
 <target>Alle mapper er synkroniserte!</target>
 
 <source>Comma separated list</source>
 <target>Komma-separert liste</target>
 
-<source>Legend</source>
-<target>Forklaring</target>
-
 <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>
-</source>
-<target>
-<pluralform>1 mappe</pluralform>
-<pluralform>%x mapper</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 fil</pluralform>
-<pluralform>%x filer</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x av 1 rekke</pluralform>
-<pluralform>%x av %y rekker</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ignorer ytterligere feil</target>
 
@@ -1059,6 +1059,18 @@ Merk: Filnavn må være relative til basismapper!
 <source>Filter</source>
 <target>Filter</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target></target>
+
 <source>Direct</source>
 <target>Direkte</target>
 
@@ -1086,33 +1098,21 @@ Merk: Filnavn må være relative til basismapper!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Gjør skjylte advarsler og dialoger synlige igjen?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target></target>
-
 <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>
-
 <source>Replace</source>
 <target>Erstatt</target>
 
 <source>Move files and replace if existing</source>
 <target>Flytt filer og erstatt hvis eksisterer</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>
+
 <source>Folder</source>
 <target>Mappe</target>
 
@@ -1125,6 +1125,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Files</source>
 <target>Filer</target>
 
+<source>Items</source>
+<target></target>
+
 <source>Percentage</source>
 <target>Prosent</target>
 
@@ -1152,9 +1155,6 @@ Merk: Filnavn må være relative til basismapper!
 <source>Cannot write modification time of %x.</source>
 <target>Kan ikke skrive endringstid til %x.</target>
 
-<source>Cannot find system function %x.</source>
-<target>Kan ikke finne systemfunksjonen %x.</target>
-
 <source>Cannot read security context of %x.</source>
 <target>Kan ikke lese sikkerhetskontekst til %x.</target>
 
@@ -1170,8 +1170,8 @@ Merk: Filnavn må være relative til basismapper!
 <source>Cannot create directory %x.</source>
 <target>Kan ikke opprette mappen %x.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Kan ikke kopiere symbolsk lenke %x til %y.</target>
+<source>Cannot create symbolic link %x.</source>
+<target></target>
 
 <source>Cannot copy file %x to %y.</source>
 <target>Kan ikke kopiere filen %x til %y.</target>
@@ -1194,9 +1194,6 @@ Merk: Filnavn må være relative til basismapper!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1281,18 +1278,12 @@ Merk: Filnavn må være relative til basismapper!
 <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>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>Mapper er avhengige av hverandre! Vær forsiktig når du setter opp synkroniseringsregler:</target>
 
-<source>Start comparison</source>
-<target>Start sammenligning</target>
-
-<source>Calculating sync directions...</source>
-<target></target>
-
 <source>Conflict detected:</source>
 <target>Konflikt oppdaget:</target>
 
@@ -1305,18 +1296,21 @@ Merk: Filnavn må være relative til basismapper!
 <source>Items differ in attributes only</source>
 <target>Elementer har kun forskjellige attributter</target>
 
-<source>Symbolic links %x have the same date but a different target.</source>
-<target>Symbolske lenker %x har den samme datoen, men forskjellige mål.</target>
+<source>Resolving symbolic link %x</source>
+<target></target>
 
 <source>Comparing content of files %x</source>
 <target>Sammenligner innhold til filer %x</target>
 
-<source>Comparing files by content failed.</source>
-<target>Sammenligning av filer etter innhold feilet.</target>
-
 <source>Generating file list...</source>
 <target>Lager filliste...</target>
 
+<source>Start comparison</source>
+<target>Start sammenligning</target>
+
+<source>Calculating sync directions...</source>
+<target></target>
+
 <source>Both sides are equal</source>
 <target>Begge sider er like</target>
 
@@ -1422,12 +1416,6 @@ Merk: Filnavn må være relative til basismapper!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>En mappe vil endres som er en del av flere mappepar. Se over innstillingene for synkronisering.</target>
 
-<source>Left</source>
-<target>Venstre</target>
-
-<source>Right</source>
-<target>Høyre</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Synkroniserer mappepar:</target>
 
diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng
index d39124b3..0906761a 100644
--- a/BUILD/Languages/polish.lng
+++ b/BUILD/Languages/polish.lng
@@ -115,15 +115,6 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Nie można określić położenia dowiązania symbolicznego %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
-
-<source>%x GB</source>
-<target>%x GB</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -134,6 +125,15 @@
 <pluralform>%x Bajtów</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Plik bazy danych %x nie jest kompatybilny.</target>
 
@@ -170,9 +170,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Blokada katalogu (%x), oczekiwanie...</target>
 
-<source>Creating file %x</source>
-<target>Tworzenie pliku %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -183,15 +180,15 @@
 <pluralform>%x sekund</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Tworzenie pliku %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Błąd podczas parsowania pliku %x, rząd %y, kolumna %z.</target>
 
 <source>Scanning:</source>
 <target>Skanowanie:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Odkodowywanie rozszerzonych informacji o czasie: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -202,6 +199,9 @@
 <pluralform>[%x Wątków]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Odkodowywanie rozszerzonych informacji o czasie: %x</target>
+
 <source>/sec</source>
 <target>/sekundę</target>
 
@@ -795,9 +795,6 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>&Find next</source>
 <target>&Znajdź następny</target>
 
-<source>Operation aborted!</source>
-<target>Operacja przerwana!</target>
-
 <source>Main bar</source>
 <target>Główny pasek</target>
 
@@ -825,6 +822,36 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Compare both sides</source>
 <target>Porównaj foldery</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 katalog</pluralform>
+<pluralform>%x katalogi</pluralform>
+<pluralform>%x katalogów</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 plik</pluralform>
+<pluralform>%x pliki</pluralform>
+<pluralform>%x plików</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>Widok %y z 1 lini</pluralform>
+<pluralform>Widok %y z %x lini</pluralform>
+<pluralform>Widok %y z %x lini</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Kierunek  synchronizacji:</target>
 
@@ -939,6 +966,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Set as default</source>
 <target>Zapisz jako domyślne</target>
 
+<source>Operation aborted!</source>
+<target>Operacja przerwana!</target>
+
 <source>All folders are in sync!</source>
 <target>Wszystkie katalogi są zsynchronizowane!</target>
 
@@ -954,36 +984,6 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Searching for program updates...</source>
 <target>Wyszukiwanie aktualizacji...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 katalog</pluralform>
-<pluralform>%x katalogi</pluralform>
-<pluralform>%x katalogów</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 plik</pluralform>
-<pluralform>%x pliki</pluralform>
-<pluralform>%x plików</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x z 1 rzędu w widoku</pluralform>
-<pluralform>%x z %y rzędów w widoku</pluralform>
-<pluralform>%x z %y rzędów w widoku</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ignoruj kolejne błędy</target>
 
@@ -1065,6 +1065,26 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Filter</source>
 <target>Filtr</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Czy na pewno chcesz przenieść do kosza następujący element?</pluralform>
+<pluralform>Czy na pewno chcesz przenieść do kosza %x następujące elementy?</pluralform>
+<pluralform>Czy na pewno chcesz przenieść do kosza %x następujących elementów?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>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>Direct</source>
 <target>Bezpośrednio</target>
 
@@ -1092,26 +1112,6 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Przywrócić ukryte powiadomienia i dialogi?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>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 item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<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>
 
@@ -1140,7 +1140,7 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <target>Pliki</target>
 
 <source>Items</source>
-<target></target>
+<target>Elementy</target>
 
 <source>Percentage</source>
 <target>Procentowo</target>
@@ -1211,9 +1211,6 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1301,8 +1298,8 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <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>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>Możesz zignorować ten błąd aby uznając katalogi jako puste. Katalog zostanie utworzony automatycznie podczas synchronizacji.</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>
@@ -1442,12 +1439,6 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Katalog zostanie zmodyfikowany w związku z synchronizacją wielu katalogów. Zweryfikuj ustawienia synchronizacji.</target>
 
-<source>Left</source>
-<target>Lewy</target>
-
-<source>Right</source>
-<target>Prawy</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Synchronizacja katalgów:</target>
 
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index 8fd451a1..c524a9db 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -115,15 +115,6 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Não é possível resolver o link simbólico %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
-
-<source>%x GB</source>
-<target>%x GB</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -133,6 +124,15 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Base de dados %x não é compatível.</target>
 
@@ -169,9 +169,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Aguardar enquanto o directório é bloqueado (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Criar ficheiro %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +178,15 @@
 <pluralform>%x segs</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Criar ficheiro %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Erro ao analisar ficheiro %x, linha %y, coluna %z.</target>
 
 <source>Scanning:</source>
 <target>A pesquisar:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>A codificar dados temporais extendidos: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +196,9 @@
 <pluralform>[%x Threads]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>A codificar dados temporais extendidos: %x</target>
+
 <source>/sec</source>
 <target>/seg</target>
 
@@ -411,12 +411,12 @@ O comando é executado se:
 <source>Date:</source>
 <target>Data:</target>
 
-<source>Action</source>
-<target>Ação</target>
-
 <source>Category</source>
 <target>Categoria</target>
 
+<source>Action</source>
+<target>Ação</target>
+
 <source>Drag && drop</source>
 <target>Arrastar && Largar</target>
 
@@ -791,12 +791,6 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>&Find next</source>
 <target>&Procurar seguinte</target>
 
-<source>Operation aborted!</source>
-<target>Operação abortada!</target>
-
-<source>Main bar</source>
-<target>Barra principal</target>
-
 <source>Folder pairs</source>
 <target>Par de directório</target>
 
@@ -806,6 +800,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Configuration</source>
 <target>Configuração</target>
 
+<source>Main bar</source>
+<target>Barra principal</target>
+
 <source>Filter files</source>
 <target>Filtrar ficheiros</target>
 
@@ -821,6 +818,33 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Compare both sides</source>
 <target>Comparar listas</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 directório</pluralform>
+<pluralform>%x directórios</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 ficheiro</pluralform>
+<pluralform>%x ficheiros</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y de 1 linha em vista</pluralform>
+<pluralform>%y de %x linhas em vista</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Escolher direcção:</target>
 
@@ -935,6 +959,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Set as default</source>
 <target>Definir como padrão</target>
 
+<source>Operation aborted!</source>
+<target>Operação abortada!</target>
+
 <source>All folders are in sync!</source>
 <target>Todas as pastas estão sincronizadas!</target>
 
@@ -950,33 +977,6 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Searching for program updates...</source>
 <target>A procurar actualizações do programa...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 directório</pluralform>
-<pluralform>%x directórios</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 ficheiro</pluralform>
-<pluralform>%x ficheiros</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x de 1 linha em vista</pluralform>
-<pluralform>%x de %y linhas em vista</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ignorar próximos erros</target>
 
@@ -1058,6 +1058,24 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Filter</source>
 <target>Filtro</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>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 item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Deseja mesmo eliminar o seguinte item?</pluralform>
+<pluralform>Deseja mesmo eliminar os seguintes %x itens?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Direto</target>
 
@@ -1085,39 +1103,21 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Tornar visiveis os diálogos e avisos escondidos novamente?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>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 item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<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>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>Folder</source>
 <target>Pasta</target>
 
@@ -1130,6 +1130,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Files</source>
 <target>Ficheiros</target>
 
+<source>Items</source>
+<target>Itens</target>
+
 <source>Percentage</source>
 <target>Percentagem</target>
 
@@ -1199,9 +1202,6 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1286,8 +1286,8 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <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>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>Pode ignorar este erro para considerar cada pasta como vazia. As pastas necessárias serão criadas automaticamente durante a sincronização.</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>
@@ -1427,12 +1427,6 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Uma pasta que faz parte de vários pares vai ser modificada. Por favor, reveja os parametros de sincronização.</target>
 
-<source>Left</source>
-<target>Esquerda</target>
-
-<source>Right</source>
-<target>Direita</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Sincronizar o par de pastas:</target>
 
diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng
index 8615e134..e952271b 100644
--- a/BUILD/Languages/portuguese_br.lng
+++ b/BUILD/Languages/portuguese_br.lng
@@ -4,7 +4,7 @@
 	<locale>pt_BR</locale>
 	<flag file>brazil.png</flag file>
 	<plural forms>2</plural forms>
-	<plural definition>n <= 1 ? 0 : 1</plural definition>
+	<plural definition>n == 1 ? 0 : 1</plural definition>
 </header>
 
 <source>Searching for folder %x...</source>
@@ -115,6 +115,15 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Não foi possível resolver o link simbólico %x.</target>
 
+<source>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
+</source>
+<target>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
+</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -124,15 +133,6 @@
 <source>%x GB</source>
 <target>%x GB</target>
 
-<source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</source>
-<target>
-<pluralform>%x Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</target>
-
 <source>Database file %x is incompatible.</source>
 <target>O arquivo de banco de dados %x é incompatível.</target>
 
@@ -169,36 +169,36 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Esperando enquanto o diretório é bloqueado (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Criando arquivo %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
 </source>
 <target>
-<pluralform>%x seg</pluralform>
+<pluralform>1 seg</pluralform>
 <pluralform>%x segs</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Criando arquivo %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Erro analisando o arquivo %x, linha %y, coluna %z.</target>
 
 <source>Scanning:</source>
 <target>Pesquisando:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Codificando informações adicionais de tempo: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
 </source>
 <target>
-<pluralform>[%x Thread]</pluralform>
+<pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Codificando informações adicionais de tempo: %x</target>
+
 <source>/sec</source>
 <target>/seg</target>
 
@@ -792,9 +792,6 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>&Find next</source>
 <target>&Localizar próxima</target>
 
-<source>Operation aborted!</source>
-<target>Operação cancelada!</target>
-
 <source>Main bar</source>
 <target>Barra principal</target>
 
@@ -822,6 +819,33 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Compare both sides</source>
 <target>Comparar os dois lados</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 diretório</pluralform>
+<pluralform>%x diretórios</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 arquivo</pluralform>
+<pluralform>%x arquivos</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y de 1 linha</pluralform>
+<pluralform>%y de %x linhas</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Configurar direção</target>
 
@@ -936,6 +960,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Set as default</source>
 <target>Definir como padrão</target>
 
+<source>Operation aborted!</source>
+<target>Operação cancelada!</target>
+
 <source>All folders are in sync!</source>
 <target>Todas as pastas estão sincronizadas!</target>
 
@@ -951,33 +978,6 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Searching for program updates...</source>
 <target>Procurando atualizações do programa...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x diretório</pluralform>
-<pluralform>%x diretórios</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x arquivo</pluralform>
-<pluralform>%x arquivos</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x de %y linha</pluralform>
-<pluralform>%x de %y linhas</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ignorar erros subsequentes</target>
 
@@ -1059,6 +1059,24 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Filter</source>
 <target>Filtro</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Você realmente deseja mover o seguinte item para a Lixeira?</pluralform>
+<pluralform>Você realmente deseja mover os seguintes %x itens para a Lixeira?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Você realmente deseja apagar o seguinte item?</pluralform>
+<pluralform>Você realmente deseja apagar os seguintes %x itens?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Direto</target>
 
@@ -1086,24 +1104,6 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Tornar avisar e diálogos ocultados visíveis outra vez?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>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 item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<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>
 
@@ -1132,7 +1132,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <target>Arquivos</target>
 
 <source>Items</source>
-<target></target>
+<target>Itens</target>
 
 <source>Percentage</source>
 <target>Percentual</target>
@@ -1203,15 +1203,12 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
 </source>
 <target>
-<pluralform>%x min</pluralform>
+<pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
 </target>
 
@@ -1220,7 +1217,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <pluralform>%x hours</pluralform>
 </source>
 <target>
-<pluralform>%x hora</pluralform>
+<pluralform>1 hora</pluralform>
 <pluralform>%x horas</pluralform>
 </target>
 
@@ -1229,7 +1226,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <pluralform>%x days</pluralform>
 </source>
 <target>
-<pluralform>%x dia</pluralform>
+<pluralform>1 dia</pluralform>
 <pluralform>%x dias</pluralform>
 </target>
 
@@ -1290,8 +1287,8 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <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>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>Você pode ignorar este erro para considerar cada pasta como vazia. As pastas serão criadas automaticamentes durante a sincronização.</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>
@@ -1431,12 +1428,6 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Uma pasta que é parte de múltiplos pares de pasta será modificada. Por favor, revise as configurações de sincronização.</target>
 
-<source>Left</source>
-<target>Esquerda</target>
-
-<source>Right</source>
-<target>Direita</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Sincronizando par de pastas:</target>
 
diff --git a/BUILD/Languages/romanian.lng b/BUILD/Languages/romanian.lng
index e34b40d0..e34a4b9c 100644
--- a/BUILD/Languages/romanian.lng
+++ b/BUILD/Languages/romanian.lng
@@ -115,15 +115,6 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Nu pot rezolva legătura simbolică %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
-
-<source>%x GB</source>
-<target>%x GB</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -134,6 +125,15 @@
 <pluralform>%x de Baiți</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Fila cu baza de date %x este incompatibilă.</target>
 
@@ -170,9 +170,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Aștept ca dosarul să fie zăvorît (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Creez fila %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -183,15 +180,15 @@
 <pluralform>%x de sec</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Creez fila %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Eroare la parsarea filei %x, rîndul %y, coloana %z.</target>
 
 <source>Scanning:</source>
 <target>Scanez:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Codez informațiile extinse despre timp: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -202,6 +199,9 @@
 <pluralform>[%x de Fire]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Codez informațiile extinse despre timp: %x</target>
+
 <source>/sec</source>
 <target>/sec</target>
 
@@ -795,9 +795,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>&Find next</source>
 <target>&Găsește Următorul</target>
 
-<source>Operation aborted!</source>
-<target>Operație abandonată!</target>
-
 <source>Main bar</source>
 <target>Bara Principală</target>
 
@@ -825,6 +822,36 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Compare both sides</source>
 <target>Compară Părțile Stîngă și Dreaptă</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 dosar</pluralform>
+<pluralform>%x dosare</pluralform>
+<pluralform>%x de dosare</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 filă</pluralform>
+<pluralform>%x file</pluralform>
+<pluralform>%x de file</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y din 1 rînd afișat</pluralform>
+<pluralform>%y din %x rînduri afișate</pluralform>
+<pluralform>%y din %x de rînduri afișate</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Setează Acțiunea ca în Icoana Alăturată:</target>
 
@@ -939,6 +966,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Set as default</source>
 <target>Setează ca implicit</target>
 
+<source>Operation aborted!</source>
+<target>Operație abandonată!</target>
+
 <source>All folders are in sync!</source>
 <target>Toate dosarele sînt sincronizate!</target>
 
@@ -954,36 +984,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Searching for program updates...</source>
 <target>Caut actualizări ale programului...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 dosar</pluralform>
-<pluralform>%x dosare</pluralform>
-<pluralform>%x de dosare</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 filă</pluralform>
-<pluralform>%x file</pluralform>
-<pluralform>%x de file</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x din 1 rînduri afișate</pluralform>
-<pluralform>%x din %y rînduri afișate</pluralform>
-<pluralform>%x din %y de rînduri afișate</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ignoră erorile ulterioare</target>
 
@@ -1065,6 +1065,26 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Filter</source>
 <target>Filtru</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Sigur vrei să muți în Reciclator elementul următor?</pluralform>
+<pluralform>Sigur vrei să muți în Reciclator următoarele %x elemente?</pluralform>
+<pluralform>Sigur vrei să muți în Reciclator următoarele %x de elemente?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Sigur vrei să ștergi definitiv elementul următor?</pluralform>
+<pluralform>Sigur vrei să ștergi definitiv următoarele %x elemente?</pluralform>
+<pluralform>Sigur vrei să ștergi definitiv următoarele %x de elemente?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Direcționează</target>
 
@@ -1092,26 +1112,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Vrei ca dialogurile ascunse și mesajele de avertizare să fie vizibile din nou?</target>
 
-<source>
-<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>
-<pluralform>Sigur vrei să muți în Reciclator următoarele %x elemente?</pluralform>
-<pluralform>Sigur vrei să muți în Reciclator următoarele %x de elemente?</pluralform>
-</target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<pluralform>Sigur vrei să ștergi definitiv elementul următor?</pluralform>
-<pluralform>Sigur vrei să ștergi definitiv următoarele %x elemente?</pluralform>
-<pluralform>Sigur vrei să ștergi definitiv următoarele %x de elemente?</pluralform>
-</target>
-
 <source>Leave as unresolved conflict</source>
 <target>Lasă ca Conflict Nerezolvat</target>
 
@@ -1139,6 +1139,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Files</source>
 <target>File</target>
 
+<source>Items</source>
+<target>Elemente</target>
+
 <source>Percentage</source>
 <target>Procent</target>
 
@@ -1208,9 +1211,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1290,7 +1290,7 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <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 de acolo vor fi deci șterse definitiv:</target>
+<target>Reciclatorul nu este disponibil pentru căile următoare! Filele de acolo care trebuie șterse ca urmare a sincronizării, vor fi deci șterse definitiv:</target>
 
 <source>The corresponding folder will be considered as empty.</source>
 <target>Dosarul corespondent va fi considerat ca fiind gol.</target>
@@ -1298,8 +1298,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <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>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>Poți ignora această eroare dacă vrei ca ambele dosare să fie considerate goale. Dosarele vor fi apoi create automat în timpul sincronizării.</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>
@@ -1439,12 +1439,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Va fi modificat un dosar care face parte din mai multe perechi de dosare! Reverifică setările de sincronizare!</target>
 
-<source>Left</source>
-<target>Stînga</target>
-
-<source>Right</source>
-<target>Dreapta</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Sincronizez perechea de dosare:</target>
 
diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng
index 2837a169..8a9ef592 100644
--- a/BUILD/Languages/russian.lng
+++ b/BUILD/Languages/russian.lng
@@ -20,13 +20,13 @@
 <target>Общее время:</target>
 
 <source>Cannot set directory lock for %x.</source>
-<target></target>
+<target>Невозможно установить блокировку папки для %x.</target>
 
 <source>Show in Explorer</source>
 <target>Показать в Проводнике</target>
 
 <source>Open with default application</source>
-<target>Открыть с помощью приложения по-умолчанию</target>
+<target>Открыть с помощью приложения по умолчанию</target>
 
 <source>Browse directory</source>
 <target>Обзор папок</target>
@@ -44,7 +44,7 @@
 <target>Ошибка</target>
 
 <source>Selected variant:</source>
-<target></target>
+<target>Выбранный вариант:</target>
 
 <source>Select alternate comparison settings</source>
 <target>Выбрать альтернативные настройки сравнения</target>
@@ -68,7 +68,7 @@
 <target>Копировать</target>
 
 <source>Paste</source>
-<target></target>
+<target>Вставить</target>
 
 <source>Save as batch job</source>
 <target>Сохранить как пакетное задание</target>
@@ -110,19 +110,10 @@
 <target>Критическая ошибка</target>
 
 <source>Error Code %x:</source>
-<target></target>
+<target>Код ошибки %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
-<target>Не удается разрешить символическую ссылку %x.</target>
-
-<source>%x MB</source>
-<target>%x МБ</target>
-
-<source>%x KB</source>
-<target>%x КБ</target>
-
-<source>%x GB</source>
-<target>%x ГБ</target>
+<target>Невозможно разрешить символьную ссылку %x.</target>
 
 <source>
 <pluralform>1 Byte</pluralform>
@@ -134,6 +125,15 @@
 <pluralform>%x Байт</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x МБ</target>
+
+<source>%x KB</source>
+<target>%x КБ</target>
+
+<source>%x GB</source>
+<target>%x ГБ</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Файл базы данных %x несовместим.</target>
 
@@ -150,10 +150,10 @@
 <target>Недостаточно памяти!</target>
 
 <source>Cannot write file %x.</source>
-<target>Не удается записать файл %x.</target>
+<target>Невозможно записать файл %x.</target>
 
 <source>Cannot read file %x.</source>
-<target>Не удается прочитать файл %x.</target>
+<target>Невозможно прочитать файл %x.</target>
 
 <source>Database files do not share a common session.</source>
 <target>Файлы баз данных не имеют общей сессии.</target>
@@ -162,17 +162,14 @@
 <target>Исключение произошло!</target>
 
 <source>Cannot read file attributes of %x.</source>
-<target>Не удается прочитать атрибуты файла %x.</target>
+<target>Невозможно прочитать атрибуты файла %x.</target>
 
 <source>Cannot get process information.</source>
-<target>Не удается получить информацию о процессе.</target>
+<target>Невозможно получить информацию о процессе.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Ожидание снятия блокировки с папки %x...</target>
 
-<source>Creating file %x</source>
-<target>Создание файла %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -183,15 +180,15 @@
 <pluralform>%x секунд</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Создание файла %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Ошибка при разборе файла %x, строка %y, колонка %z.</target>
 
 <source>Scanning:</source>
 <target>Сканирую:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Кодирование расширенной информации о времени: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -202,6 +199,9 @@
 <pluralform>[%x потоков]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Кодирование расширенной информации о времени: %x</target>
+
 <source>/sec</source>
 <target>/с</target>
 
@@ -212,13 +212,13 @@
 <target>Файл конфигурации %x загрузился частично.</target>
 
 <source>Cannot access Volume Shadow Copy Service.</source>
-<target>Не удается получить доступ к службе Теневого Копирования Тома.</target>
+<target>Невозможно получить доступ к службе Теневого Копирования Тома.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
 <target>Пожалуйста, используйте 64-разрядную версию FreeFileSync для создания теневых копий на этой системе.</target>
 
 <source>Cannot load file %x.</source>
-<target>Не удается загрузить файл %x.</target>
+<target>Невозможно загрузить файл %x.</target>
 
 <source>Path %x does not contain a volume name.</source>
 <target>Путь %x не содержит имя тома.</target>
@@ -230,7 +230,7 @@
 <target>Невозможно прочитать следующие XML элементы:</target>
 
 <source>Cannot find file %x.</source>
-<target>Не удается найти файл %x.</target>
+<target>Невозможно найти файл %x.</target>
 
 <source>&Open...</source>
 <target>&Открыть...</target>
@@ -466,13 +466,13 @@ The command is triggered if:
 <target>&Дополнительно</target>
 
 <source>&Check now</source>
-<target></target>
+<target>&Проверить сейчас</target>
 
 <source>Check &automatically once a week</source>
-<target></target>
+<target>Проверять &автоматически раз в неделю</target>
 
 <source>Check for new version</source>
-<target></target>
+<target>Проверка обновлений</target>
 
 <source>Compare</source>
 <target>Сравнить</target>
@@ -526,7 +526,7 @@ The command is triggered if:
 <target>По завершению</target>
 
 <source>Close</source>
-<target></target>
+<target>Закрыть</target>
 
 <source>&Pause</source>
 <target>&Пауза</target>
@@ -614,13 +614,13 @@ is the same
 <target><= В обе стороны =></target>
 
 <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
-<target></target>
+<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>
@@ -653,10 +653,10 @@ is the same
 <target>Архивировать</target>
 
 <source>Move files to user-defined folder</source>
-<target></target>
+<target>Переместить файлы в пользовательскую папку</target>
 
 <source>Naming convention:</source>
-<target>Условие:</target>
+<target>Условие переименования:</target>
 
 <source>Item exists on left side only</source>
 <target>Элемент существует только на левой стороне</target>
@@ -674,7 +674,7 @@ is the same
 <target>Элемент имеют различное содержание</target>
 
 <source>Conflict/item cannot be categorized</source>
-<target>Конфликт/элемент не могут быть отнесены к какой-либо категории</target>
+<target>Конфликт/элемент невозможно отнести к какой-либо категории</target>
 
 <source>Source code written in C++ using:</source>
 <target>Исходный код написан на C++ с использованием:</target>
@@ -737,7 +737,7 @@ Note: File names must be relative to base directories!
 <target>максимум</target>
 
 <source>&Clear</source>
-<target></target>
+<target>&Очистить</target>
 
 <source>Fail-safe file copy</source>
 <target>Отказоустойчивое копирование файла</target>
@@ -767,7 +767,7 @@ Note: File names must be relative to base directories!
 <target>Описание</target>
 
 <source>&Default</source>
-<target>&По-умолчанию</target>
+<target>&По умолчанию</target>
 
 <source>Start synchronization</source>
 <target>Начать синхронизацию</target>
@@ -790,9 +790,6 @@ Note: File names must be relative to base directories!
 <source>&Find next</source>
 <target>&Найти далее</target>
 
-<source>Operation aborted!</source>
-<target>Операция отменена!</target>
-
 <source>Main bar</source>
 <target>Главная панель</target>
 
@@ -812,7 +809,7 @@ Note: File names must be relative to base directories!
 <target>Вид списка файлов</target>
 
 <source>Open...</source>
-<target></target>
+<target>Открыть...</target>
 
 <source>Save</source>
 <target>Сохранить</target>
@@ -820,6 +817,36 @@ Note: File names must be relative to base directories!
 <source>Compare both sides</source>
 <target>Сравнить обе стороны</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x папка</pluralform>
+<pluralform>%x папки</pluralform>
+<pluralform>%x папок</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x файл</pluralform>
+<pluralform>%x файла</pluralform>
+<pluralform>%x файлов</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y из %x строки показано</pluralform>
+<pluralform>%y из %x строк показано</pluralform>
+<pluralform>%y из %x строк показано</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Выберите направление:</target>
 
@@ -932,7 +959,10 @@ Note: File names must be relative to base directories!
 <target>Показать файлы, которые не будут скопированы</target>
 
 <source>Set as default</source>
-<target></target>
+<target>Установить по умолчанию</target>
+
+<source>Operation aborted!</source>
+<target>Операция отменена!</target>
 
 <source>All folders are in sync!</source>
 <target>Все папки синхронизированы!</target>
@@ -947,37 +977,7 @@ Note: File names must be relative to base directories!
 <target>Список файлов экспортирован!</target>
 
 <source>Searching for program updates...</source>
-<target></target>
-
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x папка</pluralform>
-<pluralform>%x папки</pluralform>
-<pluralform>%x папок</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x файл</pluralform>
-<pluralform>%x файла</pluralform>
-<pluralform>%x файлов</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x из %y строки показано</pluralform>
-<pluralform>%x из %y строк показано</pluralform>
-<pluralform>%x из %y строк показано</pluralform>
-</target>
+<target>Проверка обновлений программы...</target>
 
 <source>Ignore further errors</source>
 <target>Игнорировать последующие ошибки</target>
@@ -986,7 +986,7 @@ Note: File names must be relative to base directories!
 <target>&Игнорировать</target>
 
 <source>Don't show this warning again</source>
-<target></target>
+<target>Больше не показывать это предупреждение</target>
 
 <source>&Switch</source>
 <target>&Переключить</target>
@@ -1040,13 +1040,13 @@ Note: File names must be relative to base directories!
 <target>на этой неделе</target>
 
 <source>This month</source>
-<target>в этом месяце</target>
+<target>последний месяц</target>
 
 <source>This year</source>
-<target>в этом году</target>
+<target>последний год</target>
 
 <source>Last x days</source>
-<target>последние х дня(ей)</target>
+<target>последние X дня(ей)</target>
 
 <source>Byte</source>
 <target>Байт</target>
@@ -1060,6 +1060,26 @@ Note: File names must be relative to base directories!
 <source>Filter</source>
 <target>Фильтр</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Вы точно хотите переместить следующий %x элемент в "Корзину"?</pluralform>
+<pluralform>Вы точно хотите переместить следующие %x элемента в "Корзину"?</pluralform>
+<pluralform>Вы точно хотите переместить следующие %x элементов в "Корзину"?</pluralform>
+</target>
+
+<source>
+<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>
+
 <source>Direct</source>
 <target>Прямое</target>
 
@@ -1090,29 +1110,17 @@ Note: File names must be relative to base directories!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Сделать скрытые предупреждения и диалоги видимыми снова?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target></target>
-
 <source>Leave as unresolved conflict</source>
 <target>Оставить как нерешенный конфликт</target>
 
 <source>Time stamp</source>
-<target></target>
+<target>Добавить отметку времени</target>
 
 <source>Append a timestamp to each file name</source>
 <target>Добавить отметку времени для каждого имени файла</target>
 
 <source>Replace</source>
-<target>Переместить</target>
+<target>Без переименования</target>
 
 <source>Move files and replace if existing</source>
 <target>Переместить файлы и заменить, если существуют</target>
@@ -1129,56 +1137,59 @@ Note: File names must be relative to base directories!
 <source>Files</source>
 <target>Файлы</target>
 
+<source>Items</source>
+<target>Элементы</target>
+
 <source>Percentage</source>
 <target>Проценты</target>
 
 <source>Cannot monitor directory %x.</source>
-<target>Не удается наблюдать папку %x.</target>
+<target>Невозможно наблюдать папку %x.</target>
 
 <source>Conversion error:</source>
 <target>Ошибка преобразования:</target>
 
 <source>Cannot delete file %x.</source>
-<target>Не удается удалить файл %x.</target>
+<target>Невозможно удалить файл %x.</target>
 
 <source>The file is locked by another process:</source>
 <target>Файл заблокирован другим процессом:</target>
 
 <source>Cannot move file %x to %y.</source>
-<target>Не удается перенести файл %x в %y.</target>
+<target>Невозможно перенести файл %x в %y.</target>
 
 <source>Cannot delete directory %x.</source>
-<target>Не удается удалить папку %x.</target>
+<target>Невозможно удалить папку %x.</target>
 
 <source>Cannot write file attributes of %x.</source>
-<target>Не удается записать атрибуты файла %x.</target>
+<target>Невозможно записать атрибуты файла %x.</target>
 
 <source>Cannot write modification time of %x.</source>
-<target>Не удается записать время модификации файла %x.</target>
+<target>Невозможно записать время модификации файла %x.</target>
 
 <source>Cannot find system function %x.</source>
-<target>Не удается найти системную функцию %x.</target>
+<target>Невозможно найти системную функцию %x.</target>
 
 <source>Cannot read security context of %x.</source>
-<target>Не удается прочитать контекст безобасности %x.</target>
+<target>Невозможно прочитать контекст безобасности %x.</target>
 
 <source>Cannot write security context of %x.</source>
-<target>Не удается записать контекст безобасности %x.</target>
+<target>Невозможно записать контекст безобасности %x.</target>
 
 <source>Cannot read permissions of %x.</source>
-<target>Не удается прочитать права доступа %x.</target>
+<target>Невозможно прочитать права доступа %x.</target>
 
 <source>Cannot write permissions of %x.</source>
-<target>Не удается записать права доступа %x.</target>
+<target>Невозможно записать права доступа %x.</target>
 
 <source>Cannot create directory %x.</source>
-<target>Не удается создать папку %x.</target>
+<target>Невозможно создать папку %x.</target>
 
 <source>Cannot copy symbolic link %x to %y.</source>
-<target>Не удается скопировать символьную ссылку %x в %y.</target>
+<target>Невозможно скопировать символьную ссылку %x в %y.</target>
 
 <source>Cannot copy file %x to %y.</source>
-<target>Не удается скопировать файл %x в %y.</target>
+<target>Невозможно скопировать файл %x в %y.</target>
 
 <source>Type of item %x is not supported:</source>
 <target>Тип элемента %x не поддерживается:</target>
@@ -1198,9 +1209,6 @@ Note: File names must be relative to base directories!
 <source>%x PB</source>
 <target>%x ПБ</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1232,13 +1240,13 @@ Note: File names must be relative to base directories!
 </target>
 
 <source>Cannot set privilege %x.</source>
-<target>Не удается установить привелегии %x.</target>
+<target>Невозможно установить привелегии %x.</target>
 
 <source>Failed to suspend system sleep mode.</source>
-<target></target>
+<target>Не удалось приостановить режим сна системы.</target>
 
 <source>Cannot change process I/O priorities.</source>
-<target></target>
+<target>Невозможно изменить приоритет процесса.</target>
 
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Невозможно переместить %x в "Корзину"!</target>
@@ -1262,7 +1270,7 @@ 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>
@@ -1286,13 +1294,13 @@ Note: File names must be relative to base directories!
 <target>Для этого пути "Корзина" не доступна! Файлы будут удалены безвозвратно:</target>
 
 <source>The corresponding folder will be considered as empty.</source>
-<target></target>
+<target>Соответствующая папка будет считаться пустой.</target>
 
 <source>Cannot find the following folders:</source>
-<target></target>
+<target>Невозможно найти следующие папки:</target>
 
-<source>You can ignore this error to consider each folder as empty.</source>
-<target></target>
+<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>Вы можете проигнорировать эту ошибку, приняв каждую папку за пустую. При этом папки будут созданы автоматически во время синхронизации.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Зависимые папки! Будьте внимательны при настройке правил синхронизации:</target>
@@ -1301,7 +1309,7 @@ Note: File names must be relative to base directories!
 <target>Начать сравнение</target>
 
 <source>Calculating sync directions...</source>
-<target></target>
+<target>Расчет направлений синхронизации...</target>
 
 <source>Conflict detected:</source>
 <target>Обнаружен конфликт:</target>
@@ -1397,7 +1405,7 @@ Note: File names must be relative to base directories!
 <target>Обновление атрибутов %x</target>
 
 <source>Cannot find %x.</source>
-<target></target>
+<target>Невозможно найти %x.</target>
 
 <source>Target folder %x already existing.</source>
 <target>Целевая папка %x уже существует.</target>
@@ -1432,12 +1440,6 @@ Note: File names must be relative to base directories!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Папка, входящая в несколько пар папок, будет изменена. Пожалуйста, проверьте настройки синхронизации.</target>
 
-<source>Left</source>
-<target>Слева</target>
-
-<source>Right</source>
-<target>Справа</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Синхронизация пары папок:</target>
 
@@ -1445,7 +1447,7 @@ Note: File names must be relative to base directories!
 <target>Создание базы данных...</target>
 
 <source>Creating Volume Shadow Copy for %x...</source>
-<target></target>
+<target>Создание Тома Теневого Копирования для %x...</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 0bfe3b64..3a0e3064 100644
--- a/BUILD/Languages/scottish_gaelic.lng
+++ b/BUILD/Languages/scottish_gaelic.lng
@@ -115,15 +115,6 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Cha ghabh an symbolic link %x fhuasgladh.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
-
-<source>%x GB</source>
-<target>%x GB</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -135,6 +126,15 @@
 <pluralform>%x baidht</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Chan eil am faidhle stòir-dhàta %x co-chòrdail.</target>
 
@@ -171,9 +171,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>A' feitheamh fhad 's a tha am pasgan glaiste (%x)...</target>
 
-<source>Creating file %x</source>
-<target>A' cruthachadh an fhaidhle %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -185,15 +182,15 @@
 <pluralform>%x diog</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>A' cruthachadh an fhaidhle %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Mearachd le parsadh an fhaidhle %x, loidhne %y, colbh %z.</target>
 
 <source>Scanning:</source>
 <target>'Ga sganadh:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>A' còdachadh fiosrachadh leudaichte an ama: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -205,6 +202,9 @@
 <pluralform>[%x snàithlean]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>A' còdachadh fiosrachadh leudaichte an ama: %x</target>
+
 <source>/sec</source>
 <target>/diog</target>
 
@@ -417,12 +417,12 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Date:</source>
 <target>Ceann-là:</target>
 
-<source>Action</source>
-<target>Gnìomh</target>
-
 <source>Category</source>
 <target>Roinn seòrsa</target>
 
+<source>Action</source>
+<target>Gnìomh</target>
+
 <source>Drag && drop</source>
 <target>Slaod ┐ leig às</target>
 
@@ -797,9 +797,6 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>&Find next</source>
 <target>&Lorg an ath-fhear</target>
 
-<source>Operation aborted!</source>
-<target>Sguireadh dhen ghnìomh!</target>
-
 <source>Main bar</source>
 <target>Am prìomh-bhàr</target>
 
@@ -827,6 +824,39 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Compare both sides</source>
 <target>Dèan coimeas air an dà thaobh</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x phasgan</pluralform>
+<pluralform>%x phasgan</pluralform>
+<pluralform>%x pasgain</pluralform>
+<pluralform>%x pasgan</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x fhaidhle</pluralform>
+<pluralform>%x fhaidhle</pluralform>
+<pluralform>%x faidhlichean</pluralform>
+<pluralform>%x faidhle</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y de %x ràgh san t-sealladh</pluralform>
+<pluralform>%y de %x ràgh san t-sealladh</pluralform>
+<pluralform>%y de %x ràghan san t-sealladh</pluralform>
+<pluralform>%y de %x ràgh san t-sealladh</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Suidhich a' chomhair:</target>
 
@@ -941,6 +971,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Set as default</source>
 <target>Suidhich mar a' bhun-roghainn</target>
 
+<source>Operation aborted!</source>
+<target>Sguireadh dhen ghnìomh!</target>
+
 <source>All folders are in sync!</source>
 <target>Tha gach pasgan air a shioncronachadh!</target>
 
@@ -956,39 +989,6 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Searching for program updates...</source>
 <target>A' lorg ùrachaidhean a' phrògraim...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x phasgan</pluralform>
-<pluralform>%x phasgan</pluralform>
-<pluralform>%x pasgain</pluralform>
-<pluralform>%x pasgan</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x fhaidhle</pluralform>
-<pluralform>%x fhaidhle</pluralform>
-<pluralform>%x faidhlichean</pluralform>
-<pluralform>%x faidhle</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>A' sealltainn %x ràgh</pluralform>
-<pluralform>A' sealltainn %x à %y ràgh</pluralform>
-<pluralform>A' sealltainn %x à %y ràghan</pluralform>
-<pluralform>A' sealltainn %x à %y ràgh</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Leig seachad mearachd sam bith eile</target>
 
@@ -1070,6 +1070,28 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Filter</source>
 <target>Criathrag</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an %x nì seo a ghluasad dhan bhiona?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson na %x nì seo a ghluasad dhan bhiona?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson na %x nithean seo a ghluasad dhan bhiona?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson na %x nì seo a ghluasad dhan bhiona?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>A bheil thu cinnteach gu bheil thu airson an %x nì seo a sguabadh às?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson na %x nì seo a sguabadh às?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson na %x nithean seo a sguabadh às?</pluralform>
+<pluralform>A bheil thu cinnteach gu bheil thu airson na %x nì seo a sguabadh às?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Dìreach</target>
 
@@ -1097,43 +1119,21 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>A bheil thus airson na rabhaidhean 's còmraidhean falaichte fhaicinn a-rithist?</target>
 
-<source>
-<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 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 item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<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>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>Folder</source>
 <target>Pasgan</target>
 
@@ -1146,6 +1146,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>Files</source>
 <target>Faidhlichean</target>
 
+<source>Items</source>
+<target>Nithean</target>
+
 <source>Percentage</source>
 <target>Ceudad</target>
 
@@ -1215,9 +1218,6 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1308,8 +1308,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <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>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>'S urrainn dhut a' mhearachd seo a leigeil seachad ma tha thu airson 's gun dèilig sinn ri gach pasgan mar gum biodh iad falamh. Thèid na pasgain a chruthachadh gu fèin-obrachail an uairsin rè an t-sioncronachaidh</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>
@@ -1449,12 +1449,6 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Thèid pasgan atharrachadh a tha 'na phàirt de dh'iomadh paidhir de phasgain. Nach doir thu sùil air roghainnean an t-sioncronachaidh?</target>
 
-<source>Left</source>
-<target>Clì</target>
-
-<source>Right</source>
-<target>Deas</target>
-
 <source>Synchronizing folder pair:</source>
 <target>A' sioncronachadh paidhir nam pasgan:</target>
 
diff --git a/BUILD/Languages/serbian.lng b/BUILD/Languages/serbian.lng
new file mode 100644
index 00000000..a3fe8a9a
--- /dev/null
+++ b/BUILD/Languages/serbian.lng
@@ -0,0 +1,1450 @@
+<header>
+	<language name>Cрпски</language name>
+	<translator>Балкански Шпијун</translator>
+	<locale>sr_RS</locale>
+	<flag file>serbia.png</flag file>
+	<plural forms>3</plural forms>
+	<plural definition>n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2</plural definition>
+</header>
+
+<source>Searching for folder %x...</source>
+<target>Тражим фолдер %x...</target>
+
+<source>Items processed:</source>
+<target>Обрађени елементи:</target>
+
+<source>Items remaining:</source>
+<target>Преостали елементи:</target>
+
+<source>Total time:</source>
+<target>Укупно време:</target>
+
+<source>Cannot set directory lock for %x.</source>
+<target>Не могу закључати фолдер %x.</target>
+
+<source>Show in Explorer</source>
+<target>Прикажи у Експлореру</target>
+
+<source>Open with default application</source>
+<target>Отвори са подразумеваном апликацијом</target>
+
+<source>Browse directory</source>
+<target>Одабери фолдер</target>
+
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Прекид захтеван: Чека се да се тренутна акција заврши...</target>
+
+<source>Failure to create timestamp for versioning:</source>
+<target>Неуспело стварање временске ознаке за верзију:</target>
+
+<source>RealtimeSync - Automated Synchronization</source>
+<target>RealtimeSync - Аутоматска Синхронизација</target>
+
+<source>Error</source>
+<target>Грешка</target>
+
+<source>Selected variant:</source>
+<target>Одабрани начин:</target>
+
+<source>Select alternate comparison settings</source>
+<target>Изаберите алтернативна подешавања упоређивања</target>
+
+<source>Select alternate synchronization settings</source>
+<target>Изаберите алтернативна подешавања синхронизације</target>
+
+<source>Filter is active</source>
+<target>Филтер је активан</target>
+
+<source>No filter selected</source>
+<target>Ниједан филтер није одабран</target>
+
+<source>Remove alternate settings</source>
+<target>Уклони алтернативна подешавања</target>
+
+<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>
+
+<source>Comparison settings</source>
+<target>Подешавања упоређивања</target>
+
+<source>Synchronization settings</source>
+<target>Подешавања синхронизације</target>
+
+<source>About</source>
+<target>О програму</target>
+
+<source>Confirm</source>
+<target>Потврди</target>
+
+<source>Configure filter</source>
+<target>Конфигуриши филтер</target>
+
+<source>Global settings</source>
+<target>Глобална подешавања</target>
+
+<source>Find</source>
+<target>Пронађи</target>
+
+<source>Select time span</source>
+<target>Изаберите временски распон</target>
+
+<source>Invalid command line:</source>
+<target>Нетачна командна линија:</target>
+
+<source>Info</source>
+<target>Инфо</target>
+
+<source>Warning</source>
+<target>Упозорење</target>
+
+<source>Fatal Error</source>
+<target>Критична грешка</target>
+
+<source>Error Code %x:</source>
+<target>Грешка број %x:</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Не могу разрешити симболичну везу %x.</target>
+
+<source>Cannot determine final path for %x.</source>
+<target></target>
+
+<source>Cannot find system function %x.</source>
+<target>Не могу пронаћи системску функцију %x.</target>
+
+<source>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
+</source>
+<target>
+<pluralform>%x Бајт</pluralform>
+<pluralform>%x Бајта</pluralform>
+<pluralform>%x Бајтова</pluralform>
+</target>
+
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
+<source>Database file %x is incompatible.</source>
+<target>Датотека базе %x је некомпатибилна.</target>
+
+<source>Initial synchronization:</source>
+<target>Почетна синхронизација:</target>
+
+<source>Database file %x does not yet exist.</source>
+<target>Датотека базе %x још не постоји.</target>
+
+<source>Database file is corrupt:</source>
+<target>Датотека базе је оштећена:</target>
+
+<source>Out of memory!</source>
+<target>Недостатак меморије!</target>
+
+<source>Cannot write file %x.</source>
+<target>Не могу уписати датотеку %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Не могу читати датотеку %x.</target>
+
+<source>Database files do not share a common session.</source>
+<target>Датотеке базе не деле заједничку сесију.</target>
+
+<source>An exception occurred!</source>
+<target>Догодило се изузеће!</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Не могу прочитати атрибуте од %x.</target>
+
+<source>Cannot get process information.</source>
+<target>Не могу добити информације о процесу.</target>
+
+<source>Waiting while directory is locked (%x)...</source>
+<target>Чека се док се фолдер не закључа (%x)...</target>
+
+<source>
+<pluralform>1 sec</pluralform>
+<pluralform>%x sec</pluralform>
+</source>
+<target>
+<pluralform>%x сек</pluralform>
+<pluralform>%x сек</pluralform>
+<pluralform>%x сек</pluralform>
+</target>
+
+<source>Creating file %x</source>
+<target>Правим датотеку %x</target>
+
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Грешка у анализи датотеке %x, ред %y, колона %z.</target>
+
+<source>Scanning:</source>
+<target>Претражујем:</target>
+
+<source>
+<pluralform>[1 Thread]</pluralform>
+<pluralform>[%x Threads]</pluralform>
+</source>
+<target>
+<pluralform>[%x Нит]</pluralform>
+<pluralform>[%x Нити]</pluralform>
+<pluralform>[%x Нити]</pluralform>
+</target>
+
+<source>Encoding extended time information: %x</source>
+<target>Кодирам проширене информације о времену: %x</target>
+
+<source>/sec</source>
+<target>/сек</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>Датотека %x не садржи валидну конфигурацију.</target>
+
+<source>Configuration file %x loaded partially only.</source>
+<target>Датотека подешавања %x учитана само делимично.</target>
+
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Не могу приступити Volume Shadow Copy Сервису.</target>
+
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Молимо користите FreeFileSync 64-битну верзију за израду shadow копија на овом систему.</target>
+
+<source>Cannot load file %x.</source>
+<target>Не могу учитати датотеку %x.</target>
+
+<source>Path %x does not contain a volume name.</source>
+<target>Путања %x не садржи назив партиције.</target>
+
+<source>Volume name %x not part of file name %y!</source>
+<target>Назив партиције %x није део имена датотеке %y!</target>
+
+<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>
+
+<source>Save &as...</source>
+<target>Сачувај &као...</target>
+
+<source>&Quit</source>
+<target>&Излаз</target>
+
+<source>&Program</source>
+<target>&Програм</target>
+
+<source>&Content</source>
+<target>&Садржај</target>
+
+<source>&About</source>
+<target>&О програму</target>
+
+<source>&Help</source>
+<target>&Помоћ</target>
+
+<source>Usage:</source>
+<target>Употреба:</target>
+
+<source>1. Select folders to watch.</source>
+<target>1. Одаберите фолдере за надгледање.</target>
+
+<source>2. Enter a command line.</source>
+<target>2. Унесите командну линију.</target>
+
+<source>3. Press 'Start'.</source>
+<target>3. Притисните 'Старт'.</target>
+
+<source>To get started just import a .ffs_batch file.</source>
+<target>Да би почели увезите .ffs_batch датотеку.</target>
+
+<source>Folders to watch</source>
+<target>Фолдери за надгледање</target>
+
+<source>Add folder</source>
+<target>Додај фолдер</target>
+
+<source>Remove folder</source>
+<target>Уклони фолдер</target>
+
+<source>Browse</source>
+<target>Одабери</target>
+
+<source>Select a folder</source>
+<target>Одаберите фолдер</target>
+
+<source>Idle time [seconds]</source>
+<target>Време мировања [секунди]</target>
+
+<source>Idle time between last detected change and execution of command</source>
+<target>Време мировања између задње препознате промене и извршења наредбе</target>
+
+<source>Command line</source>
+<target>Командна линија</target>
+
+<source>
+The command is triggered if:
+- files or subfolders change
+- new folders arrive (e.g. USB stick insert)
+</source>
+<target>
+Наредба ће бити покренута ако се:
+- датотеке или подфолдери промене
+- нови фолдери појаве (нпр. укључење USB стика)
+</target>
+
+<source>Start</source>
+<target>Старт</target>
+
+<source>&Retry</source>
+<target>&Понови</target>
+
+<source>Cancel</source>
+<target>Одустани</target>
+
+<source>Build: %x</source>
+<target>Подверзија: %x</target>
+
+<source>All files</source>
+<target>Све датотеке</target>
+
+<source>&Restore</source>
+<target>&Врати</target>
+
+<source>&Exit</source>
+<target>&Излаз</target>
+
+<source>Monitoring active...</source>
+<target>Надгледање активно...</target>
+
+<source>Waiting for missing directories...</source>
+<target>Чека се недостајући фолдери...</target>
+
+<source>A folder input field is empty.</source>
+<target>Поље за одабир фолдера је празно.</target>
+
+<source>Synchronization aborted!</source>
+<target>Синхронизација прекинута!</target>
+
+<source>Synchronization completed with errors!</source>
+<target>Синхронизација завршена с грешкама!</target>
+
+<source>Synchronization completed with warnings.</source>
+<target>Синхронизација завршена с упозорењима.</target>
+
+<source>Nothing to synchronize!</source>
+<target>Нема ничега за синхронизацију!</target>
+
+<source>Synchronization completed successfully.</source>
+<target>Синхронизација успешно завршена.</target>
+
+<source>Saving log file %x...</source>
+<target>Уписујем лог датотеку %x...</target>
+
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Притисни "Замени" за решавање проблема у FreeFileSync главном оквиру дијалога.</target>
+
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Пребацујем у FreeFileSync главни оквир дијалога...</target>
+
+<source>A new version of FreeFileSync is available:</source>
+<target>Нова верзија FreeFileSync је доступна:</target>
+
+<source>Download now?</source>
+<target>Преузети сада?</target>
+
+<source>FreeFileSync is up to date!</source>
+<target>FreeFileSync је ажуриран!</target>
+
+<source>Information</source>
+<target>Информација</target>
+
+<source>Unable to connect to sourceforge.net!</source>
+<target>Не могу се повезати на sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Тренутна FreeFileSync верзија није пронађена online! Да ли желите да проверите ручно?</target>
+
+<source>Do you want FreeFileSync to automatically check for updates every week?</source>
+<target>Да ли желите да FreeFileSync аутоматски провери апдејт сваке недеље?</target>
+
+<source>(Requires an Internet connection!)</source>
+<target>(Потребна интернет конекција!)</target>
+
+<source><Symlink></source>
+<target><Сим-веза></target>
+
+<source><Folder></source>
+<target><Фолдер></target>
+
+<source>Full path</source>
+<target>Пуна путања</target>
+
+<source>Name</source>
+<target>Име</target>
+
+<source>Relative path</source>
+<target>Релативна путања</target>
+
+<source>Base folder</source>
+<target>Основни фолдер</target>
+
+<source>Size</source>
+<target>Величина</target>
+
+<source>Date</source>
+<target>Датум</target>
+
+<source>Extension</source>
+<target>Екстензија</target>
+
+<source>Size:</source>
+<target>Величина:</target>
+
+<source>Date:</source>
+<target>Датум:</target>
+
+<source>Category</source>
+<target>Категорија</target>
+
+<source>Action</source>
+<target>Акција</target>
+
+<source>Drag && drop</source>
+<target>Вуци && пусти</target>
+
+<source>Close progress dialog</source>
+<target>Затвори дијалог прогреса</target>
+
+<source>Standby</source>
+<target>Пређи у стање приправности</target>
+
+<source>Log off</source>
+<target>Одјави се</target>
+
+<source>Shut down</source>
+<target>Искључи рачунар</target>
+
+<source>Hibernate</source>
+<target>Хибернација</target>
+
+<source>&New</source>
+<target>&Ново</target>
+
+<source>&Save</source>
+<target>&Сачувај</target>
+
+<source>Save as &batch job...</source>
+<target>Сачувај као &беч задатак...</target>
+
+<source>1. &Compare</source>
+<target>1. &Упореди</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Синхронизуј</target>
+
+<source>&Language</source>
+<target>&Језик</target>
+
+<source>&Global settings...</source>
+<target>&Глобална подешавања...</target>
+
+<source>&Export file list...</source>
+<target>&Извоз листе датотека...</target>
+
+<source>&Advanced</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>
+
+<source>Synchronize</source>
+<target>Синхронизуј</target>
+
+<source>Add folder pair</source>
+<target>Додај фолдер пар</target>
+
+<source>Remove folder pair</source>
+<target>Уклони фолдер пар</target>
+
+<source>Swap sides</source>
+<target>Замени стране</target>
+
+<source>Hide excluded items</source>
+<target>Сакриј искључене ставке</target>
+
+<source>Show filtered or temporarily excluded files</source>
+<target>Прикажи филтриране или привремено искључене датотеке</target>
+
+<source>Number of files and folders that will be created</source>
+<target>Број датотека и фолдера који ће бити креирани</target>
+
+<source>Number of files that will be overwritten</source>
+<target>Број датотека које ће бити замењене у садржају</target>
+
+<source>Number of files and folders that will be deleted</source>
+<target>Број датотека и фолдера који ће бити избрисани</target>
+
+<source>Total bytes to copy</source>
+<target>Укупно бајтова за копирање</target>
+
+<source>Items found:</source>
+<target>Пронађене ставке:</target>
+
+<source>Speed:</source>
+<target>Брзина:</target>
+
+<source>Time remaining:</source>
+<target>Преостало време:</target>
+
+<source>Time elapsed:</source>
+<target>Протекло време:</target>
+
+<source>Synchronizing...</source>
+<target>Синхронизујем...</target>
+
+<source>On completion</source>
+<target>При завршетку</target>
+
+<source>Close</source>
+<target>Затвори</target>
+
+<source>&Pause</source>
+<target>&Пауза</target>
+
+<source>Batch job</source>
+<target>Беч задатак</target>
+
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Креирајте беч датотеку за аутоматску синхронизацију. Дупли клик на ову датотеку или додајте задатак у вашем таск менаџеру: FreeFileSync.exe <назив задатка>.ffs_batch</target>
+
+<source>Help</source>
+<target>Помоћ</target>
+
+<source>Error handling</source>
+<target>Грешка при обради</target>
+
+<source>Ignore</source>
+<target>Игнориши</target>
+
+<source>Hide all error and warning messages</source>
+<target>Сакриј све грешке и упозорења</target>
+
+<source>Pop-up</source>
+<target>Искачући прозор</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Прикажи искачући прозор при грешкама и упозорењима</target>
+
+<source>Exit</source>
+<target>Изађи</target>
+
+<source>Abort synchronization on first error</source>
+<target>Прекини синхронизацију при првој грешци</target>
+
+<source>Show progress dialog</source>
+<target>Прикажи дијалог прогреса</target>
+
+<source>Save log</source>
+<target>Сачувај лог</target>
+
+<source>Select folder to save log files</source>
+<target>Одабери фолдер за чување лог датотека</target>
+
+<source>Limit</source>
+<target>Ограничи</target>
+
+<source>Limit maximum number of log files</source>
+<target>Ограничи максималан број лог датотека</target>
+
+<source>Select variant</source>
+<target>Одабери варијанту</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Датотеке се сматрају једнаке ако су им
+     - време задње промене и датум
+     - величине датотека
+једнаки
+</target>
+
+<source>File time and size</source>
+<target>Време и величина датотеке</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Датотеке се сматрају једнаке ако им је
+     - садржај датотеке
+једнак
+</target>
+
+<source>File content</source>
+<target>Садржај датотеке</target>
+
+<source>Symbolic Link handling</source>
+<target>Управљање симболичним везама</target>
+
+<source>OK</source>
+<target>У реду</target>
+
+<source><- Two way -></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>
+
+<source>Update -></source>
+<target>Ажурирарно -></target>
+
+<source>Copy new or updated files to right folder.</source>
+<target>Копирај нове или ажуриране датотеке у десни фолдер.</target>
+
+<source>Custom</source>
+<target>Специфично</target>
+
+<source>Configure your own synchronization rules.</source>
+<target>Конфигуришите ваша властита синхронизациона правила.</target>
+
+<source>Deletion handling</source>
+<target>Управљање при брисању</target>
+
+<source>Permanent</source>
+<target>Трајно</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Трајно избриши или замени датотеке</target>
+
+<source>Recycle Bin</source>
+<target>Корпа за смеће</target>
+
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Користи Корпу за смеће за избрисане и замењене датотеке</target>
+
+<source>Versioning</source>
+<target>Верзионирање</target>
+
+<source>Move files to user-defined folder</source>
+<target>Премести датотеке у кориснички одабран фолдер</target>
+
+<source>Naming convention:</source>
+<target>Правило именовања:</target>
+
+<source>Item exists on left side only</source>
+<target>Ставка постоји само на левој страни</target>
+
+<source>Item exists on right side only</source>
+<target>Ставка постоји само на десној страни</target>
+
+<source>Left side is newer</source>
+<target>Лева страна је новија</target>
+
+<source>Right side is newer</source>
+<target>Десна страна је новија</target>
+
+<source>Items have different content</source>
+<target>Ставке имају различит садржај</target>
+
+<source>Conflict/item cannot be categorized</source>
+<target>Конфликт/ставка не може бити разврстана</target>
+
+<source>Source code written in C++ using:</source>
+<target>Изворни код написан у C++ уз коришћење:</target>
+
+<source>If you like FreeFileSync</source>
+<target>Ако вам се свиђа FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>Донација са PayPal-ом</target>
+
+<source>Many thanks for localization:</source>
+<target>Велике похвале за локализацију:</target>
+
+<source>Feedback and suggestions are welcome</source>
+<target>Повратне информације и предлози су добродошли</target>
+
+<source>Homepage</source>
+<target>Веб страница</target>
+
+<source>FreeFileSync at Sourceforge</source>
+<target>FreeFileSync на Sourceforge-у</target>
+
+<source>Email</source>
+<target>И-меил</target>
+
+<source>Published under the GNU General Public License</source>
+<target>Објављено под ГНУ Општом јавном лиценцом</target>
+
+<source>Delete on both sides</source>
+<target>Избриши на обе стране</target>
+
+<source>Delete on both sides even if the file is selected on one side only</source>
+<target>Избриши на обе стране чак иако је датотека селектована само на једној страни</target>
+
+<source>
+Only files that match all filter settings will be synchronized.
+Note: File names must be relative to base directories!
+</source>
+<target>
+Само датотеке које одговарају свим филтерским подешавањима биће синхронизоване.
+Напомена: Имена датотека морају бити релативна према основним фолдерима!
+</target>
+
+<source>Include</source>
+<target>Укључи</target>
+
+<source>Exclude</source>
+<target>Искључи</target>
+
+<source>Time span</source>
+<target>Временско ограничење</target>
+
+<source>File size</source>
+<target>Величина датотеке</target>
+
+<source>Minimum</source>
+<target>Минимум</target>
+
+<source>Maximum</source>
+<target>Максимум</target>
+
+<source>&Clear</source>
+<target>&Уклони</target>
+
+<source>Fail-safe file copy</source>
+<target>Копирање заштићено од грешака</target>
+
+<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
+<target>Запиши у привремену датотеку (*.ffs_tmp) прво, а онда је преименуј. Ово гарантује непромењивост чак и у случају критичне грешке.</target>
+
+<source>Copy locked files</source>
+<target>Копирај закључане датотеке</target>
+
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Копирај дељене или закључане датотеке користећи Volume Shadow Copy Сервис (Потребна администраторска права)</target>
+
+<source>Copy file access permissions</source>
+<target>Копирај овлашћења приступа датотекама</target>
+
+<source>Transfer file and folder permissions (Requires Administrator rights)</source>
+<target>Премести овлашћења приступа датотека (Потребна администраторска права)</target>
+
+<source>Restore hidden dialogs</source>
+<target>Прикажи скривене диалоге</target>
+
+<source>External applications</source>
+<target>Спољне апликације</target>
+
+<source>Description</source>
+<target>Опис</target>
+
+<source>&Default</source>
+<target>&Подразумевано</target>
+
+<source>Start synchronization</source>
+<target>Почни синхронизацију</target>
+
+<source>Variant</source>
+<target>Варијанта</target>
+
+<source>Statistics</source>
+<target>Статистика</target>
+
+<source>Don't show this dialog again</source>
+<target>Не приказуј овај диалог поновно</target>
+
+<source>Find what:</source>
+<target>Нађи шта:</target>
+
+<source>Match case</source>
+<target>По величини слова</target>
+
+<source>&Find next</source>
+<target>&Нађи следеће</target>
+
+<source>Folder pairs</source>
+<target>Фолдерски парови</target>
+
+<source>Overview</source>
+<target>Преглед</target>
+
+<source>Configuration</source>
+<target>Подешавања</target>
+
+<source>Main bar</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>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x фолдер</pluralform>
+<pluralform>%x фолдера</pluralform>
+<pluralform>%x фолдера</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x датотека</pluralform>
+<pluralform>%x датотеке</pluralform>
+<pluralform>%x датотека</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y од %x реда у приказу</pluralform>
+<pluralform>%y од %x реда у приказу</pluralform>
+<pluralform>%y од %x редова у приказу</pluralform>
+</target>
+
+<source>Set direction:</source>
+<target>Одабери смер:</target>
+
+<source>Exclude temporarily</source>
+<target>Тренутно искључи</target>
+
+<source>Include temporarily</source>
+<target>Тренутно укључи</target>
+
+<source>Exclude via filter:</source>
+<target>Искључи преко филтера:</target>
+
+<source><multiple selection></source>
+<target><вишеструки одабир></target>
+
+<source>Delete</source>
+<target>Избриши</target>
+
+<source>Include all</source>
+<target>Укључи све</target>
+
+<source>Exclude all</source>
+<target>Искључи све</target>
+
+<source>Show icons:</source>
+<target>Прикажи иконе:</target>
+
+<source>Small</source>
+<target>Мале</target>
+
+<source>Medium</source>
+<target>Средње</target>
+
+<source>Large</source>
+<target>Велике</target>
+
+<source>Select time span...</source>
+<target>Одаберите временски распон...</target>
+
+<source>Default view</source>
+<target>Подразумевани приказ</target>
+
+<source>Show "%x"</source>
+<target>Прикажи "%x"</target>
+
+<source><Last session></source>
+<target><Задња сесија></target>
+
+<source>Folder Comparison and Synchronization</source>
+<target>Упоређивање и синхронизација фолдера</target>
+
+<source>Configuration saved!</source>
+<target>Подешавања сачувана!</target>
+
+<source>FreeFileSync batch</source>
+<target>FreeFileSync беч задатак</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>Show files that exist on left side only</source>
+<target>Прикажи датотеке које постоје само на левој страни</target>
+
+<source>Show files that exist on right side only</source>
+<target>Прикажи датотеке које постоје само на десној страни</target>
+
+<source>Show files that are newer on left</source>
+<target>Прикажи датотеке које су новије лево</target>
+
+<source>Show files that are newer on right</source>
+<target>Прикажи датотеке које су новије десно</target>
+
+<source>Show files that are equal</source>
+<target>Прикажи једнаке датотеке</target>
+
+<source>Show files that are different</source>
+<target>Прикажи датотеке које су различите</target>
+
+<source>Show conflicts</source>
+<target>Прикажи конфликте</target>
+
+<source>Show files that will be created on the left side</source>
+<target>Прикажи датотеке које ће бити креиране на левој страни</target>
+
+<source>Show files that will be created on the right side</source>
+<target>Прикажи датотеке које ће бити креиране на десној страни</target>
+
+<source>Show files that will be deleted on the left side</source>
+<target>Прикажи датотеке које ће бити избрисане на левој страни</target>
+
+<source>Show files that will be deleted on the right side</source>
+<target>Прикажи датотеке које ће бити избрисане на десној страни</target>
+
+<source>Show files that will be overwritten on left side</source>
+<target>Прикажи датотеке које ће бити замењене на левој страни</target>
+
+<source>Show files that will be overwritten on right side</source>
+<target>Прикажи датотеке које ће бити замењене на десној страни</target>
+
+<source>Show files that won't be copied</source>
+<target>Прикажи датотеке које неће бити копиране</target>
+
+<source>Set as default</source>
+<target>Постави као подразумевано</target>
+
+<source>Operation aborted!</source>
+<target>Операција отказана!</target>
+
+<source>All folders are in sync!</source>
+<target>Сви фолдери су синхронизовани!</target>
+
+<source>Comma separated list</source>
+<target>Зарезом одвојене листе</target>
+
+<source>File list exported!</source>
+<target>Листа датотека експортована!</target>
+
+<source>Searching for program updates...</source>
+<target>Претражујем ажурирање за програм...</target>
+
+<source>Ignore further errors</source>
+<target>Занемари даље грешке</target>
+
+<source>&Ignore</source>
+<target>&Игнориши</target>
+
+<source>Don't show this warning again</source>
+<target>Не приказуј ово упозорење поновно</target>
+
+<source>&Switch</source>
+<target>&Замени</target>
+
+<source>Question</source>
+<target>Питање</target>
+
+<source>&Yes</source>
+<target>&Да</target>
+
+<source>&No</source>
+<target>&Не</target>
+
+<source>Scanning...</source>
+<target>Прегледавање...</target>
+
+<source>Comparing content...</source>
+<target>Упоређујем садржај...</target>
+
+<source>Paused</source>
+<target>Паузирано</target>
+
+<source>Initializing...</source>
+<target>Покретање...</target>
+
+<source>Aborted</source>
+<target>Прекинуто</target>
+
+<source>Completed</source>
+<target>Завршено</target>
+
+<source>Continue</source>
+<target>Настави</target>
+
+<source>Pause</source>
+<target>Пауза</target>
+
+<source>Logging</source>
+<target>Лог записивање</target>
+
+<source>Cannot find %x</source>
+<target>Немогу пронаћи %x</target>
+
+<source>Inactive</source>
+<target>Неактивно</target>
+
+<source>Today</source>
+<target>Данас</target>
+
+<source>This week</source>
+<target>Ове недеље</target>
+
+<source>This month</source>
+<target>Овог месеца</target>
+
+<source>This year</source>
+<target>Ове године</target>
+
+<source>Last x days</source>
+<target>Задњих x дана</target>
+
+<source>Byte</source>
+<target>Бајт</target>
+
+<source>KB</source>
+<target>KB</target>
+
+<source>MB</source>
+<target>MB</target>
+
+<source>Filter</source>
+<target>Филтрирање</target>
+
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Да ли стварно желите да преместите следећу %x ставку у Корпи за смеће?</pluralform>
+<pluralform>Да ли стварно желите да преместите следеће %x ставке у Корпи за смеће?</pluralform>
+<pluralform>Да ли стварно желите да преместите следећих %x ставки у Корпи за смеће?</pluralform>
+</target>
+
+<source>
+<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>
+
+<source>Direct</source>
+<target>Непосредно</target>
+
+<source>Follow</source>
+<target>Следи</target>
+
+<source>Copy NTFS permissions</source>
+<target>Копирај NTFS овлашћења</target>
+
+<source>Integrate external applications into context menu. The following macros are available:</source>
+<target>Интегриши спољне апликације у контекстни мени. Следећи макрои су доступни:</target>
+
+<source>- full file or folder name</source>
+<target>- цело име датотеке или фолдера</target>
+
+<source>- folder part only</source>
+<target>- само фолдерски део</target>
+
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Дупликат с друге стране у %item_path%</target>
+
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Дупликат с друге стране у %item_folder%</target>
+
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Врати скривена упозорења и диалоге поновно видљивим?</target>
+
+<source>Leave as unresolved conflict</source>
+<target>Остави као неразрешени конфликт</target>
+
+<source>Replace</source>
+<target>Замени</target>
+
+<source>Move files and replace if existing</source>
+<target>Премести датотеке и замени их ако већ постоје</target>
+
+<source>Time stamp</source>
+<target>Временска ознака</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Додај временску ознаку сваком имену датотеке</target>
+
+<source>Folder</source>
+<target>Фолдер</target>
+
+<source>File</source>
+<target>Датотека</target>
+
+<source>YYYY-MM-DD hhmmss</source>
+<target>ГГГГ-ММ-ДД ччммсс</target>
+
+<source>Files</source>
+<target>Датотеке</target>
+
+<source>Items</source>
+<target>Ставке</target>
+
+<source>Percentage</source>
+<target>Проценат</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Не могу надгледати фолдер %x.</target>
+
+<source>Conversion error:</source>
+<target>Грешка при претварању:</target>
+
+<source>Cannot delete file %x.</source>
+<target>Не могу избрисати датотеку %x.</target>
+
+<source>The file is locked by another process:</source>
+<target>Датотека је блокирана другим процесом:</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Не могу преместити датотеку %x у %y.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Не могу избрисати фолдер %x.</target>
+
+<source>Cannot write file attributes of %x.</source>
+<target>Не могу уписати својства од %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Не могу уписати време промене %x.</target>
+
+<source>Cannot read security context of %x.</source>
+<target>Не могу читати безбедоносни садржај %x.</target>
+
+<source>Cannot write security context of %x.</source>
+<target>Не могу уписати безбедоносни садржај %x.</target>
+
+<source>Cannot read permissions of %x.</source>
+<target>Не могу читати овлашћења од %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Не могу уписати овлашћења за %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Не могу креирати фолдер %x.</target>
+
+<source>Cannot create symbolic link %x.</source>
+<target></target>
+
+<source>Cannot copy file %x to %y.</source>
+<target>Не могу копирати датотеку %x на %y.</target>
+
+<source>Type of item %x is not supported:</source>
+<target>Тип ставке %x није подржан:</target>
+
+<source>Cannot open directory %x.</source>
+<target>Не могу отворити фолдер %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Не могу излистати фолдер %x.</target>
+
+<source>Detected endless directory recursion.</source>
+<target>Детектована неограничена фолдер рекурзија</target>
+
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x мин</pluralform>
+<pluralform>%x мин</pluralform>
+<pluralform>%x мин</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x сат</pluralform>
+<pluralform>%x сата</pluralform>
+<pluralform>%x сати</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x дан</pluralform>
+<pluralform>%x дана</pluralform>
+<pluralform>%x дана</pluralform>
+</target>
+
+<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>
+
+<source>Both sides have changed since last synchronization!</source>
+<target>Обе су стране промењене од последње синхронизације!</target>
+
+<source>Cannot determine sync-direction:</source>
+<target>Не могу одредити смер синхронизације:</target>
+
+<source>No change since last synchronization!</source>
+<target>Нема промена од задње синхронизације!</target>
+
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Споменути уноси базе података нису у синхронизацији у односу на тренутна подешавања.</target>
+
+<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>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. 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>Фолдери су зависни! Будите опрезни при постављању синхронизационих правила:</target>
+
+<source>Conflict detected:</source>
+<target>Конфликт уочен:</target>
+
+<source>File %x has an invalid date!</source>
+<target>Датотека %x има невалидни датум!</target>
+
+<source>Files %x have the same date but a different size!</source>
+<target>Датотеке %x имају исти датум али другачију величину!</target>
+
+<source>Items differ in attributes only</source>
+<target>Ставке се разликују само у атрибутима</target>
+
+<source>Resolving symbolic link %x</source>
+<target></target>
+
+<source>Comparing content of files %x</source>
+<target>Упоређујем садржај датотека %x</target>
+
+<source>Generating file list...</source>
+<target>Стварам листу датотека...</target>
+
+<source>Start comparison</source>
+<target>Почни упоређивање</target>
+
+<source>Calculating sync directions...</source>
+<target>Одређујем смерове синхронизације...</target>
+
+<source>Both sides are equal</source>
+<target>Обе стране су једнаке</target>
+
+<source>Copy new item to left</source>
+<target>Копирај нову ставку лево</target>
+
+<source>Copy new item to right</source>
+<target>Копирај нову ставку десно</target>
+
+<source>Delete left item</source>
+<target>Избриши леву ставку</target>
+
+<source>Delete right item</source>
+<target>Избриши десну ставку</target>
+
+<source>Move file on left</source>
+<target>Премести датотеку лево</target>
+
+<source>Move file on right</source>
+<target>Премести датотеку десно</target>
+
+<source>Overwrite left item</source>
+<target>Замени леву ставку</target>
+
+<source>Overwrite right item</source>
+<target>Замени десну ставку</target>
+
+<source>Do nothing</source>
+<target>Не ради ништа</target>
+
+<source>Update attributes on left</source>
+<target>Освежи атрибуте лево</target>
+
+<source>Update attributes on right</source>
+<target>Освежи атрибуте десно</target>
+
+<source>Multiple...</source>
+<target>Многоструко...</target>
+
+<source>Moving file %x to %y</source>
+<target>Премештам датотеку %x у %y</target>
+
+<source>Moving folder %x to %y</source>
+<target>Премештам фолдер %x у %y</target>
+
+<source>Moving symbolic link %x to %y</source>
+<target>Премештам симболичну везу %x у %y</target>
+
+<source>Removing old versions...</source>
+<target>Уклањам старије верзије...</target>
+
+<source>Creating symbolic link %x</source>
+<target>Креирам симболичну везу %x</target>
+
+<source>Creating folder %x</source>
+<target>Креирам фолдер %x</target>
+
+<source>Overwriting file %x</source>
+<target>Замењујем датотеку %x</target>
+
+<source>Overwriting symbolic link %x</source>
+<target>Замењујем симболичну везу %x</target>
+
+<source>Verifying file %x</source>
+<target>Проверавам датотеку %x</target>
+
+<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>
+
+<source>Target folder input field must not be empty.</source>
+<target>Поље за одабир одредишног фолдера не може бити празно.</target>
+
+<source>Folder input field for versioning must not be empty.</source>
+<target>Поље за одабир фолдера за верзионирање не може бити празно.</target>
+
+<source>Source folder %x not found.</source>
+<target>Изворни фолдер %x није пронађен.</target>
+
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Следеће ставке имају неразрешених конфликата и неће бити синхронизоване:</target>
+
+<source>Significant difference detected:</source>
+<target>Значајна разлика опажена:</target>
+
+<source>More than 50% of the total number of files will be copied or deleted!</source>
+<target>Више од 50% од укупног броја датотека ће бити копирано или избрисано!</target>
+
+<source>Not enough free disk space available in:</source>
+<target>Недовољно простора на диску у:</target>
+
+<source>Required:</source>
+<target>Потребно:</target>
+
+<source>Available:</source>
+<target>Доступно:</target>
+
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Фолдер ће бити промењен који је део више парова фолдера. Молимо проверите синхронизацијска подешавања.</target>
+
+<source>Synchronizing folder pair:</source>
+<target>Синхронизовање фолдерског пара:</target>
+
+<source>Generating database...</source>
+<target>Генерисање базе података...</target>
+
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Креирање Volume Shadow Copy за %x...</target>
+
+<source>Data verification error: Source and target file have different content!</source>
+<target>Грешка при проверавању података: Изворна и циљна датотека имају различите садржаје!</target>
+
diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index 9a6ce1cf..a5973b7c 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -20,7 +20,7 @@
 <target>Celoten čas:</target>
 
 <source>Cannot set directory lock for %x.</source>
-<target></target>
+<target>Ne morem nastaviti zaklepanja imenikov za %x.</target>
 
 <source>Show in Explorer</source>
 <target>Prikaži v Raziskovalcu</target>
@@ -44,7 +44,7 @@
 <target>Napaka</target>
 
 <source>Selected variant:</source>
-<target></target>
+<target>Izbrana varianta:</target>
 
 <source>Select alternate comparison settings</source>
 <target>Izberite alternativne nastavitve primerjanja</target>
@@ -68,7 +68,7 @@
 <target>Kopiraj</target>
 
 <source>Paste</source>
-<target></target>
+<target>Prilepi</target>
 
 <source>Save as batch job</source>
 <target>Shrani kot paketno opravilo</target>
@@ -110,20 +110,11 @@
 <target>Usodna napaka</target>
 
 <source>Error Code %x:</source>
-<target></target>
+<target>Koda napake %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Ne morem razrešiti simbolične povezave %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
-
-<source>%x GB</source>
-<target>%x GB</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -135,6 +126,15 @@
 <pluralform>%x Bajtov</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Datoteka podatkovne baze %x je nekompatibilna.</target>
 
@@ -171,9 +171,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Čakam, medtem ko se zaklepa imenik (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Ustvarjam datoteko %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -185,15 +182,15 @@
 <pluralform>%x sek</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Ustvarjam datoteko %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Napaka pri razčlenjevanju datoteke %x, vrstica %y, stolpec %z.</target>
 
 <source>Scanning:</source>
 <target>Pregledujem:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Podrobne informacije o času enkodiranja: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -205,6 +202,9 @@
 <pluralform>[%x niti]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Podrobne informacije o času enkodiranja: %x</target>
+
 <source>/sec</source>
 <target>/sek</target>
 
@@ -469,13 +469,13 @@ Ukaz se sproži če:
 <target>&Napredno</target>
 
 <source>&Check now</source>
-<target></target>
+<target>P&reveri zdaj</target>
 
 <source>Check &automatically once a week</source>
-<target></target>
+<target>S&amodejno preveri enkrat tedensko</target>
 
 <source>Check for new version</source>
-<target></target>
+<target>Preveri za novo različico</target>
 
 <source>Compare</source>
 <target>Primerjaj</target>
@@ -493,7 +493,7 @@ Ukaz se sproži če:
 <target>Zamenjaj strani</target>
 
 <source>Hide excluded items</source>
-<target>Skrij izključene predmete</target>
+<target>Skrij izključene elemente</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Pokaži filtrirane ali začasno izključene datoteke</target>
@@ -529,7 +529,7 @@ Ukaz se sproži če:
 <target>Ob zaključku</target>
 
 <source>Close</source>
-<target></target>
+<target>Zapri</target>
 
 <source>&Pause</source>
 <target>&Premor</target>
@@ -622,7 +622,7 @@ enaka
 <target><- Obojesmerno -></target>
 
 <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
-<target></target>
+<target>Identificiraj in razširjaj spremembe na obeh straneh. Izbrisi, premiki in spori so samodejno zaznani z uporabo podatkovne baze.</target>
 
 <source>Mirror ->></source>
 <target>Zrcalno ->></target>
@@ -661,7 +661,7 @@ enaka
 <target>Ustvarjanje različič</target>
 
 <source>Move files to user-defined folder</source>
-<target></target>
+<target>Premakni datoteke v uporabniško-definirano mapo</target>
 
 <source>Naming convention:</source>
 <target>Konvencija poimenovanja:</target>
@@ -745,7 +745,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <target>Maksimum</target>
 
 <source>&Clear</source>
-<target></target>
+<target>P&očisti</target>
 
 <source>Fail-safe file copy</source>
 <target>Kopiranje datotek varno pred odpovedjo</target>
@@ -798,9 +798,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>&Find next</source>
 <target>&Najdi naslednje</target>
 
-<source>Operation aborted!</source>
-<target>Operacija prekinjena!</target>
-
 <source>Main bar</source>
 <target>Glavna vrstica</target>
 
@@ -820,7 +817,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <target>Izberite pogled</target>
 
 <source>Open...</source>
-<target></target>
+<target>Odpri...</target>
 
 <source>Save</source>
 <target>Shrani</target>
@@ -828,6 +825,39 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Compare both sides</source>
 <target>Primerjaj obe strani</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x imenik</pluralform>
+<pluralform>%x imenika</pluralform>
+<pluralform>%x imeniki</pluralform>
+<pluralform>%x imenikov</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x datoteka</pluralform>
+<pluralform>%x datoteki</pluralform>
+<pluralform>%x datoteke</pluralform>
+<pluralform>%x datotek</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y od %x vrstice prikazana</pluralform>
+<pluralform>%y od %x vrstic prikazanih</pluralform>
+<pluralform>%y od %x vrstic prikazanih</pluralform>
+<pluralform>%y od %x vrstic prikazanih</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Nastavi smer:</target>
 
@@ -940,7 +970,10 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <target>Prikaži datoteke, ki ne bodo kopirane</target>
 
 <source>Set as default</source>
-<target></target>
+<target>Nastavi kot privzeto</target>
+
+<source>Operation aborted!</source>
+<target>Operacija prekinjena!</target>
 
 <source>All folders are in sync!</source>
 <target>Vse mape so sinhronizirane!</target>
@@ -955,40 +988,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <target>Seznam datotek je bil izvožen!</target>
 
 <source>Searching for program updates...</source>
-<target></target>
-
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x imenik</pluralform>
-<pluralform>%x imenika</pluralform>
-<pluralform>%x imeniki</pluralform>
-<pluralform>%x imenikov</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x datoteka</pluralform>
-<pluralform>%x datoteki</pluralform>
-<pluralform>%x datoteke</pluralform>
-<pluralform>%x datotek</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x od %y vrstice v prikazu</pluralform>
-<pluralform>%x od %y vrstic v prikazu</pluralform>
-<pluralform>%x od %y vrstic v prikazu</pluralform>
-<pluralform>%x od %y vrstic v prikazu</pluralform>
-</target>
+<target>Iščem posodobitve programa...</target>
 
 <source>Ignore further errors</source>
 <target>Ignoriraj nadaljnje napake</target>
@@ -997,7 +997,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <target>&Ignoriraj</target>
 
 <source>Don't show this warning again</source>
-<target></target>
+<target>Ne prikaži več tega opozorila</target>
 
 <source>&Switch</source>
 <target>&Preklopi</target>
@@ -1071,6 +1071,28 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Filter</source>
 <target>Filter</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Ali resnično želite premakniti sledeči %xelement v Koš?</pluralform>
+<pluralform>Ali resnično želite premakniti naslednja %x elementa v Koš?</pluralform>
+<pluralform>Ali resnično želite premakniti naslednje %x elemente v Koš?</pluralform>
+<pluralform>Ali resnično želite premakniti naslednjih %x elementov v Koš?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Ali resnično želite izbrisati sledeči %x element?</pluralform>
+<pluralform>Ali resnično želite izbrisati naslednja %x elementa?</pluralform>
+<pluralform>Ali resnično želite izbrisati naslednje %x elemente?</pluralform>
+<pluralform>Ali resnično želite izbrisati naslednjih %x elementov?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Neposredno</target>
 
@@ -1098,23 +1120,11 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Ponovno prikažem vsa skrita obvestila in pogovore?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target></target>
-
 <source>Leave as unresolved conflict</source>
 <target>Pusti kot nerešeni spor</target>
 
 <source>Time stamp</source>
-<target></target>
+<target>Časovna oznaka</target>
 
 <source>Append a timestamp to each file name</source>
 <target>Dodaj časovno oznako k vsakemu imenu datoteke</target>
@@ -1137,6 +1147,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Files</source>
 <target>Datoteke</target>
 
+<source>Items</source>
+<target>Elementi</target>
+
 <source>Percentage</source>
 <target>Odstotek</target>
 
@@ -1189,7 +1202,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <target>Ne morem kopirati datoteke %x v %y.</target>
 
 <source>Type of item %x is not supported:</source>
-<target>Predmet tipa %x ni podprt:</target>
+<target>Element tipa %x ni podprt:</target>
 
 <source>Cannot open directory %x.</source>
 <target>Ne morem odpreti imenika %x.</target>
@@ -1206,9 +1219,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1246,10 +1256,10 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <target>Ne morem nastaviti privilegija %x.</target>
 
 <source>Failed to suspend system sleep mode.</source>
-<target></target>
+<target>Način spanja ni uspelo prekiniti.</target>
 
 <source>Cannot change process I/O priorities.</source>
-<target></target>
+<target>Ne morem spremeniti V/I prioritet procesa.</target>
 
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>Ne morem premakniti %x v Koš</target>
@@ -1270,7 +1280,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <target>Nastavljanje privzetih smeri sinhronizacije: Stare datoteke bodo prepisane z novimi datotekami.</target>
 
 <source>Checking recycle bin availability for folder %x...</source>
-<target></target>
+<target>Preverjam razpoložljivost koša za mapo %x...</target>
 
 <source>Moving file %x to recycle bin</source>
 <target>Premikam datoteko %x v koš</target>
@@ -1294,13 +1304,13 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <target>Koš ni na voljo za naslednje poti! Namesto tega bodo datoteke trajno izbrisane:</target>
 
 <source>The corresponding folder will be considered as empty.</source>
-<target></target>
+<target>Ustrezajoča mapa bo smatrana kot prazna.</target>
 
 <source>Cannot find the following folders:</source>
-<target></target>
+<target>Ne morem najti naslednjih map:</target>
 
-<source>You can ignore this error to consider each folder as empty.</source>
-<target></target>
+<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>To napako, ki smatra vsako mapo kot prazno, lahko ignorirate. Mape bodo potem samodejno ustvarjene med sinhronizacijo.</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>
@@ -1309,7 +1319,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <target>Začni primerjavo</target>
 
 <source>Calculating sync directions...</source>
-<target></target>
+<target>Preračunavam sinhronizacijske smeri...</target>
 
 <source>Conflict detected:</source>
 <target>Zaznan spor:</target>
@@ -1405,7 +1415,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <target>Posodabljam atribute od %x</target>
 
 <source>Cannot find %x.</source>
-<target></target>
+<target>Ne morem najti %x.</target>
 
 <source>Target folder %x already existing.</source>
 <target>Ciljna mapa %x že obstaja.</target>
@@ -1420,7 +1430,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <target>Izvorna mapa %x se ne najde.</target>
 
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
-<target>Naslednji objekti imajo nerešene konflikte in ne bodo sinhronizirani:</target>
+<target>Naslednji elementi imajo nerešene konflikte in ne bodo sinhronizirani:</target>
 
 <source>Significant difference detected:</source>
 <target>Zaznana je pomembna razlika:</target>
@@ -1440,12 +1450,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Spremenjena bo mapa, ki je del večkratnih parov map. Prosim preglejte nastavitve sinhronizacije.</target>
 
-<source>Left</source>
-<target>Levo</target>
-
-<source>Right</source>
-<target>Desno</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Sinhroniziram par map:</target>
 
@@ -1453,7 +1457,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <target>Ustvarjam podatkovno bazo...</target>
 
 <source>Creating Volume Shadow Copy for %x...</source>
-<target></target>
+<target>Ustvarjam Senčno kopijo nosilca za %x...</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 084477df..3a3df962 100644
--- a/BUILD/Languages/spanish.lng
+++ b/BUILD/Languages/spanish.lng
@@ -115,14 +115,11 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>No se puede resolver el enlace simbólico %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
+<source>Cannot determine final path for %x.</source>
+<target></target>
 
-<source>%x GB</source>
-<target>%x GB</target>
+<source>Cannot find system function %x.</source>
+<target>No se puede encontrar la función del sistema %x.</target>
 
 <source>
 <pluralform>1 Byte</pluralform>
@@ -133,6 +130,15 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>El archivo de base de datos %x es incompatible</target>
 
@@ -169,9 +175,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Esperando mientras el directorio se encuentre bloqueado (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Creando archivo %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +184,15 @@
 <pluralform>%x segs</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Creando archivo %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Error analizando archivo %x, fila %y, columna %z.</target>
 
 <source>Scanning:</source>
 <target>Escanear:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Información temporal extendida de la codificación: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +202,9 @@
 <pluralform>[%x Hilos]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Información temporal extendida de la codificación: %x</target>
+
 <source>/sec</source>
 <target>/seg</target>
 
@@ -411,12 +417,12 @@ El comando es disparado si::
 <source>Date:</source>
 <target>Fecha:</target>
 
-<source>Action</source>
-<target>Acción</target>
-
 <source>Category</source>
 <target>Categoría</target>
 
+<source>Action</source>
+<target>Acción</target>
+
 <source>Drag && drop</source>
 <target>Arrastrar y soltar</target>
 
@@ -792,12 +798,6 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>&Find next</source>
 <target>&Buscar siguiente</target>
 
-<source>Operation aborted!</source>
-<target>¡Operación abortada!</target>
-
-<source>Main bar</source>
-<target>Barra principal</target>
-
 <source>Folder pairs</source>
 <target>Pares de carpetas</target>
 
@@ -807,6 +807,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Configuration</source>
 <target>Configuración</target>
 
+<source>Main bar</source>
+<target>Barra principal</target>
+
 <source>Filter files</source>
 <target>Filtrar archivos</target>
 
@@ -822,6 +825,30 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Compare both sides</source>
 <target>Comparar ambos lados</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 directorio</pluralform>
+<pluralform>%x directorios</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 archivo</pluralform>
+<pluralform>%x archivos</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target></target>
+
 <source>Set direction:</source>
 <target>Indicar dirección:</target>
 
@@ -936,48 +963,21 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Set as default</source>
 <target>Establecer por defecto</target>
 
+<source>Operation aborted!</source>
+<target>¡Operación abortada!</target>
+
 <source>All folders are in sync!</source>
 <target>¡Todas las carpetas están sincronizadas!</target>
 
 <source>Comma separated list</source>
 <target>Lista separada por comas</target>
 
-<source>Legend</source>
-<target>Leyenda</target>
-
 <source>File list exported!</source>
 <target>¡Lista de archivos exportada!</target>
 
 <source>Searching for program updates...</source>
 <target>Buscando actualizaciones del programa...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 directorio</pluralform>
-<pluralform>%x directorios</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 archivo</pluralform>
-<pluralform>%x archivos</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x de una fila en vista</pluralform>
-<pluralform>%x de %y filas en vista</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ignorar más errores</target>
 
@@ -1059,6 +1059,21 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Filter</source>
 <target>Filtro</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>¿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 item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target></target>
+
 <source>Direct</source>
 <target>Enviar</target>
 
@@ -1086,39 +1101,21 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>¿Hacer visibles de nuevo los mensajes de alerta y diálogo?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>¿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 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 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>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>Folder</source>
 <target>Carpeta</target>
 
@@ -1161,9 +1158,6 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Cannot write modification time of %x.</source>
 <target>No se puede escribir el tiempo de modificación de %x.</target>
 
-<source>Cannot find system function %x.</source>
-<target>No se puede encontrar la función del sistema %x.</target>
-
 <source>Cannot read security context of %x.</source>
 <target>No se puede leer el contexto de seguridad de %x.</target>
 
@@ -1179,8 +1173,8 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Cannot create directory %x.</source>
 <target>No se puede crear el directorio %x.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>No se puede copiar el enlance simbólico %x a %y.</target>
+<source>Cannot create symbolic link %x.</source>
+<target></target>
 
 <source>Cannot copy file %x to %y.</source>
 <target>No se puede copiar el archivo %x a %y.</target>
@@ -1203,9 +1197,6 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1290,18 +1281,12 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <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>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>¡Los directorios son dependientes! Tenga cuidado al establecer las reglas de sincronización:</target>
 
-<source>Start comparison</source>
-<target>Empezar comparación</target>
-
-<source>Calculating sync directions...</source>
-<target>Calculando direcciones de sincronización...</target>
-
 <source>Conflict detected:</source>
 <target>Conflicto detectado:</target>
 
@@ -1314,18 +1299,21 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Items differ in attributes only</source>
 <target>Los elementos sólo se diferencian en los atributos</target>
 
-<source>Symbolic links %x have the same date but a different target.</source>
-<target>Los enlaces simbólicos %x tienen la misma fecha pero un destino diferente.</target>
+<source>Resolving symbolic link %x</source>
+<target></target>
 
 <source>Comparing content of files %x</source>
 <target>Comparación del contenido de los archivos %x</target>
 
-<source>Comparing files by content failed.</source>
-<target>La comparación de archivos por el contenido ha fallado.</target>
-
 <source>Generating file list...</source>
 <target>Generando lista de archivos...</target>
 
+<source>Start comparison</source>
+<target>Empezar comparación</target>
+
+<source>Calculating sync directions...</source>
+<target>Calculando direcciones de sincronización...</target>
+
 <source>Both sides are equal</source>
 <target>Ambos lados son iguales</target>
 
@@ -1431,12 +1419,6 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Una carpeta, que es parte de múltiple pares de carpetas, será modificada. Por favor, revise las opciones de sincronización.</target>
 
-<source>Left</source>
-<target>Izquierda</target>
-
-<source>Right</source>
-<target>Derecha</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Sincronizando par de carpetas:</target>
 
diff --git a/BUILD/Languages/swedish.lng b/BUILD/Languages/swedish.lng
index 8e3a32a7..0b1e2fe3 100644
--- a/BUILD/Languages/swedish.lng
+++ b/BUILD/Languages/swedish.lng
@@ -115,15 +115,6 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Den symboliska länken %x kan inte matchas.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
-
-<source>%x GB</source>
-<target>%x GB</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -133,6 +124,15 @@
 <pluralform>%x Byte</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Databasfilen %x är inkompatibel</target>
 
@@ -169,9 +169,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Väntar medan mappen låses (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Skapar fil %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +178,15 @@
 <pluralform>%x sek</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Skapar fil %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Tolkningsfel på filen %x, rad %y, kolumn %z.</target>
 
 <source>Scanning:</source>
 <target>Skannar:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Kodar utökad tidsinformation: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +196,9 @@
 <pluralform>[%x trådar]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Kodar utökad tidsinformation: %x</target>
+
 <source>/sec</source>
 <target>/s</target>
 
@@ -822,6 +822,33 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Compare both sides</source>
 <target>Jämför båda sidor</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 mapp</pluralform>
+<pluralform>%x mappar</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 fil</pluralform>
+<pluralform>%x filer</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y av 1 rad i vyn</pluralform>
+<pluralform>%y av %x rader i vyn</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Ange riktning:</target>
 
@@ -951,33 +978,6 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Searching for program updates...</source>
 <target>Söker efter programuppdateringar...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 mapp</pluralform>
-<pluralform>%x mappar</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 fil</pluralform>
-<pluralform>%x filer</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x av 1 rad i vyn</pluralform>
-<pluralform>%x av %y rader i vyn</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ignorera ytterligare fel</target>
 
@@ -1059,6 +1059,24 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Filter</source>
 <target>Filter</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</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>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Vill du verkligen ta bort följande objekt?</pluralform>
+<pluralform>Vill du verkligen ta bort följande %x objekt?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Direkt</target>
 
@@ -1086,24 +1104,6 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Vill du göra dolda varningar och dialoger, synliga igen?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>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 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>
-<pluralform>Vill du verkligen ta bort följande %x objekt?</pluralform>
-</target>
-
 <source>Leave as unresolved conflict</source>
 <target>Ignorera konflikt</target>
 
@@ -1131,6 +1131,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Files</source>
 <target>Filer</target>
 
+<source>Items</source>
+<target>Objekt</target>
+
 <source>Percentage</source>
 <target>Procent</target>
 
@@ -1200,9 +1203,6 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1287,8 +1287,8 @@ OBS! Filnamnen måste anges relativt till basmappar
 <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>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>Du kan bortse från detta fel, och betrakta varje mapp som tom. Mapparna kommer då att skapas automatiskt, under synkroniseringen</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>
diff --git a/BUILD/Languages/turkish.lng b/BUILD/Languages/turkish.lng
index f3c87e86..52f44188 100644
--- a/BUILD/Languages/turkish.lng
+++ b/BUILD/Languages/turkish.lng
@@ -8,7 +8,7 @@
 </header>
 
 <source>Searching for folder %x...</source>
-<target>%s klasörü aranıyor...</target>
+<target>%x klasörü aranıyor...</target>
 
 <source>Items processed:</source>
 <target>İşlenen öge:</target>
@@ -115,15 +115,6 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>%x simge bağlantısı çözümlenemedi</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
-
-<source>%x GB</source>
-<target>%x GB</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -133,6 +124,15 @@
 <pluralform>%x Bayt</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Database file %x is incompatible.</source>
 <target>%x veritabanı dosyası uyumsuz</target>
 
@@ -169,9 +169,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Klasör kilitli olduğundan bekleniyor (%x)...</target>
 
-<source>Creating file %x</source>
-<target>%x dosyası ekleniyor</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +178,15 @@
 <pluralform>%x saniye</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>%x dosyası ekleniyor</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>%x dosyası işlenirken hata, satır %y, sütun %z.</target>
 
 <source>Scanning:</source>
 <target>Taranıyor:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Uzatılmış zaman bilgisi kodlanıyor: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +196,9 @@
 <pluralform>[%x İş]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Uzatılmış zaman bilgisi kodlanıyor: %x</target>
+
 <source>/sec</source>
 <target>/saniye</target>
 
@@ -822,6 +822,33 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Compare both sides</source>
 <target>İki tarafı karşılaştırır</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 klasör</pluralform>
+<pluralform>%x klasör</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 dosya</pluralform>
+<pluralform>%x dosya</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y / 1 satır görüntüleniyor</pluralform>
+<pluralform>%y / %x satır görüntüleniyor</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Yönü seçin:</target>
 
@@ -951,33 +978,6 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Searching for program updates...</source>
 <target>Yazılım güncellemesine bakılıyor...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 klasör</pluralform>
-<pluralform>%x klasör</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 dosya</pluralform>
-<pluralform>%x dosya</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x / 1 satır görüntüleniyor</pluralform>
-<pluralform>%x / %y satır görüntüleniyor</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Sonraki hatalar yoksayılsın</target>
 
@@ -1059,6 +1059,24 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Filter</source>
 <target>Süzgeç</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Aşağıdaki 1 ögeyi Geri Dönüşüm Kutusuna göndermek istediğinize emin misiniz?</pluralform>
+<pluralform>Aşağıdaki %x ögeyi Geri Dönüşüm Kutusuna göndermek istediğinize emin misiniz?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Aşağıdaki 1 ögeyi silmek istediğinize emin misiniz?</pluralform>
+<pluralform>Aşağıdaki %x ögeyi silmek istediğinize emin misiniz?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Doğrudan katılsın</target>
 
@@ -1086,24 +1104,6 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Gizlenmiş iletiler yeniden görüntülensin mi?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>Aşağıdaki ögeyi Geri Dönüşüm Kutusuna 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 item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<pluralform>Aşağıdaki ögeyi silmek istediğinize emin misiniz?</pluralform>
-<pluralform>Aşağıdaki ögeleri silmek istediğinize emin misiniz?</pluralform>
-</target>
-
 <source>Leave as unresolved conflict</source>
 <target>Uyuşmazlık çözülmeden bırakılsın</target>
 
@@ -1131,6 +1131,9 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Files</source>
 <target>Dosyalar</target>
 
+<source>Items</source>
+<target>Ögeler</target>
+
 <source>Percentage</source>
 <target>Yüzde</target>
 
@@ -1200,9 +1203,6 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1287,8 +1287,8 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Cannot find the following folders:</source>
 <target>Aşağıdaki klasörler bulunamadı:</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>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>Bu hatayı yok sayarak karşıdaki klasörleri boş kabul edebilirsiniz. Bu klasörler eşleştirme sırasında kendiliğinden oluşturulur.</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>
diff --git a/BUILD/Languages/ukrainian.lng b/BUILD/Languages/ukrainian.lng
index 374e212e..49997d5c 100644
--- a/BUILD/Languages/ukrainian.lng
+++ b/BUILD/Languages/ukrainian.lng
@@ -115,15 +115,6 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Не вдається вирішити символьне посилання %x.</target>
 
-<source>%x MB</source>
-<target>%x МБ</target>
-
-<source>%x KB</source>
-<target>%x КБ</target>
-
-<source>%x GB</source>
-<target>%x ГБ</target>
-
 <source>
 <pluralform>1 Byte</pluralform>
 <pluralform>%x Bytes</pluralform>
@@ -134,6 +125,15 @@
 <pluralform>%x байтів</pluralform>
 </target>
 
+<source>%x MB</source>
+<target>%x МБ</target>
+
+<source>%x KB</source>
+<target>%x КБ</target>
+
+<source>%x GB</source>
+<target>%x ГБ</target>
+
 <source>Database file %x is incompatible.</source>
 <target>Несумісний файл бази даних %x.</target>
 
@@ -162,7 +162,7 @@
 <target>Відбулось виключення!</target>
 
 <source>Cannot read file attributes of %x.</source>
-<target>Не вдається прочитати атрибути файла %х.</target>
+<target>Не вдається прочитати атрибути файла %x.</target>
 
 <source>Cannot get process information.</source>
 <target>Не вдається отримати інформацію процесу</target>
@@ -170,9 +170,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Очікування зняття блокування з каталогу (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Створення файлу %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -183,15 +180,15 @@
 <pluralform>%x сек</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Створення файлу %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Помилка розбору файла %x, рядок %y, колонка %z.</target>
 
 <source>Scanning:</source>
 <target>Сканую:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Кодування розширеної інформації про час: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -202,6 +199,9 @@
 <pluralform>[%x Нитей виконання]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Кодування розширеної інформації про час: %x</target>
+
 <source>/sec</source>
 <target>/сек</target>
 
@@ -791,9 +791,6 @@ Note: File names must be relative to base directories!
 <source>&Find next</source>
 <target>&Знайти наступний</target>
 
-<source>Operation aborted!</source>
-<target>Операція відмінена!</target>
-
 <source>Main bar</source>
 <target>Головна панель</target>
 
@@ -821,6 +818,36 @@ Note: File names must be relative to base directories!
 <source>Compare both sides</source>
 <target>Порівняти обидві сторони</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x каталог</pluralform>
+<pluralform>%x каталоги</pluralform>
+<pluralform>%x каталогів</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x файл</pluralform>
+<pluralform>%x файли</pluralform>
+<pluralform>%x файлів</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y of %x рядка</pluralform>
+<pluralform>%y of %x рядків</pluralform>
+<pluralform>%y of %x рядків</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Виберіть напрям:</target>
 
@@ -935,6 +962,9 @@ Note: File names must be relative to base directories!
 <source>Set as default</source>
 <target>Встановити за замовчуванням</target>
 
+<source>Operation aborted!</source>
+<target>Операція відмінена!</target>
+
 <source>All folders are in sync!</source>
 <target>Всі папки синхронізовано!</target>
 
@@ -950,36 +980,6 @@ Note: File names must be relative to base directories!
 <source>Searching for program updates...</source>
 <target>Пошук оновлень програми ...</target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>%x каталог</pluralform>
-<pluralform>%x каталоги</pluralform>
-<pluralform>%x каталогів</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>%x файл</pluralform>
-<pluralform>%x файли</pluralform>
-<pluralform>%x файлів</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x з %y рядка</pluralform>
-<pluralform>%x з %y рядків</pluralform>
-<pluralform>%x з %y рядків</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ігнорувати майбутні помилки</target>
 
@@ -1061,6 +1061,26 @@ Note: File names must be relative to base directories!
 <source>Filter</source>
 <target>Фільтр</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Ви дійсно хочете перемістити цей %x елемент до Корзини?</pluralform>
+<pluralform>Ви дійсно хочете перемістити ці %x елементи до Корзини?</pluralform>
+<pluralform>Ви дійсно хочете перемістити ці %x елементів до Корзини?</pluralform>
+</target>
+
+<source>
+<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>
+
 <source>Direct</source>
 <target>Прямо</target>
 
@@ -1088,26 +1108,6 @@ Note: File names must be relative to base directories!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Зробити приховані попередження та діалоги ​​знову видимими?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target>
-<pluralform>Ви дійсно хочете перемістити цей елемент до Корзини?</pluralform>
-<pluralform>Ви дійсно хочете перемістити ці %x елементи до Корзини?</pluralform>
-<pluralform>Ви дійсно хочете перемістити ці %x елементів до Корзини?</pluralform>
-</target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target>
-<pluralform>Ви дійсно хочете вилучити цей елемент?</pluralform>
-<pluralform>Ви дійсно хочете вилучити ці %x елементи?</pluralform>
-<pluralform>Ви дійсно хочете вилучити ці %x елементів?</pluralform>
-</target>
-
 <source>Leave as unresolved conflict</source>
 <target>Залишити як невирішений конфлікт</target>
 
@@ -1136,7 +1136,7 @@ Note: File names must be relative to base directories!
 <target>Файли</target>
 
 <source>Items</source>
-<target></target>
+<target>Елементи</target>
 
 <source>Percentage</source>
 <target>Проценти</target>
@@ -1148,7 +1148,7 @@ Note: File names must be relative to base directories!
 <target>Помилка перетворення:</target>
 
 <source>Cannot delete file %x.</source>
-<target>Не вдається видалити файл %х.</target>
+<target>Не вдається видалити файл %x.</target>
 
 <source>The file is locked by another process:</source>
 <target>Файл заблоковано іншим процесом:</target>
@@ -1157,40 +1157,40 @@ Note: File names must be relative to base directories!
 <target>Не вдається перемістити файл %x до %y.</target>
 
 <source>Cannot delete directory %x.</source>
-<target>Не вдається видалити каталог х%.</target>
+<target>Не вдається видалити каталог %x.</target>
 
 <source>Cannot write file attributes of %x.</source>
 <target>Не вдається записати атрибути файла %x.</target>
 
 <source>Cannot write modification time of %x.</source>
-<target>Не вдається записати часу модифікації %х.</target>
+<target>Не вдається записати часу модифікації %x.</target>
 
 <source>Cannot find system function %x.</source>
 <target>Не вдається знайти системної функції %x.</target>
 
 <source>Cannot read security context of %x.</source>
-<target>Не вдається прочитати контексту безпеки %х.</target>
+<target>Не вдається прочитати контексту безпеки %x.</target>
 
 <source>Cannot write security context of %x.</source>
-<target>Не вдається записати контексту безпеки %х.</target>
+<target>Не вдається записати контексту безпеки %x.</target>
 
 <source>Cannot read permissions of %x.</source>
-<target>Не вдається прочитати дозволів %х.</target>
+<target>Не вдається прочитати дозволів %x.</target>
 
 <source>Cannot write permissions of %x.</source>
-<target>Не вдається записати дозволів %х.</target>
+<target>Не вдається записати дозволів %x.</target>
 
 <source>Cannot create directory %x.</source>
 <target>Не вдається створити каталогу %x.</target>
 
 <source>Cannot copy symbolic link %x to %y.</source>
-<target>Не вдається зкопіювати символьне посилання %х в %y.</target>
+<target>Не вдається зкопіювати символьне посилання %x в %y.</target>
 
 <source>Cannot copy file %x to %y.</source>
-<target>Не вдається зкопіювати файл %х до %y.</target>
+<target>Не вдається зкопіювати файл %x до %y.</target>
 
 <source>Type of item %x is not supported:</source>
-<target>Тип елемента %х не підтримується:</target>
+<target>Тип елемента %x не підтримується:</target>
 
 <source>Cannot open directory %x.</source>
 <target>Не вдається відкрити каталогу %x.</target>
@@ -1207,9 +1207,6 @@ Note: File names must be relative to base directories!
 <source>%x PB</source>
 <target>%x ПБ</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1241,7 +1238,7 @@ Note: File names must be relative to base directories!
 </target>
 
 <source>Cannot set privilege %x.</source>
-<target>Не вдається встановити привілеї %х.</target>
+<target>Не вдається встановити привілеї %x.</target>
 
 <source>Failed to suspend system sleep mode.</source>
 <target>Не вдалося призупинити режим сну системи.</target>
@@ -1300,8 +1297,8 @@ Note: File names must be relative to base directories!
 <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>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>Залежні каталоги! Будьте уважні при налаштуванні правил синхронізації:</target>
@@ -1325,7 +1322,7 @@ Note: File names must be relative to base directories!
 <target>Елементи відрізняються тільки атрибутами</target>
 
 <source>Symbolic links %x have the same date but a different target.</source>
-<target>Символьні посилання %х мають таку ж дату, але різні цілі.</target>
+<target>Символьні посилання %x мають таку ж дату, але різні цілі.</target>
 
 <source>Comparing content of files %x</source>
 <target>Порівнювання вмісту файлів %x</target>
@@ -1441,12 +1438,6 @@ Note: File names must be relative to base directories!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Буде змінена папка, яка є частиною кількох пар папок. Будь ласка, перегляньте налаштування синхронізації.</target>
 
-<source>Left</source>
-<target>Ліворуч</target>
-
-<source>Right</source>
-<target>Праворуч</target>
-
 <source>Synchronizing folder pair:</source>
 <target>Синхронізація пари папок:</target>