5.7

29 files changed, 3853 insertions, 3652 deletions

diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index dbf75eac..656c9079 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>正在搜索文件夹 %x...</target>
 
-<source>Batch execution</source>
-<target>批处理执行</target>
-
 <source>Items processed:</source>
 <target>已处理的项目:</target>
 
@@ -61,12 +58,12 @@
 <source>Create a batch job</source>
 <target>创建一个批处理作业</target>
 
-<source>Synchronization settings</source>
-<target>同步设置</target>
-
 <source>Comparison settings</source>
 <target>比较设置</target>
 
+<source>Synchronization settings</source>
+<target>同步设置</target>
+
 <source>About</source>
 <target>关于</target>
 
@@ -88,27 +85,6 @@
 <source>Select time span</source>
 <target>选择时间跨度</target>
 
-<source>Show pop-up</source>
-<target>显示弹出对话框</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>在错误或警告时显示弹出对话框</target>
-
-<source>Ignore errors</source>
-<target>忽略错误</target>
-
-<source>Hide all error and warning messages</source>
-<target>隐藏所有错误与警告信息</target>
-
-<source>Exit instantly</source>
-<target>立即退出</target>
-
-<source>Abort synchronization immediately</source>
-<target>立即中止同步</target>
-
-<source>Browse</source>
-<target>浏览</target>
-
 <source>Invalid command line:</source>
 <target>无效的命令行:</target>
 
@@ -244,7 +220,7 @@
 <source>&Open...</source>
 <target>打开(&O)...</target>
 
-<source>Save &As...</source>
+<source>Save &as...</source>
 <target>另存为(&A)...</target>
 
 <source>&Quit</source>
@@ -286,6 +262,9 @@
 <source>Remove folder</source>
 <target>移除文件夹</target>
 
+<source>Browse</source>
+<target>浏览</target>
+
 <source>Select a folder</source>
 <target>选择一个文件夹</target>
 
@@ -318,8 +297,8 @@ The command is triggered if:
 <source>Cancel</source>
 <target>取消</target>
 
-<source>(Build: %x)</source>
-<target>(Build: %x)</target>
+<source>Build: %x</source>
+<target>Build: %x</target>
 
 <source>All files</source>
 <target>所有文件</target>
@@ -339,9 +318,6 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>有一个文件夹输入框为空.</target>
 
-<source>Logging</source>
-<target>记录</target>
-
 <source>File time and size</source>
 <target>文件时间和大小</target>
 
@@ -522,11 +498,11 @@ The command is triggered if:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>最后使用的配置(按DEL键将其从列表中移除)</target>
 
-<source>Hide excluded items</source>
-<target>隐藏已排除的项目</target>
+<source>Show excluded items</source>
+<target>显示已排除项目</target>
 
-<source>Hide filtered or temporarily excluded files</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>
@@ -570,24 +546,81 @@ The command is triggered if:
 <source>Right</source>
 <target>右侧</target>
 
-<source>Status feedback</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>On completion:</source>
+<target>完成时:</target>
 
 <source>Show progress dialog</source>
 <target>显示进度对话框</target>
 
-<source>Error handling</source>
-<target>错误处理</target>
+<source>Generate log file</source>
+<target>生成日志文件</target>
 
-<source>Maximum number of log files:</source>
-<target>最大的日志文件数:</target>
+<source>Select folder to save log files</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>Batch settings</source>
 <target>批处理设置</target>
 
+<source>Compare by...</source>
+<target>比较选项...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+文件被认为是相同的，如果
+     - 最后修改时间和日期
+     - 文件大小
+是相同的
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+文件被认为是相同的，如果
+     - 文件内容
+是相同的
+</target>
+
+<source>Symbolic Link handling</source>
+<target>符号连接处理方式</target>
+
+<source>OK</source>
+<target>确定</target>
+
 <source>Select variant:</source>
 <target>选择变化的:</target>
 
@@ -606,8 +639,26 @@ The command is triggered if:
 <source>Deletion handling</source>
 <target>删除处理</target>
 
-<source>On completion:</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 when deleting or overwriting files</source>
+<target>当删除或覆盖文件时使用回收站</target>
+
+<source>Versioning</source>
+<target>保留历史版本</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>移动时间标记文件到指定的文件夹</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>限制每个文件的最大历史版本数</target>
 
 <source>Configuration</source>
 <target>配置</target>
@@ -630,39 +681,6 @@ The command is triggered if:
 <source>Conflict/item cannot be categorized</source>
 <target>冲突/项目未能被分类</target>
 
-<source>OK</source>
-<target>确定</target>
-
-<source>Compare by...</source>
-<target>比较选项...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-文件被认为是相同的，如果
-     - 最后修改时间和日期
-     - 文件大小
-是相同的
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-文件被认为是相同的，如果
-     - 文件内容
-是相同的
-</target>
-
-<source>Symbolic Link handling</source>
-<target>符号连接处理方式</target>
-
 <source>Synchronizing...</source>
 <target>同步中...</target>
 
@@ -678,8 +696,8 @@ is the same
 <source>Donate with PayPal</source>
 <target>通过PayPal捐赠</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>非常感谢以下本地化 FreeFileSync 的工作人员:</target>
+<source>Many thanks for localization:</source>
+<target>非常感谢以下本地化翻译者:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>欢迎反馈意见和提出建议</target>
@@ -696,9 +714,6 @@ is the same
 <source>Published under the GNU General Public License</source>
 <target>在GNU通用公共许可下发布</target>
 
-<source>Use Recycle Bin</source>
-<target>使用回收站</target>
-
 <source>Delete on both sides</source>
 <target>从两侧删除</target>
 
@@ -768,8 +783,8 @@ Note: File names must be relative to base directories!
 <source>Statistics</source>
 <target>统计</target>
 
-<source>Do not show this dialog again</source>
-<target>不要再显示此对话框</target>
+<source>Don't show this dialog again</source>
+<target>不要再显示这个对话框</target>
 
 <source>Find what:</source>
 <target>要查找什么:</target>
@@ -852,11 +867,8 @@ Note: File names must be relative to base directories!
 <source>Do you want to save changes to %x?</source>
 <target>是否要保存修改到 %x ?</target>
 
-<source>Save</source>
-<target>保存</target>
-
-<source>Don't Save</source>
-<target>不保存</target>
+<source>Do&n't save</source>
+<target>不保存(&N)</target>
 
 <source>Configuration loaded!</source>
 <target>配置已加载!</target>
@@ -948,8 +960,8 @@ Note: File names must be relative to base directories!
 <source>Show files that won't be copied</source>
 <target>显示将不被复制的文件</target>
 
-<source>All directories in sync!</source>
-<target>所有目录已同步!</target>
+<source>All folders are in sync!</source>
+<target>所有文件夹都是同步的!</target>
 
 <source>Comma separated list</source>
 <target>逗号分隔的列表</target>
@@ -1034,6 +1046,9 @@ Note: File names must be relative to base directories!
 <source>Pause</source>
 <target>暂停</target>
 
+<source>Logging</source>
+<target>记录</target>
+
 <source>Cannot find %x</source>
 <target>找不到 %x</target>
 
@@ -1113,21 +1128,6 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>遗留为未解决的冲突</target>
 
-<source>Delete permanently</source>
-<target>永久性删除</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>永久性删除或覆盖文件</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>当删除或覆盖文件时使用回收站</target>
-
-<source>Versioning</source>
-<target>保留历史版本</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>移动文件到一个以时间标记命名的子文件夹</target>
-
 <source>Files</source>
 <target>文件</target>
 
@@ -1215,8 +1215,11 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>无法复制文件 %x 到 %y.</target>
 
-<source>Cannot read directory %x.</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>
@@ -1242,6 +1245,9 @@ Note: File names must be relative to base directories!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>设置默认的同步方向:旧文件会被新文件覆盖.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>如下路径的回收站不可用! 文件会被永久删除:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>你可以忽略这个错误而认为文件夹是空的.</target>
 
@@ -1251,6 +1257,9 @@ Note: File names must be relative to base directories!
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>目录有依赖性！在设立同步规则时请小心:</target>
 
+<source>Start comparison</source>
+<target>开始比较</target>
+
 <source>Preparing synchronization...</source>
 <target>正在准备同步...</target>
 
@@ -1263,6 +1272,9 @@ Note: File names must be relative to base directories!
 <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>Symbolic links %x have the same date but a different target.</source>
 <target>符号连接 %x 有相同的日期但目标不同.</target>
 
@@ -1278,9 +1290,6 @@ Note: File names must be relative to base directories!
 <source>Both sides are equal</source>
 <target>两侧相等</target>
 
-<source>Items have different attributes</source>
-<target>项目有不同的属性</target>
-
 <source>Copy new item to left</source>
 <target>复制新项目到左侧</target>
 
@@ -1395,14 +1404,11 @@ Note: File names must be relative to base directories!
 <source>Available:</source>
 <target>可用:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>如下路径的回收站不可用! 文件会被永久删除:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>一个将被修改的文件夹是多个文件夹对的一部分. 请重新检视同步设置.</target>
 
-<source>Processing folder pair:</source>
-<target>正在处理成对文件夹:</target>
+<source>Synchronizing folder pair:</source>
+<target>正在同步成对的文件夹:</target>
 
 <source>Target folder %x already existing.</source>
 <target>目标文件夹 %x 已经存在.</target>
diff --git a/BUILD/Languages/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng
index ab6f6be8..69e79b2d 100644
--- a/BUILD/Languages/chinese_traditional.lng
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>正在搜尋資料夾 %x...</target>
 
-<source>Batch execution</source>
-<target>批次處理執行</target>
-
 <source>Items processed:</source>
 <target>已處理項目：</target>
 
@@ -34,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>中止請求：正在等待目前操作完成...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>即時同步 - 自動同步</target>
 
@@ -61,12 +61,12 @@
 <source>Create a batch job</source>
 <target>新建一個批次處理作業</target>
 
-<source>Synchronization settings</source>
-<target>同步設定</target>
-
 <source>Comparison settings</source>
 <target>比對設定</target>
 
+<source>Synchronization settings</source>
+<target>同步設定</target>
+
 <source>About</source>
 <target>關於</target>
 
@@ -88,27 +88,6 @@
 <source>Select time span</source>
 <target>選擇時間間隔</target>
 
-<source>Show pop-up</source>
-<target>顯示彈出視窗</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>在彈出視窗上顯示錯誤或警告訊息</target>
-
-<source>Ignore errors</source>
-<target>忽略錯誤</target>
-
-<source>Hide all error and warning messages</source>
-<target>隱藏所有錯誤和警告訊息</target>
-
-<source>Exit instantly</source>
-<target>立即退出</target>
-
-<source>Abort synchronization immediately</source>
-<target>立即中止同步</target>
-
-<source>Browse</source>
-<target>瀏覽</target>
-
 <source>Invalid command line:</source>
 <target>無效的命令列：</target>
 
@@ -244,8 +223,8 @@
 <source>&Open...</source>
 <target>開啟(&O)...</target>
 
-<source>Save &As...</source>
-<target>另存新檔(&A)...</target>
+<source>Save &as...</source>
+<target>另存新檔(&a)...</target>
 
 <source>&Quit</source>
 <target>離開(&Q)</target>
@@ -286,6 +265,9 @@
 <source>Remove folder</source>
 <target>移除資料夾</target>
 
+<source>Browse</source>
+<target>瀏覽</target>
+
 <source>Select a folder</source>
 <target>選擇一個資料夾</target>
 
@@ -318,8 +300,8 @@ The command is triggered if:
 <source>Cancel</source>
 <target>取消</target>
 
-<source>(Build: %x)</source>
-<target>(建立：%x)</target>
+<source>Build: %x</source>
+<target>建立：%x</target>
 
 <source>All files</source>
 <target>所有檔案</target>
@@ -339,9 +321,6 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>資料夾輸入欄位是空的。</target>
 
-<source>Logging</source>
-<target>日誌記錄</target>
-
 <source>File time and size</source>
 <target>檔案大小和日期</target>
 
@@ -505,10 +484,10 @@ The command is triggered if:
 <target>開始同步</target>
 
 <source>Add folder pair</source>
-<target>新增一對資料夾</target>
+<target>新增配對資料夾</target>
 
 <source>Remove folder pair</source>
-<target>移除一對資料夾</target>
+<target>移除配對資料夾</target>
 
 <source>Swap sides</source>
 <target>兩邊交換</target>
@@ -522,11 +501,11 @@ The command is triggered if:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>上次使用的配置(按DEL鍵，從清單中移除)</target>
 
-<source>Hide excluded items</source>
-<target>隱藏被排除的項目</target>
+<source>Show excluded items</source>
+<target>顯示排除的項目</target>
 
-<source>Hide filtered or temporarily excluded files</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>
@@ -570,24 +549,72 @@ The command is triggered if:
 <source>Right</source>
 <target>右邊</target>
 
-<source>Status feedback</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>On completion:</source>
+<target>完成後：</target>
 
 <source>Show progress dialog</source>
 <target>顯示進度對話框</target>
 
-<source>Error handling</source>
-<target>錯誤處理</target>
+<source>Generate log file</source>
+<target>產生日誌檔</target>
+
+<source>Select folder to save log files</source>
+<target>選擇要儲存日誌檔的資料夾</target>
 
-<source>Maximum number of log files:</source>
-<target>日誌檔的最大數目：</target>
+<source>Limit</source>
+<target>限制</target>
 
-<source>Select folder to save log files:</source>
-<target>選擇要儲存日誌檔的資料夾：</target>
+<source>Limit maximum number of log files</source>
+<target>限制日誌檔的最大數量</target>
 
 <source>Batch settings</source>
 <target>批次處理設定</target>
 
+<source>Compare by...</source>
+<target>比對選項...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>如果檔案大小和最後修改時間和日期相同則判斷兩者相同</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>如果檔案内容相同則判斷兩者相同</target>
+
+<source>Symbolic Link handling</source>
+<target>符號連結處理</target>
+
+<source>OK</source>
+<target>確定</target>
+
 <source>Select variant:</source>
 <target>選擇變數：</target>
 
@@ -606,8 +633,26 @@ The command is triggered if:
 <source>Deletion handling</source>
 <target>刪除處理</target>
 
-<source>On completion:</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 when deleting or overwriting files</source>
+<target>當刪除或覆蓋檔案時使用資源回收筒</target>
+
+<source>Versioning</source>
+<target>版本控制</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>將時間戳記檔案移動到指定的資料夾</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>限制每個檔案版本的最大數量</target>
 
 <source>Configuration</source>
 <target>配置</target>
@@ -630,30 +675,6 @@ The command is triggered if:
 <source>Conflict/item cannot be categorized</source>
 <target>衝突/項目不能被分類</target>
 
-<source>OK</source>
-<target>確定</target>
-
-<source>Compare by...</source>
-<target>比對選項...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>如果檔案大小和最後修改時間和日期相同則判斷兩者相同</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>如果檔案内容相同則判斷兩者相同</target>
-
-<source>Symbolic Link handling</source>
-<target>符號連結處理</target>
-
 <source>Synchronizing...</source>
 <target>正在同步...</target>
 
@@ -669,8 +690,8 @@ is the same
 <source>Donate with PayPal</source>
 <target>使用PayPal捐款</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>非常感謝FreeFileSync當地語系化的工作人員：</target>
+<source>Many thanks for localization:</source>
+<target>非常感謝本地化語系翻譯工作人員：</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>歡迎反饋意見和建議</target>
@@ -687,9 +708,6 @@ is the same
 <source>Published under the GNU General Public License</source>
 <target>在GNU通用公共許可證下發佈</target>
 
-<source>Use Recycle Bin</source>
-<target>使用資源回收筒</target>
-
 <source>Delete on both sides</source>
 <target>兩邊都刪除</target>
 
@@ -759,7 +777,7 @@ Note: File names must be relative to base directories!
 <source>Statistics</source>
 <target>統計</target>
 
-<source>Do not show this dialog again</source>
+<source>Don't show this dialog again</source>
 <target>不要再顯示此對話框</target>
 
 <source>Find what:</source>
@@ -778,7 +796,7 @@ Note: File names must be relative to base directories!
 <target>主欄位</target>
 
 <source>Folder pairs</source>
-<target>資料夾對</target>
+<target>配對資料夾</target>
 
 <source>Overview</source>
 <target>摘要</target>
@@ -843,11 +861,8 @@ Note: File names must be relative to base directories!
 <source>Do you want to save changes to %x?</source>
 <target>是否要更改儲存到 %x？</target>
 
-<source>Save</source>
-<target>儲存</target>
-
-<source>Don't Save</source>
-<target>不要儲存</target>
+<source>Do&n't save</source>
+<target>不儲存(&n)</target>
 
 <source>Configuration loaded!</source>
 <target>配置已載入！</target>
@@ -939,8 +954,8 @@ Note: File names must be relative to base directories!
 <source>Show files that won't be copied</source>
 <target>顯示將不會被複製的檔案</target>
 
-<source>All directories in sync!</source>
-<target>同步所有目錄！</target>
+<source>All folders are in sync!</source>
+<target>所有資料夾都是同步的！</target>
 
 <source>Comma separated list</source>
 <target>逗號分隔清單</target>
@@ -1025,6 +1040,9 @@ Note: File names must be relative to base directories!
 <source>Pause</source>
 <target>暫停</target>
 
+<source>Logging</source>
+<target>日誌記錄</target>
+
 <source>Cannot find %x</source>
 <target>找不到 %x</target>
 
@@ -1104,21 +1122,6 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>保留給未解決的衝突</target>
 
-<source>Delete permanently</source>
-<target>永久刪除</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>永久刪除或覆蓋檔案</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>當刪除或覆蓋檔案時使用資源回收筒</target>
-
-<source>Versioning</source>
-<target>版本控制</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>將檔移動到一個有時間戳記的子資料夾</target>
-
 <source>Files</source>
 <target>檔案</target>
 
@@ -1206,8 +1209,11 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>無法複製檔案 %x 到 %y。</target>
 
-<source>Cannot read directory %x.</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>
@@ -1233,6 +1239,9 @@ Note: File names must be relative to base directories!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>設定預設同步方向：舊檔案會被較新的檔案覆蓋。</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>資源回收筒不可用於以下路徑！相反的，檔案將永遠被刪除：</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>您可以忽略此錯誤，考慮到空的資料夾。</target>
 
@@ -1242,6 +1251,9 @@ Note: File names must be relative to base directories!
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>目錄有依靠性！請小心設定同步規則：</target>
 
+<source>Start comparison</source>
+<target>開始比較</target>
+
 <source>Preparing synchronization...</source>
 <target>正在準備同步...</target>
 
@@ -1254,6 +1266,9 @@ Note: File names must be relative to base directories!
 <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>Symbolic links %x have the same date but a different target.</source>
 <target>%x 的符號連結具有相同的日期，但不同的目標。</target>
 
@@ -1269,9 +1284,6 @@ Note: File names must be relative to base directories!
 <source>Both sides are equal</source>
 <target>兩邊都相同</target>
 
-<source>Items have different attributes</source>
-<target>項目具有不同屬性</target>
-
 <source>Copy new item to left</source>
 <target>複製新的項目到左邊</target>
 
@@ -1335,6 +1347,9 @@ Note: File names must be relative to base directories!
 <source>Moving symbolic link %x to %y</source>
 <target>正在移動符號連結 %x 到 %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>正在新建檔案 %x</target>
 
@@ -1386,14 +1401,11 @@ Note: File names must be relative to base directories!
 <source>Available:</source>
 <target>可用：</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>資源回收筒不可用於以下路徑！相反的，檔案將永遠被刪除：</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
-<target>一個將被修改的資料夾，是多個資料夾對的一部分。請檢查同步設定。</target>
+<target>一個將被修改的資料夾，是多個配對資料夾的一部分。請檢查同步設定。</target>
 
-<source>Processing folder pair:</source>
-<target>處理一對資料夾：</target>
+<source>Synchronizing folder pair:</source>
+<target>同步配對資料夾：</target>
 
 <source>Target folder %x already existing.</source>
 <target>目標資料夾 %x 已存在。</target>
diff --git a/BUILD/Languages/croatian.lng b/BUILD/Languages/croatian.lng
index 6a07aff7..91e26f43 100644
--- a/BUILD/Languages/croatian.lng
+++ b/BUILD/Languages/croatian.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>Tražim mapu %x...</target>
 
-<source>Batch execution</source>
-<target>Slijedno izvršavanje</target>
-
 <source>Items processed:</source>
 <target>Obrađeni elementi:</target>
 
@@ -34,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Prekid zahtjevan: čekam da se trenutna akcija završi...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatska Sinkronizacija</target>
 
@@ -61,12 +61,12 @@
 <source>Create a batch job</source>
 <target>Izradi slijedni zadatak</target>
 
-<source>Synchronization settings</source>
-<target>Postavke sinkronizacije</target>
-
 <source>Comparison settings</source>
 <target>Postavke usporedbe</target>
 
+<source>Synchronization settings</source>
+<target>Postavke sinkronizacije</target>
+
 <source>About</source>
 <target>O programu</target>
 
@@ -88,27 +88,6 @@
 <source>Select time span</source>
 <target>Izaberite mjerni raspon</target>
 
-<source>Show pop-up</source>
-<target>Prikaži skočni prozor</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Prikaži skočni prozor pri greškama i upozorenjima</target>
-
-<source>Ignore errors</source>
-<target>Ignoriraj greške</target>
-
-<source>Hide all error and warning messages</source>
-<target>Sakrij sve greške i upozorenja</target>
-
-<source>Exit instantly</source>
-<target>Izađi trenutno</target>
-
-<source>Abort synchronization immediately</source>
-<target>Odmah prekini sinkronizaciju</target>
-
-<source>Browse</source>
-<target>Odaberi</target>
-
 <source>Invalid command line:</source>
 <target>Netočna naredba:</target>
 
@@ -250,8 +229,8 @@
 <source>&Open...</source>
 <target>&Otvori...</target>
 
-<source>Save &As...</source>
-<target>Spremi kao...</target>
+<source>Save &as...</source>
+<target>Spremiti &kao...</target>
 
 <source>&Quit</source>
 <target>&Izlaz</target>
@@ -292,6 +271,9 @@
 <source>Remove folder</source>
 <target>Ukloni mapu</target>
 
+<source>Browse</source>
+<target>Odaberi</target>
+
 <source>Select a folder</source>
 <target>Izaberite mapu</target>
 
@@ -324,8 +306,8 @@ Naredba će biti pokrenuta ako se:
 <source>Cancel</source>
 <target>Odustani</target>
 
-<source>(Build: %x)</source>
-<target>(Inačnica: %x)</target>
+<source>Build: %x</source>
+<target>Inačnica: %x</target>
 
 <source>All files</source>
 <target>Sve datoteke</target>
@@ -345,9 +327,6 @@ Naredba će biti pokrenuta ako se:
 <source>A folder input field is empty.</source>
 <target>Polje za odabir foldera je prazno.</target>
 
-<source>Logging</source>
-<target>Zapisivanje</target>
-
 <source>File time and size</source>
 <target>Vrijeme i veličina datoteke</target>
 
@@ -528,11 +507,11 @@ Naredba će biti pokrenuta ako se:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Zadnje korištene postavke (pretisite DEL za ukloniti s liste)</target>
 
-<source>Hide excluded items</source>
-<target>Sakrij isključene stavke</target>
+<source>Show excluded items</source>
+<target>Prikaži isključene stavke</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Sakrij filtrirane ili trenutno isključene datoteke</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Prikaži filtrirane ili privremeno izdvojene datoteke</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Broj datoteka i foldera koji će se stvoriti</target>
@@ -576,24 +555,81 @@ Naredba će biti pokrenuta ako se:
 <source>Right</source>
 <target>Desno</target>
 
-<source>Status feedback</source>
-<target>Status veze</target>
+<source>Error handling</source>
+<target>Greška pri obradi</target>
+
+<source>Ignore</source>
+<target>Ignoriraj</target>
+
+<source>Hide all error and warning messages</source>
+<target>Sakrij sve greške i upozorenja</target>
+
+<source>Pop-up</source>
+<target>Pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Prikaži skočni prozor pri greškama i upozorenjima</target>
+
+<source>Exit</source>
+<target>Izađi</target>
+
+<source>Abort synchronization on first error</source>
+<target>Prekini sinkronizaciju pri prvoj pogrešci</target>
+
+<source>On completion:</source>
+<target>Pri završetku</target>
 
 <source>Show progress dialog</source>
 <target>Prikaži napredak</target>
 
-<source>Error handling</source>
-<target>Greška pri obradi</target>
+<source>Generate log file</source>
+<target>Generiraj izvješće</target>
+
+<source>Select folder to save log files</source>
+<target>Odaberi mapu za spremanje izvješća</target>
 
-<source>Maximum number of log files:</source>
-<target>Maksimalan broj izvješća:</target>
+<source>Limit</source>
+<target>Granica</target>
 
-<source>Select folder to save log files:</source>
-<target>Odabrati mapu za spremanje izvješća</target>
+<source>Limit maximum number of log files</source>
+<target>Ograniči maksimalan broj izvješća</target>
 
 <source>Batch settings</source>
 <target>Slijedne postavke</target>
 
+<source>Compare by...</source>
+<target>Usporedi prema...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Datoteke se smatraju jednake ako su im
+     - vrijeme zadnje promjene i datum
+     - veličina datoteke
+jednaki
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Datoteke se smatraju jednake ako im je
+     - sadržaj datoteke
+jednak
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Upravljanje simboličnim poveznicama</target>
+
+<source>OK</source>
+<target>U redu</target>
+
 <source>Select variant:</source>
 <target>Izaberite varijantu:</target>
 
@@ -612,8 +648,26 @@ Naredba će biti pokrenuta ako se:
 <source>Deletion handling</source>
 <target>Upravljanje pri brisanju</target>
 
-<source>On completion:</source>
-<target>Pri završetku</target>
+<source>Permanent</source>
+<target>Trajno</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Trajno izbriši ili prepiši datoteke</target>
+
+<source>Recycle Bin</source>
+<target>Koš za smeće</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Koristi Koš za smeće pri brisanju ili prepisivanju datoteka</target>
+
+<source>Versioning</source>
+<target>Verzija</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Premjesti vremenski-označene datoteke u određenu mapu</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Ograniči maksimalan broj verzija po datoteci</target>
 
 <source>Configuration</source>
 <target>Postavke</target>
@@ -636,39 +690,6 @@ Naredba će biti pokrenuta ako se:
 <source>Conflict/item cannot be categorized</source>
 <target>Sukob/stavka ne može biti razvrstana</target>
 
-<source>OK</source>
-<target>U redu</target>
-
-<source>Compare by...</source>
-<target>Usporedi prema...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Datoteke se smatraju jednake ako su im
-     - vrijeme zadnje promjene i datum
-     - veličina datoteke
-jednaki
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Datoteke se smatraju jednake ako im je
-     - sadržaj datoteke
-jednak
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Upravljanje simboličnim poveznicama</target>
-
 <source>Synchronizing...</source>
 <target>Sinkroniziram...</target>
 
@@ -684,8 +705,8 @@ jednak
 <source>Donate with PayPal</source>
 <target>Doniraj s PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Zahvale za prijevod FreeFileSync idu:</target>
+<source>Many thanks for localization:</source>
+<target>Velike zahvale idu:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Povratne informacije i prijedlozi su dobrodošli</target>
@@ -702,9 +723,6 @@ jednak
 <source>Published under the GNU General Public License</source>
 <target>Objavljeno pod licencom GNU General Public</target>
 
-<source>Use Recycle Bin</source>
-<target>Uporabi Koš za smeće</target>
-
 <source>Delete on both sides</source>
 <target>Izbriši na obje strane</target>
 
@@ -774,7 +792,7 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Statistics</source>
 <target>Statistika</target>
 
-<source>Do not show this dialog again</source>
+<source>Don't show this dialog again</source>
 <target>Ne prikazuj ovaj prozor ponovno</target>
 
 <source>Find what:</source>
@@ -858,11 +876,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Do you want to save changes to %x?</source>
 <target>Da li želite spremiti izmjene za %x?</target>
 
-<source>Save</source>
-<target>Spremiti</target>
-
-<source>Don't Save</source>
-<target>Nemoj spremati</target>
+<source>Do&n't save</source>
+<target>Ne spremaj</target>
 
 <source>Configuration loaded!</source>
 <target>Postavke učitane!</target>
@@ -954,8 +969,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Show files that won't be copied</source>
 <target>Prikaži datoteke koje neće biti kopirane</target>
 
-<source>All directories in sync!</source>
-<target>Svi direktoriji su sinkronizirani!</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>
@@ -1048,6 +1063,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Pause</source>
 <target>Pauziraj</target>
 
+<source>Logging</source>
+<target>Zapisivanje</target>
+
 <source>Cannot find %x</source>
 <target>Nemogu pronać %x</target>
 
@@ -1131,21 +1149,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Leave as unresolved conflict</source>
 <target>Ostavi kao neriješeni sukob</target>
 
-<source>Delete permanently</source>
-<target>Trajno izbriši</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Trajno izbriši ili prepiši datoteke</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Koristi Koš za smeće pri brisanju ili prepisivanju datoteka</target>
-
-<source>Versioning</source>
-<target>Verzija</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Prebaci datoteke u vremenski-blokirani podfolder</target>
-
 <source>Files</source>
 <target>Datoteke</target>
 
@@ -1239,8 +1242,11 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Cannot copy file %x to %y.</source>
 <target>Ne mogu kopirati datoteku %x na %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Ne mogu čitati mapu %x.</target>
+<source>Cannot open directory %x.</source>
+<target>Ne mogu otvoriti mapu %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Ne mogu izlistati mapu %x.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Detektiran bezograničeni direktorij</target>
@@ -1266,6 +1272,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Postavljam zadani sinkronizacijski smijer: Stare datoteke će biti prepisane novim datotekama.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Koš za smeće nije dostupan za navedene putanje! Umjesto toga datoteke će biti trajno izbrisane:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Možete ignorirati ovu pogrešku i smatrati mapu praznom</target>
 
@@ -1275,6 +1284,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <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>Preparing synchronization...</source>
 <target>Pripremam sinkronizaciju</target>
 
@@ -1287,6 +1299,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Files %x have the same date but a different size!</source>
 <target>Datoteke %x imaju isti datum ali drugačiju veličinu!</target>
 
+<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>
 
@@ -1302,9 +1317,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Both sides are equal</source>
 <target>Obje strane su jednake</target>
 
-<source>Items have different attributes</source>
-<target>Stavke imaju različite atribute</target>
-
 <source>Copy new item to left</source>
 <target>Kopiraj novu stavku lijevo</target>
 
@@ -1368,6 +1380,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Moving symbolic link %x to %y</source>
 <target>Premještam simboličnu poveznicu %x u %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>Izrađujem datoteku %x</target>
 
@@ -1419,14 +1434,11 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Available:</source>
 <target>Dostupno:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Koš za smeće nije dostupan za navedene putanje! Umjesto toga datoteke će biti trajno izbrisane:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Mapa će biti uređena koja je dio više pari mapa. Molimo provjerite sinkronizacijske postavke.</target>
 
-<source>Processing folder pair:</source>
-<target>Obrađujem parove mapa:</target>
+<source>Synchronizing folder pair:</source>
+<target>Par sinkronizirane mape:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Odredišna mapa %x već postoji.</target>
diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng
index a294e21c..2ff7d45a 100644
--- a/BUILD/Languages/czech.lng
+++ b/BUILD/Languages/czech.lng
@@ -10,6 +10,15 @@
 <source>Searching for folder %x...</source>
 <target>Otevírání složky %x</target>
 
+<source>Items processed:</source>
+<target>Zpracováno položek:</target>
+
+<source>Items remaining:</source>
+<target>Zbývá položek:</target>
+
+<source>Total time:</source>
+<target>Celkový čas:</target>
+
 <source>Show in Explorer</source>
 <target>Zobrazit v Průzkumníkovi</target>
 
@@ -49,12 +58,12 @@
 <source>Create a batch job</source>
 <target>Vytvořit dávku</target>
 
-<source>Synchronization settings</source>
-<target>Nastavení synchronizace</target>
-
 <source>Comparison settings</source>
 <target>Nastavení porovnání</target>
 
+<source>Synchronization settings</source>
+<target>Nastavení synchronizace</target>
+
 <source>About</source>
 <target>O Programu</target>
 
@@ -76,27 +85,6 @@
 <source>Select time span</source>
 <target>Časové rozmezí</target>
 
-<source>Show pop-up</source>
-<target>Zobrazit okno</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Zobrazit hlášení při chybě nebo varování</target>
-
-<source>Ignore errors</source>
-<target>Přeskočit chyby</target>
-
-<source>Hide all error and warning messages</source>
-<target>Skrýt všechny chyby a varování</target>
-
-<source>Exit instantly</source>
-<target>Ukončit ihned</target>
-
-<source>Abort synchronization immediately</source>
-<target>Přerušit synchronizaci ihned</target>
-
-<source>Browse</source>
-<target>Procházet</target>
-
 <source>Invalid command line:</source>
 <target>Neplatný příkaz:</target>
 
@@ -238,7 +226,7 @@
 <source>&Open...</source>
 <target>&Otevřít...</target>
 
-<source>Save &As...</source>
+<source>Save &as...</source>
 <target>Uložit &jako...</target>
 
 <source>&Quit</source>
@@ -280,6 +268,9 @@
 <source>Remove folder</source>
 <target>Odstranit adresář</target>
 
+<source>Browse</source>
+<target>Procházet</target>
+
 <source>Select a folder</source>
 <target>Vyberte adresář</target>
 
@@ -312,8 +303,8 @@ Příkaz je spuštěn když:
 <source>Cancel</source>
 <target>Zrušit</target>
 
-<source>(Build: %x)</source>
-<target>(Build: %x)</target>
+<source>Build: %x</source>
+<target>Verze: %x</target>
 
 <source>All files</source>
 <target>Všechny soubory</target>
@@ -333,9 +324,6 @@ Příkaz je spuštěn když:
 <source>A folder input field is empty.</source>
 <target>Není zadána vstupní složka.</target>
 
-<source>Logging</source>
-<target>Záznam zpracování</target>
-
 <source>File time and size</source>
 <target>Podle velikosti a data souboru</target>
 
@@ -357,21 +345,6 @@ Příkaz je spuštěn když:
 <source>FreeFileSync batch</source>
 <target>FreeFileSync dávka</target>
 
-<source>Batch execution</source>
-<target>Spuštění dávky</target>
-
-<source>Items processed:</source>
-<target>Zpracováno položek:</target>
-
-<source>Items remaining:</source>
-<target>Zbývá položek:</target>
-
-<source>Total time:</source>
-<target>Celkový čas:</target>
-
-<source>Stop</source>
-<target>Stop</target>
-
 <source>Synchronization aborted!</source>
 <target>Synchronizace zrušena!</target>
 
@@ -531,11 +504,11 @@ Příkaz je spuštěn když:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Posledně použité konfigurace (pomocí DEL můžete položku smazat)</target>
 
-<source>Hide excluded items</source>
-<target>Skrýt vynechané položky</target>
+<source>Show excluded items</source>
+<target>Zobrazit vynechané položky</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Skrýt filtrované nebo dočasně vynechané soubory</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Zobrazit filtrované nebo dočasně vynechané soubory</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Počet souborů a složek k vytvoření</target>
@@ -579,24 +552,81 @@ Příkaz je spuštěn když:
 <source>Right</source>
 <target>Pravý</target>
 
-<source>Status feedback</source>
-<target>Běh programu</target>
+<source>Error handling</source>
+<target>Zpracování chyb</target>
+
+<source>Ignore</source>
+<target>Přeskočit</target>
+
+<source>Hide all error and warning messages</source>
+<target>Skrýt všechny chyby a varování</target>
+
+<source>Pop-up</source>
+<target>Hlašení</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Zobrazit hlášení při chybě nebo varování</target>
+
+<source>Exit</source>
+<target>Konec</target>
+
+<source>Abort synchronization on first error</source>
+<target>Ukončit synchronizaci při první chybě</target>
+
+<source>On completion:</source>
+<target>Po dokončení:</target>
 
 <source>Show progress dialog</source>
 <target>Zobrazit průběh zpracování</target>
 
-<source>Error handling</source>
-<target>Zpracování chyb</target>
+<source>Generate log file</source>
+<target>Vytvořit záznamový soubor</target>
 
-<source>Maximum number of log files:</source>
-<target>Maximální počet záznamových souborů:</target>
+<source>Select folder to save log files</source>
+<target>Vyberte složku pro záznamové soubory</target>
 
-<source>Select folder to save log files:</source>
-<target>Vyberte složku pro záznamové soubory:</target>
+<source>Limit</source>
+<target>Omezení</target>
+
+<source>Limit maximum number of log files</source>
+<target>Omezení maximálního počtu záznamových souborů</target>
 
 <source>Batch settings</source>
 <target>Nastavení</target>
 
+<source>Compare by...</source>
+<target>Porovnat ...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Soubory jsou shodné jestliže
+     - datum i čas poslední změny
+     - velikost souboru
+jsou stejné
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Soubory jsou shodné jestliže
+     - obsah souboru
+je stejný
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Zpracování symbolických odkazů</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Vyberte variantu:</target>
 
@@ -615,8 +645,26 @@ Příkaz je spuštěn když:
 <source>Deletion handling</source>
 <target>Nastavení mazání</target>
 
-<source>On completion:</source>
-<target>Po dokončení:</target>
+<source>Permanent</source>
+<target>Trvale</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Smazat nebo přepsat soubory trvale</target>
+
+<source>Recycle Bin</source>
+<target>Koš</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Použít Koš při mazání nebo přepisu souborů</target>
+
+<source>Versioning</source>
+<target>Verzování</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Přesunout časově označení soubory do zvláštního adresáře</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Omezit maximální počet verzí jednoho souboru</target>
 
 <source>Configuration</source>
 <target>Konfigurace</target>
@@ -639,39 +687,6 @@ Příkaz je spuštěn když:
 <source>Conflict/item cannot be categorized</source>
 <target>Konflikty/položky které nelze zařadit</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Porovnat ...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Soubory jsou shodné jestliže
-     - datum i čas poslední změny
-     - velikost souboru
-jsou stejné
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Soubory jsou shodné jestliže
-     - obsah souboru
-je stejný
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Zpracování symbolických odkazů</target>
-
 <source>Synchronizing...</source>
 <target>Synchronizuji...</target>
 
@@ -679,7 +694,7 @@ je stejný
 <target>&Pauza</target>
 
 <source>Source code written in C++ utilizing:</source>
-<target>Zdrojový kód byl napsán kompletně v C++ s pomocí:</target>
+<target>Zdrojový kód byl napsán kompletně v C++ pomocí:</target>
 
 <source>If you like FreeFileSync</source>
 <target>Pokud se Vám FreeFileSync líbí</target>
@@ -687,7 +702,7 @@ je stejný
 <source>Donate with PayPal</source>
 <target>Přispět pomocí PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<source>Many thanks for localization:</source>
 <target>Poděkování za překlad FreeFileSync:</target>
 
 <source>Feedback and suggestions are welcome</source>
@@ -705,9 +720,6 @@ je stejný
 <source>Published under the GNU General Public License</source>
 <target>Vydáno pod GNU General Public License (GPL)</target>
 
-<source>Use Recycle Bin</source>
-<target>Použít Koš</target>
-
 <source>Delete on both sides</source>
 <target>Smazat z obou stran</target>
 
@@ -777,7 +789,7 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Statistics</source>
 <target>Statistika</target>
 
-<source>Do not show this dialog again</source>
+<source>Don't show this dialog again</source>
 <target>Tento dialog již nezobrazovat</target>
 
 <source>Find what:</source>
@@ -861,10 +873,7 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Do you want to save changes to %x?</source>
 <target>Uložit změny do %x?</target>
 
-<source>Save</source>
-<target>Uložit></target>
-
-<source>Don't Save</source>
+<source>Do&n't save</source>
 <target>Neukládat</target>
 
 <source>Configuration loaded!</source>
@@ -957,8 +966,8 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Show files that won't be copied</source>
 <target>Zobrazit soubory, které nebudou kopírovány</target>
 
-<source>All directories in sync!</source>
-<target>Všechny adresáře jsou synchronizovány!</target>
+<source>All folders are in sync!</source>
+<target>Všechny složky jsou synchronizovány!</target>
 
 <source>Comma separated list</source>
 <target>Text oddělený čárkami</target>
@@ -1051,6 +1060,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Pause</source>
 <target>Pauza</target>
 
+<source>Logging</source>
+<target>Záznam zpracování</target>
+
 <source>Cannot find %x</source>
 <target>Nelze najít %x</target>
 
@@ -1134,21 +1146,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Leave as unresolved conflict</source>
 <target>Ponechat jako nevyřešený konflikt</target>
 
-<source>Delete permanently</source>
-<target>Odstranit trvale</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Smazat nebo přepsat soubory trvale</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Použít Koš při mazání nebo přepisu souborů</target>
-
-<source>Versioning</source>
-<target>Verzování</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Přesunout soubory do časově označené podsložky</target>
-
 <source>Files</source>
 <target>Soubory</target>
 
@@ -1242,8 +1239,11 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Cannot copy file %x to %y.</source>
 <target>Nelze kopírovat soubor %x do %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Nelze číst adresář %x.</target>
+<source>Cannot open directory %x.</source>
+<target>Nelze otevřít adresář %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Nelze procházet adresář %x.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Nalezena nekonečná adresářová smyčka.</target>
@@ -1269,6 +1269,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Nastaven výchozí způsob synchronizace: Staré soubory budou nahrazeny novými.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Nelze použít Koš pro následující umístění! Soubory budou odstraněny trvale:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Tuto chybu můžete přeskočit a považovat neexistující složku jako prázdnou.</target>
 
@@ -1278,6 +1281,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <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>
 
+<source>Start comparison</source>
+<target>Spustit porovnání</target>
+
 <source>Preparing synchronization...</source>
 <target>Příprava synchronizace...</target>
 
@@ -1290,6 +1296,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Files %x have the same date but a different size!</source>
 <target>Soubory %x mají stejné datum a čas ale rozdílnou velikost!</target>
 
+<source>Items differ in attributes only</source>
+<target>Položky se liší pouze ve vlastnostech</target>
+
 <source>Symbolic links %x have the same date but a different target.</source>
 <target>Symbolický odkaz %x má stejné datum ale jiný cíl.</target>
 
@@ -1305,9 +1314,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Both sides are equal</source>
 <target>Obě strany jsou shodné</target>
 
-<source>Items have different attributes</source>
-<target>Položky se liší ve vlastnostech</target>
-
 <source>Copy new item to left</source>
 <target>Kopírovat novou položku do leva</target>
 
@@ -1422,14 +1428,11 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Available:</source>
 <target>K dispozici</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Nelze použít Koš pro následující umístění! Soubory budou odstraněny trvale:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Bude změněna složka, která je součástí adresářového páru vícenásobného porovnání. Prosím zkontrolujte si nastavení synchronizacem.</target>
 
-<source>Processing folder pair:</source>
-<target>Zpracovávání adresářové páru:</target>
+<source>Synchronizing folder pair:</source>
+<target>Zpracovávání páru složek:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Cílova složka %x již existuje.</target>
diff --git a/BUILD/Languages/danish.lng b/BUILD/Languages/danish.lng
index 4ebecf69..da76bd5e 100644
--- a/BUILD/Languages/danish.lng
+++ b/BUILD/Languages/danish.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>Søger efter mappen %x...</target>
 
-<source>Batch execution</source>
-<target>Batch afvikling</target>
-
 <source>Items processed:</source>
 <target>Enheder behandlet:</target>
 
@@ -61,12 +58,12 @@
 <source>Create a batch job</source>
 <target>Lav et batch job</target>
 
-<source>Synchronization settings</source>
-<target>Synkroniserings indstillinger</target>
-
 <source>Comparison settings</source>
 <target>Sammenlignings indstillinger</target>
 
+<source>Synchronization settings</source>
+<target>Synkroniserings indstillinger</target>
+
 <source>About</source>
 <target>Om</target>
 
@@ -88,27 +85,6 @@
 <source>Select time span</source>
 <target>Vælg tids område</target>
 
-<source>Show pop-up</source>
-<target>Vis pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Vis pop-up ved fejl eller advarsler</target>
-
-<source>Ignore errors</source>
-<target>Ignorer fejl</target>
-
-<source>Hide all error and warning messages</source>
-<target>Skjul beskeder om fejl og advarsler</target>
-
-<source>Exit instantly</source>
-<target>Afslut med det samme</target>
-
-<source>Abort synchronization immediately</source>
-<target>Abort synkronisering med det samme</target>
-
-<source>Browse</source>
-<target>Gennemse</target>
-
 <source>Invalid command line:</source>
 <target>Ugyldig kommando:</target>
 
@@ -247,8 +223,8 @@
 <source>&Open...</source>
 <target>&Åben...</target>
 
-<source>Save &As...</source>
-<target>Gem &Som...</target>
+<source>Save &as...</source>
+<target>Gem &som...</target>
 
 <source>&Quit</source>
 <target>&Afslut</target>
@@ -289,6 +265,9 @@
 <source>Remove folder</source>
 <target>Fjern mappe</target>
 
+<source>Browse</source>
+<target>Gennemse</target>
+
 <source>Select a folder</source>
 <target>Vælg en mappe</target>
 
@@ -321,8 +300,8 @@ Kommandoen udføres hvis:
 <source>Cancel</source>
 <target>Anuller</target>
 
-<source>(Build: %x)</source>
-<target>(Build: %x)</target>
+<source>Build: %x</source>
+<target>Build: %x</target>
 
 <source>All files</source>
 <target>Alle filer</target>
@@ -342,9 +321,6 @@ Kommandoen udføres hvis:
 <source>A folder input field is empty.</source>
 <target>Et mappe felt er tomt.</target>
 
-<source>Logging</source>
-<target>Logger</target>
-
 <source>File time and size</source>
 <target>Fil tid og størrelse</target>
 
@@ -525,11 +501,11 @@ Kommandoen udføres hvis:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Senest brugte konfigurationer (tryk DEL for at fjerne fra listen)</target>
 
-<source>Hide excluded items</source>
-<target>Skjul udelukkede emner</target>
+<source>Show excluded items</source>
+<target>Vis afviste emner</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Skjul filtrerede eller midlertidigt udelukkede filer</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Vis filtrerede eller midlertidigt afviste filer</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Antallet af filer og mapper der vil blive oprettet</target>
@@ -573,24 +549,81 @@ Kommandoen udføres hvis:
 <source>Right</source>
 <target>Højre</target>
 
-<source>Status feedback</source>
-<target>Status feedback</target>
+<source>Error handling</source>
+<target>Fejl håndtering</target>
+
+<source>Ignore</source>
+<target>Ignorer</target>
+
+<source>Hide all error and warning messages</source>
+<target>Skjul beskeder om fejl og advarsler</target>
+
+<source>Pop-up</source>
+<target>Pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Vis pop-up ved fejl eller advarsler</target>
+
+<source>Exit</source>
+<target>Afslut</target>
+
+<source>Abort synchronization on first error</source>
+<target>Stop synkronisering ved første fejl</target>
+
+<source>On completion:</source>
+<target>Før færdiggørelse:</target>
 
 <source>Show progress dialog</source>
 <target>Vis dialog boks</target>
 
-<source>Error handling</source>
-<target>Fejl håndtering</target>
+<source>Generate log file</source>
+<target>Lav log fil</target>
 
-<source>Maximum number of log files:</source>
-<target>Maksimalt antal log filer:</target>
+<source>Select folder to save log files</source>
+<target>Vælg destinations mappe til log filer</target>
 
-<source>Select folder to save log files:</source>
-<target>Vælg hvor log filer skal gemmes:</target>
+<source>Limit</source>
+<target>Grænse</target>
+
+<source>Limit maximum number of log files</source>
+<target>Maksimale antal log filer</target>
 
 <source>Batch settings</source>
 <target>Batch indstillinger</target>
 
+<source>Compare by...</source>
+<target>Sammenlign ved...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Filer bliver set som ens hvis
+     - sidst skrevne tid og dato
+     - fil størrelse
+er ens
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Filer er ens hvis
+     - fil indhold
+er det samme
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Link håndtering</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Vælg variant:</target>
 
@@ -609,8 +642,26 @@ Kommandoen udføres hvis:
 <source>Deletion handling</source>
 <target>Slette håndtering</target>
 
-<source>On completion:</source>
-<target>Før færdiggørelse:</target>
+<source>Permanent</source>
+<target>Permanent</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Slet eller overskriv filer permanent</target>
+
+<source>Recycle Bin</source>
+<target>Skralsespand</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Brug skraldespand ved sletning eller overskrivning</target>
+
+<source>Versioning</source>
+<target>Versionering</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Flyt tids-stemplede filer til den valgte mappe</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Begræns det maksimale antal fil versioner</target>
 
 <source>Configuration</source>
 <target>Konfiguration</target>
@@ -633,39 +684,6 @@ Kommandoen udføres hvis:
 <source>Conflict/item cannot be categorized</source>
 <target>Advarsel/enheden kan ikke kategoriseres</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Sammenlign ved...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Filer bliver set som ens hvis
-     - sidst skrevne tid og dato
-     - fil størrelse
-er ens
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Filer er ens hvis
-     - fil indhold
-er det samme
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Link håndtering</target>
-
 <source>Synchronizing...</source>
 <target>Synkroniserer...</target>
 
@@ -681,8 +699,8 @@ er det samme
 <source>Donate with PayPal</source>
 <target>Doner med PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Stor tak for lokalisering af FreeFileSync går til:</target>
+<source>Many thanks for localization:</source>
+<target>Mange tak for oversættelse til:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Feedback og forslag er velkomne</target>
@@ -699,9 +717,6 @@ er det samme
 <source>Published under the GNU General Public License</source>
 <target>Udgivet under GNU General Public Licence</target>
 
-<source>Use Recycle Bin</source>
-<target>Brug skraldespanden</target>
-
 <source>Delete on both sides</source>
 <target>Slet på begge sider</target>
 
@@ -771,8 +786,8 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Statistics</source>
 <target>Statestik</target>
 
-<source>Do not show this dialog again</source>
-<target>Vis ikke denne dialog igen</target>
+<source>Don't show this dialog again</source>
+<target>Vis ikke denne dialog boks igen</target>
 
 <source>Find what:</source>
 <target>Find:</target>
@@ -855,11 +870,8 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Do you want to save changes to %x?</source>
 <target>Ønsker du at gemme ændringerne til %x?</target>
 
-<source>Save</source>
-<target>Gem</target>
-
-<source>Don't Save</source>
-<target>Gem Ikke</target>
+<source>Do&n't save</source>
+<target>Gem ikke</target>
 
 <source>Configuration loaded!</source>
 <target>Konfiguration hentet!</target>
@@ -951,8 +963,8 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Show files that won't be copied</source>
 <target>Vis filer der ikke bliver kopieret</target>
 
-<source>All directories in sync!</source>
-<target>Alle biblioteker er synkroniseret!</target>
+<source>All folders are in sync!</source>
+<target>Alle mapper er synkroniserede</target>
 
 <source>Comma separated list</source>
 <target>Komma separeret list</target>
@@ -1041,6 +1053,9 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Pause</source>
 <target>Pause</target>
 
+<source>Logging</source>
+<target>Logger</target>
+
 <source>Cannot find %x</source>
 <target>Kan ikke finde %x</target>
 
@@ -1122,21 +1137,6 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Leave as unresolved conflict</source>
 <target>Efterlad som uløste konflikter</target>
 
-<source>Delete permanently</source>
-<target>Slet permanent</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Slet eller overskriv filer permanent</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Brug skraldespand ved sletning eller overskrivning</target>
-
-<source>Versioning</source>
-<target>Versionering</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Flyt filer til tids-stemplet undermappe</target>
-
 <source>Files</source>
 <target>Filer</target>
 
@@ -1227,8 +1227,11 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Cannot copy file %x to %y.</source>
 <target>Kan ikke kopiere filen %x til %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Kan ikke læse biblioteket %x.</target>
+<source>Cannot open directory %x.</source>
+<target>Kan ikke åbne bibliotek %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Kan ikke optælle biblioteket %x.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Opdaget en uendelig biblioteks løkke.</target>
@@ -1254,6 +1257,9 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Sætter standard synkroniseringsvej: Gamle filer bliver overskrevet med nyere.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Papirkurven kan ikke bruges på følgende stier! Filerne vil blive slettet permanent i stedet for:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Du kan ignorere denne fejl og betegne mappen som tom.</target>
 
@@ -1263,6 +1269,9 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Biblioteker er afhængige! Vær forsigtig når du laver synkroniserings reglerne:</target>
 
+<source>Start comparison</source>
+<target>Start sammenligning</target>
+
 <source>Preparing synchronization...</source>
 <target>Forbereder synkronisering...</target>
 
@@ -1275,6 +1284,9 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Files %x have the same date but a different size!</source>
 <target>Filerne %x har den samme dato men forskellig størrelse!</target>
 
+<source>Items differ in attributes only</source>
+<target>Enheder der kun har attributter til forskel</target>
+
 <source>Symbolic links %x have the same date but a different target.</source>
 <target>Linksene %x har samme dato men forskellige mål.</target>
 
@@ -1290,9 +1302,6 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Both sides are equal</source>
 <target>Begge sider er ens</target>
 
-<source>Items have different attributes</source>
-<target>Enhederne har forskellige attributter</target>
-
 <source>Copy new item to left</source>
 <target>Kopiere nyt emne mod venstre</target>
 
@@ -1407,14 +1416,11 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Available:</source>
 <target>Tilgængeligt:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Papirkurven kan ikke bruges på følgende stier! Filerne vil blive slettet permanent i stedet for:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>En mappe som er en del af flere mappe parringer vil blive ændret. Gennemse venligst synkroniserings indstillingerne.</target>
 
-<source>Processing folder pair:</source>
-<target>Behandler mappe par:</target>
+<source>Synchronizing folder pair:</source>
+<target>Synkroniserer mappe par:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Destinations mappen %x eksisterer allerede.</target>
diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng
index cc79add7..bf6459e1 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>Bezig met zoeken naar map %x...</target>
 
-<source>Batch execution</source>
-<target>Taak uitvoeren</target>
-
 <source>Items processed:</source>
 <target>Onderdelen verwerkt:</target>
 
@@ -34,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Bezig met afbreken: Wacht op beëindiging huidige bewerking...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Geautomatiseerde Synchronisatie</target>
 
@@ -61,12 +61,12 @@
 <source>Create a batch job</source>
 <target>Creëer een taaklijst</target>
 
-<source>Synchronization settings</source>
-<target>Synchronisatieinstellingen</target>
-
 <source>Comparison settings</source>
 <target>Vergelijksinstellingen</target>
 
+<source>Synchronization settings</source>
+<target>Synchronisatieinstellingen</target>
+
 <source>About</source>
 <target>Informatie</target>
 
@@ -88,27 +88,6 @@
 <source>Select time span</source>
 <target>Selecteer tijdsspanne</target>
 
-<source>Show pop-up</source>
-<target>Laat pop-up zien</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Laat pop-up zien bij foutmeldingen of waarschuwingen</target>
-
-<source>Ignore errors</source>
-<target>Negeer foutmeldingen</target>
-
-<source>Hide all error and warning messages</source>
-<target>Verberg alle fout- en waarschuwingsberichten</target>
-
-<source>Exit instantly</source>
-<target>Sluit meteen af</target>
-
-<source>Abort synchronization immediately</source>
-<target>Stop synchronisatie onmiddelijk</target>
-
-<source>Browse</source>
-<target>Verkennen</target>
-
 <source>Invalid command line:</source>
 <target>Ongeldige opdrachtregel:</target>
 
@@ -247,7 +226,7 @@
 <source>&Open...</source>
 <target>&Open...</target>
 
-<source>Save &As...</source>
+<source>Save &as...</source>
 <target>Ops&laan als...</target>
 
 <source>&Quit</source>
@@ -260,7 +239,7 @@
 <target>&Inhoud</target>
 
 <source>&About</source>
-<target>O&ver</target>
+<target>&Over</target>
 
 <source>&Help</source>
 <target>&Help</target>
@@ -289,6 +268,9 @@
 <source>Remove folder</source>
 <target>Verwijder map</target>
 
+<source>Browse</source>
+<target>Verkennen</target>
+
 <source>Select a folder</source>
 <target>Selecteer een map</target>
 
@@ -321,8 +303,8 @@ De opdracht word geactiveerd als:
 <source>Cancel</source>
 <target>Annuleren</target>
 
-<source>(Build: %x)</source>
-<target>(Build: %x)</target>
+<source>Build: %x</source>
+<target>Build: %x</target>
 
 <source>All files</source>
 <target>Alle bestanden</target>
@@ -342,9 +324,6 @@ De opdracht word geactiveerd als:
 <source>A folder input field is empty.</source>
 <target>Een map invoerveld is leeg.</target>
 
-<source>Logging</source>
-<target>Loggen</target>
-
 <source>File time and size</source>
 <target>Bestandstijd- en grootte</target>
 
@@ -525,11 +504,11 @@ De opdracht word geactiveerd als:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Laatst gebruikte instellingen (druk op DEL om iets te verwijderen)</target>
 
-<source>Hide excluded items</source>
-<target>Verberg uitgesloten items</target>
+<source>Show excluded items</source>
+<target>Laat uitgesloten bestanden zien</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Verberg gefilterde of tijdelijk uitgesloten bestanden</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Laat gefilterde of tijdelijk uitgesloten bestanden zien</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Aantal bestanden en mappen die zullen worden aangemaakt</target>
@@ -573,24 +552,81 @@ De opdracht word geactiveerd als:
 <source>Right</source>
 <target>Rechts</target>
 
-<source>Status feedback</source>
-<target>Status terugkoppeling</target>
+<source>Error handling</source>
+<target>Fout afhandeling</target>
+
+<source>Ignore</source>
+<target>Negeer</target>
+
+<source>Hide all error and warning messages</source>
+<target>Verberg alle fout- en waarschuwingsberichten</target>
+
+<source>Pop-up</source>
+<target>Pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Laat pop-up zien bij foutmeldingen of waarschuwingen</target>
+
+<source>Exit</source>
+<target>Sluiten</target>
+
+<source>Abort synchronization on first error</source>
+<target>Synchronisatie stoppen bij eerste foutmelding</target>
+
+<source>On completion:</source>
+<target>Bij voltooiing:</target>
 
 <source>Show progress dialog</source>
 <target>Toon voortgangsdialoogvenster</target>
 
-<source>Error handling</source>
-<target>Fout afhandeling</target>
+<source>Generate log file</source>
+<target>Log bestand aanmaken</target>
 
-<source>Maximum number of log files:</source>
-<target>Maximale aantal van logbestanden:</target>
+<source>Select folder to save log files</source>
+<target>Selecteer map om log bestanden op te slaan</target>
 
-<source>Select folder to save log files:</source>
-<target>Selecteer de map voor het bewaren van logbestanden:</target>
+<source>Limit</source>
+<target>Limiet</target>
+
+<source>Limit maximum number of log files</source>
+<target>Limiteer maximaal aantal log bestanden</target>
 
 <source>Batch settings</source>
 <target>Batchinstellingen</target>
 
+<source>Compare by...</source>
+<target>Vergelijk met...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Bestanden worden als gelijk bevonden indien
+     - de laatste schrijf tijd en datum
+     - de bestandsgrootte
+gelijk zijn
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Bestanden worden als gelijk beschouwd indien
+     - de bestandsinhoud
+overeenkomt
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Afhandeling van snelkoppelingen</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Selecteer een variant:</target>
 
@@ -609,8 +645,26 @@ De opdracht word geactiveerd als:
 <source>Deletion handling</source>
 <target>Verwijder-afhandeling</target>
 
-<source>On completion:</source>
-<target>Bij voltooiing:</target>
+<source>Permanent</source>
+<target>Permanent</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Bestanden definitief verwijderen of overschrijven</target>
+
+<source>Recycle Bin</source>
+<target>Prullenbak</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Gebruik de prullenbak bij verwijderen of overschrijven van bestanden</target>
+
+<source>Versioning</source>
+<target>Versiebeheer</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Verplaats bestanden met tijdstempel naar specifieke map</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Limiteer maximaal aantal versies per bestand</target>
 
 <source>Configuration</source>
 <target>Configuratie</target>
@@ -633,39 +687,6 @@ De opdracht word geactiveerd als:
 <source>Conflict/item cannot be categorized</source>
 <target>Conflict/item kan niet worden gecategoriseerd</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Vergelijk met...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Bestanden worden als gelijk bevonden indien
-     - de laatste schrijf tijd en datum
-     - de bestandsgrootte
-gelijk zijn
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Bestanden worden als gelijk beschouwd indien
-     - de bestandsinhoud
-overeenkomt
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Afhandeling van snelkoppelingen</target>
-
 <source>Synchronizing...</source>
 <target>Synchroniseert...</target>
 
@@ -681,8 +702,8 @@ overeenkomt
 <source>Donate with PayPal</source>
 <target>Doneer met PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Extra dank voor het vertalen van FreeFileSync gaat naar:</target>
+<source>Many thanks for localization:</source>
+<target>Veel dank voor de vertalingen:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Feedback en suggesties zijn welkom</target>
@@ -699,9 +720,6 @@ overeenkomt
 <source>Published under the GNU General Public License</source>
 <target>Gepubliceerd onder de GNU General Public License</target>
 
-<source>Use Recycle Bin</source>
-<target>Gebruik de prullenbak</target>
-
 <source>Delete on both sides</source>
 <target>Verwijder aan beide zijdes</target>
 
@@ -771,8 +789,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Statistics</source>
 <target>Statistieken</target>
 
-<source>Do not show this dialog again</source>
-<target>Toon deze melding niet meer</target>
+<source>Don't show this dialog again</source>
+<target>Laat deze dialoog niet meer zien</target>
 
 <source>Find what:</source>
 <target>Vind wat:</target>
@@ -855,11 +873,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Do you want to save changes to %x?</source>
 <target>Wilt u de wijzigingen in %x opslaan?</target>
 
-<source>Save</source>
-<target>Opslaan</target>
-
-<source>Don't Save</source>
-<target>Niet opslaan</target>
+<source>Do&n't save</source>
+<target>&Niet opslaan</target>
 
 <source>Configuration loaded!</source>
 <target>Configuratie geladen!</target>
@@ -951,7 +966,7 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Show files that won't be copied</source>
 <target>Toon bestanden die niet gekopiëerd zullen worden</target>
 
-<source>All directories in sync!</source>
+<source>All folders are in sync!</source>
 <target>Alle mappen zijn gesynchroniseerd!</target>
 
 <source>Comma separated list</source>
@@ -1041,6 +1056,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Pause</source>
 <target>Pauze</target>
 
+<source>Logging</source>
+<target>Loggen</target>
+
 <source>Cannot find %x</source>
 <target>Kan %x niet vinden</target>
 
@@ -1122,21 +1140,6 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Leave as unresolved conflict</source>
 <target>Beschouw als onopgelost conflict</target>
 
-<source>Delete permanently</source>
-<target>Definitief verwijderen</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Bestanden definitief verwijderen of overschrijven</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Gebruik de prullenbak bij verwijderen of overschrijven van bestanden</target>
-
-<source>Versioning</source>
-<target>Versiebeheer</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Verplaats bestanden in een tijdsaangeduide submap</target>
-
 <source>Files</source>
 <target>Bestanden</target>
 
@@ -1227,8 +1230,11 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Cannot copy file %x to %y.</source>
 <target>Kan bestand %x niet kopiëren naar %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Kan map %x niet lezen.</target>
+<source>Cannot open directory %x.</source>
+<target>Kan map %x niet openen.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Kan map %x niet opsommen.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Eindeloze map recursie gedetecteerd.</target>
@@ -1267,7 +1273,7 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <target>Mappen zijn afhankelijk van elkaar! Wees voorzichtig met het maken van synchronisatieregels:</target>
 
 <source>Start comparison</source>
-<target></target>
+<target>Start vergelijking</target>
 
 <source>Preparing synchronization...</source>
 <target>Synchronisatie voorbereiden</target>
@@ -1281,8 +1287,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Files %x have the same date but a different size!</source>
 <target>Bestanden %x hebben dezelfde datums maar een afwijkende grootte!</target>
 
-<source>Items have different attributes</source>
-<target>Items hebben verschillende attributen</target>
+<source>Items differ in attributes only</source>
+<target>Items verschillen alleen in attributen</target>
 
 <source>Symbolic links %x have the same date but a different target.</source>
 <target>Snelkoppelingen %x hebben dezelfde datum maar een verschillend doel.</target>
@@ -1362,6 +1368,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Moving symbolic link %x to %y</source>
 <target>Bezig met verplaatsen van snelkoppeling %x naar %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>Bestand %x wordt aangemaakt</target>
 
@@ -1416,8 +1425,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Een map die onderdeel is van meerdere map paren word aangepast. Kijk alstublieft uw synchronisatie instellingen na.</target>
 
-<source>Synchronize folder pair:</source>
-<target></target>
+<source>Synchronizing folder pair:</source>
+<target>Bezig met synchroniseren van folder paar:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Doelmap %x bestaat al.</target>
diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index bd0cd650..840e9431 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -10,6 +10,15 @@
 <source>Searching for folder %x...</source>
 <target>Searching for folder %x...</target>
 
+<source>Items processed:</source>
+<target>Elements processed:</target>
+
+<source>Items remaining:</source>
+<target>Elements remaining:</target>
+
+<source>Total time:</source>
+<target>Total time:</target>
+
 <source>Show in Explorer</source>
 <target>Show in Explorer</target>
 
@@ -49,12 +58,12 @@
 <source>Create a batch job</source>
 <target>Create a batch job</target>
 
-<source>Synchronization settings</source>
-<target>Synchronisation settings</target>
-
 <source>Comparison settings</source>
 <target>Comparison settings</target>
 
+<source>Synchronization settings</source>
+<target>Synchronisation settings</target>
+
 <source>About</source>
 <target>About</target>
 
@@ -76,27 +85,6 @@
 <source>Select time span</source>
 <target>Select time span</target>
 
-<source>Show pop-up</source>
-<target>Show pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Show pop-up on errors or warnings</target>
-
-<source>Ignore errors</source>
-<target>Ignore errors</target>
-
-<source>Hide all error and warning messages</source>
-<target>Hide all error and warning messages</target>
-
-<source>Exit instantly</source>
-<target>Exit instantly</target>
-
-<source>Abort synchronization immediately</source>
-<target>Abort synchronisation immediately</target>
-
-<source>Browse</source>
-<target>Browse</target>
-
 <source>Invalid command line:</source>
 <target>Invalid command line:</target>
 
@@ -235,8 +223,8 @@
 <source>&Open...</source>
 <target>&Open...</target>
 
-<source>Save &As...</source>
-<target>Save &As...</target>
+<source>Save &as...</source>
+<target>Save &as...</target>
 
 <source>&Quit</source>
 <target>&Quit</target>
@@ -277,6 +265,9 @@
 <source>Remove folder</source>
 <target>Remove folder</target>
 
+<source>Browse</source>
+<target>Browse</target>
+
 <source>Select a folder</source>
 <target>Select a folder</target>
 
@@ -309,8 +300,8 @@ The command is triggered if:
 <source>Cancel</source>
 <target>Cancel</target>
 
-<source>(Build: %x)</source>
-<target>(Build: %x)</target>
+<source>Build: %x</source>
+<target>Build: %x</target>
 
 <source>All files</source>
 <target>All files</target>
@@ -330,9 +321,6 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>A folder input field is empty.</target>
 
-<source>Logging</source>
-<target>Logging</target>
-
 <source>File time and size</source>
 <target>File time and size</target>
 
@@ -354,21 +342,6 @@ The command is triggered if:
 <source>FreeFileSync batch</source>
 <target>FreeFileSync batch</target>
 
-<source>Batch execution</source>
-<target>Batch execution</target>
-
-<source>Items processed:</source>
-<target>Elements processed:</target>
-
-<source>Items remaining:</source>
-<target>Elements remaining:</target>
-
-<source>Total time:</source>
-<target>Total time:</target>
-
-<source>Stop</source>
-<target>Stop</target>
-
 <source>Synchronization aborted!</source>
 <target>Synchronisation aborted!</target>
 
@@ -528,11 +501,11 @@ The command is triggered if:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Last used configurations (press DEL to remove from list)</target>
 
-<source>Hide excluded items</source>
-<target>Hide excluded items</target>
+<source>Show excluded items</source>
+<target>Show excluded items</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Hide filtered or temporarily excluded files</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Show filtered or temporarily excluded files</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Number of files and folders that will be created</target>
@@ -576,24 +549,81 @@ The command is triggered if:
 <source>Right</source>
 <target>Right</target>
 
-<source>Status feedback</source>
-<target>Status feedback</target>
+<source>Error handling</source>
+<target>Error handling</target>
+
+<source>Ignore</source>
+<target>Ignore</target>
+
+<source>Hide all error and warning messages</source>
+<target>Hide all error and warning messages</target>
+
+<source>Pop-up</source>
+<target>Pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Show pop-up on errors or warnings</target>
+
+<source>Exit</source>
+<target>Exit</target>
+
+<source>Abort synchronization on first error</source>
+<target>Abort synchronisation on first error</target>
+
+<source>On completion:</source>
+<target>On completion:</target>
 
 <source>Show progress dialog</source>
 <target>Show progress dialog</target>
 
-<source>Error handling</source>
-<target>Error handling</target>
+<source>Generate log file</source>
+<target>Generate log file</target>
 
-<source>Maximum number of log files:</source>
-<target>Maximum number of log files:</target>
+<source>Select folder to save log files</source>
+<target>Select folder to save log files</target>
 
-<source>Select folder to save log files:</source>
-<target>Select folder to save log files:</target>
+<source>Limit</source>
+<target>Limit</target>
+
+<source>Limit maximum number of log files</source>
+<target>Limit maximum number of log files</target>
 
 <source>Batch settings</source>
 <target>Batch settings</target>
 
+<source>Compare by...</source>
+<target>Compare by...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Files are found equal if
+     - file content
+is the same
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Symbolic Link handling</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Select variant:</target>
 
@@ -612,8 +642,26 @@ The command is triggered if:
 <source>Deletion handling</source>
 <target>Deletion handling</target>
 
-<source>On completion:</source>
-<target>On completion:</target>
+<source>Permanent</source>
+<target>Permanent</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Delete or overwrite files permanently</target>
+
+<source>Recycle Bin</source>
+<target>Recycle Bin</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Use Recycle Bin when deleting or overwriting files</target>
+
+<source>Versioning</source>
+<target>Versioning</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Move time-stamped files into specified folder</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Limit maximum number of versions per file</target>
 
 <source>Configuration</source>
 <target>Configuration</target>
@@ -636,39 +684,6 @@ The command is triggered if:
 <source>Conflict/item cannot be categorized</source>
 <target>Conflict/item cannot be categorised</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Compare by...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Files are found equal if
-     - file content
-is the same
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Symbolic Link handling</target>
-
 <source>Synchronizing...</source>
 <target>Synchronising...</target>
 
@@ -684,8 +699,8 @@ is the same
 <source>Donate with PayPal</source>
 <target>Donate with PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Big thanks for localising FreeFileSync goes out to:</target>
+<source>Many thanks for localization:</source>
+<target>Many thanks for localisation:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Feedback and suggestions are welcome</target>
@@ -702,9 +717,6 @@ is the same
 <source>Published under the GNU General Public License</source>
 <target>Published under the GNU General Public Licence</target>
 
-<source>Use Recycle Bin</source>
-<target>Use Recycle Bin</target>
-
 <source>Delete on both sides</source>
 <target>Delete on both sides</target>
 
@@ -774,8 +786,8 @@ Note: File names must be relative to base directories!
 <source>Statistics</source>
 <target>Statistics</target>
 
-<source>Do not show this dialog again</source>
-<target>Do not show this dialogue again</target>
+<source>Don't show this dialog again</source>
+<target>Don't show this dialog again</target>
 
 <source>Find what:</source>
 <target>Find what:</target>
@@ -858,11 +870,8 @@ Note: File names must be relative to base directories!
 <source>Do you want to save changes to %x?</source>
 <target>Do you want to save changes to %x?</target>
 
-<source>Save</source>
-<target>Save</target>
-
-<source>Don't Save</source>
-<target>Don't Save</target>
+<source>Do&n't save</source>
+<target>Do&n't save</target>
 
 <source>Configuration loaded!</source>
 <target>Configuration loaded!</target>
@@ -954,8 +963,8 @@ Note: File names must be relative to base directories!
 <source>Show files that won't be copied</source>
 <target>Show files that won't be copied</target>
 
-<source>All directories in sync!</source>
-<target>All directories in sync!</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>
@@ -1044,6 +1053,9 @@ Note: File names must be relative to base directories!
 <source>Pause</source>
 <target>Pause</target>
 
+<source>Logging</source>
+<target>Logging</target>
+
 <source>Cannot find %x</source>
 <target>Cannot find %x</target>
 
@@ -1125,21 +1137,6 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>Leave as unresolved conflict</target>
 
-<source>Delete permanently</source>
-<target>Delete permanently</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Delete or overwrite files permanently</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Use Recycle Bin when deleting or overwriting files</target>
-
-<source>Versioning</source>
-<target>Versioning</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Move files into a time-stamped subfolder</target>
-
 <source>Files</source>
 <target>Files</target>
 
@@ -1230,8 +1227,11 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>Cannot copy file %x to %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Cannot read directory %x.</target>
+<source>Cannot open directory %x.</source>
+<target>Cannot open directory %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Cannot enumerate directory %x.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Detected endless directory recursion.</target>
@@ -1257,6 +1257,9 @@ Note: File names must be relative to base directories!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Setting default synchronisation directions: Old files will be overwritten with newer files.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>You can ignore this error to consider the folder as empty.</target>
 
@@ -1266,6 +1269,9 @@ Note: File names must be relative to base directories!
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Directories are dependent! Be careful when setting up synchronisation rules:</target>
 
+<source>Start comparison</source>
+<target>Start comparison</target>
+
 <source>Preparing synchronization...</source>
 <target>Preparing synchronisation...</target>
 
@@ -1278,6 +1284,9 @@ Note: File names must be relative to base directories!
 <source>Files %x have the same date but a different size!</source>
 <target>Files %x have the same date but a different size!</target>
 
+<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>
 
@@ -1293,9 +1302,6 @@ Note: File names must be relative to base directories!
 <source>Both sides are equal</source>
 <target>Both sides are equal</target>
 
-<source>Items have different attributes</source>
-<target>Items have different attributes</target>
-
 <source>Copy new item to left</source>
 <target>Copy new item to left</target>
 
@@ -1410,14 +1416,11 @@ Note: File names must be relative to base directories!
 <source>Available:</source>
 <target>Available:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>A folder will be modified which is part of multiple folder pairs. Please review synchronisation settings.</target>
 
-<source>Processing folder pair:</source>
-<target>Processing folder pair:</target>
+<source>Synchronizing folder pair:</source>
+<target>Synchronising folder pair:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Target folder %x already existing.</target>
diff --git a/BUILD/Languages/finnish.lng b/BUILD/Languages/finnish.lng
index f67326e5..93220ec4 100644
--- a/BUILD/Languages/finnish.lng
+++ b/BUILD/Languages/finnish.lng
@@ -10,6 +10,15 @@
 <source>Searching for folder %x...</source>
 <target>Etsitään hakemistoa %x...</target>
 
+<source>Items processed:</source>
+<target>Osia käsitelty:</target>
+
+<source>Items remaining:</source>
+<target>Osia jäljellä:</target>
+
+<source>Total time:</source>
+<target>Kokonaisaika:</target>
+
 <source>Show in Explorer</source>
 <target>Näytä Explorerissa</target>
 
@@ -49,12 +58,12 @@
 <source>Create a batch job</source>
 <target>Eräajon luonti</target>
 
-<source>Synchronization settings</source>
-<target>Täsmäytyksen asetukset</target>
-
 <source>Comparison settings</source>
 <target>Vertailun asetukset</target>
 
+<source>Synchronization settings</source>
+<target>Täsmäytyksen asetukset</target>
+
 <source>About</source>
 <target>Ohje</target>
 
@@ -76,27 +85,6 @@
 <source>Select time span</source>
 <target>Valitse aikajana</target>
 
-<source>Show pop-up</source>
-<target>Näytä Pop-Up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Näytä Pop-Up (virheet/varoitukset)</target>
-
-<source>Ignore errors</source>
-<target>Älä huomioi virheitä</target>
-
-<source>Hide all error and warning messages</source>
-<target>Piilota kaikki virhe- ja varoitusviestit</target>
-
-<source>Exit instantly</source>
-<target>Poistu välittömästi</target>
-
-<source>Abort synchronization immediately</source>
-<target>Lopeta täsmäytys välittömästi</target>
-
-<source>Browse</source>
-<target>Selaa</target>
-
 <source>Invalid command line:</source>
 <target>Virheellinen komentokehote:</target>
 
@@ -235,7 +223,7 @@
 <source>&Open...</source>
 <target>&Avaa...</target>
 
-<source>Save &As...</source>
+<source>Save &as...</source>
 <target>Tallenna n&imellä...</target>
 
 <source>&Quit</source>
@@ -277,6 +265,9 @@
 <source>Remove folder</source>
 <target>Poista hakemisto</target>
 
+<source>Browse</source>
+<target>Selaa</target>
+
 <source>Select a folder</source>
 <target>Valitse hakemisto</target>
 
@@ -309,8 +300,8 @@ Käsky suoritetaan jos:
 <source>Cancel</source>
 <target>Lopeta</target>
 
-<source>(Build: %x)</source>
-<target>(Versio: %x)</target>
+<source>Build: %x</source>
+<target>Versio: %x</target>
 
 <source>All files</source>
 <target>Kaikki tiedostot</target>
@@ -330,9 +321,6 @@ Käsky suoritetaan jos:
 <source>A folder input field is empty.</source>
 <target>Hakemiston syöte on tyhjä.</target>
 
-<source>Logging</source>
-<target>Kirjaa</target>
-
 <source>File time and size</source>
 <target>Tiedoston aika ja koko</target>
 
@@ -354,18 +342,6 @@ Käsky suoritetaan jos:
 <source>FreeFileSync batch</source>
 <target>FreeFileSync eräajo</target>
 
-<source>Batch execution</source>
-<target>Eräajon suoritus</target>
-
-<source>Items processed:</source>
-<target>Osia käsitelty:</target>
-
-<source>Items remaining:</source>
-<target>Osia jäljellä:</target>
-
-<source>Total time:</source>
-<target>Kokonaisaika:</target>
-
 <source>Synchronization aborted!</source>
 <target>Täsmäytys lopetettiin!</target>
 
@@ -525,11 +501,11 @@ Käsky suoritetaan jos:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Viimeksi käytetty asetus (poista listalta paina DEL)</target>
 
-<source>Hide excluded items</source>
-<target>Piilota suodatetut</target>
+<source>Show excluded items</source>
+<target>Näytä suodatetut</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Piilota suodatetut ja tilapäisesti poistetut</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Näytä suodatetut/nyt pois suljetut tiedostot</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Luotavien tiedostojen ja hakemistojen määrä</target>
@@ -573,24 +549,81 @@ Käsky suoritetaan jos:
 <source>Right</source>
 <target>Oikea</target>
 
-<source>Status feedback</source>
-<target>Tilan palaute</target>
+<source>Error handling</source>
+<target>Virheiden käsittely</target>
+
+<source>Ignore</source>
+<target>Ohita</target>
+
+<source>Hide all error and warning messages</source>
+<target>Piilota kaikki virhe- ja varoitusviestit</target>
+
+<source>Pop-up</source>
+<target>Pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Näytä Pop-Up (virheet/varoitukset)</target>
+
+<source>Exit</source>
+<target>Poistu</target>
+
+<source>Abort synchronization on first error</source>
+<target>Keskeytä täsmäytys ensimmäisestä virheestä</target>
+
+<source>On completion:</source>
+<target>Kun valmis</target>
 
 <source>Show progress dialog</source>
 <target>Näytä etenemä ikkuna</target>
 
-<source>Error handling</source>
-<target>Virheiden käsittely</target>
+<source>Generate log file</source>
+<target>Luo lokitiedosto</target>
+
+<source>Select folder to save log files</source>
+<target>Valitse tallennushakemisto lokeille</target>
 
-<source>Maximum number of log files:</source>
-<target>Lokitiedostojen enimmäismäärä:</target>
+<source>Limit</source>
+<target>Raja</target>
 
-<source>Select folder to save log files:</source>
-<target>Lokitiedostojen tallennushakemisto:</target>
+<source>Limit maximum number of log files</source>
+<target>Lokeja enintäin</target>
 
 <source>Batch settings</source>
 <target>Eräajo asetukset</target>
 
+<source>Compare by...</source>
+<target>Vertaile...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Tiedostot samat jos
+     - viimeinen kirjoitusaika ja pvm
+     - tiedostokoko
+ovat samat
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Tiedostot samat jos, 
+     - tiedoston sisältö
+on sama
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Pikakuvakkeiden hallinta</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Valitse vaihtoehto:</target>
 
@@ -609,8 +642,26 @@ Käsky suoritetaan jos:
 <source>Deletion handling</source>
 <target>Poistotapa</target>
 
-<source>On completion:</source>
-<target>Kun valmis</target>
+<source>Permanent</source>
+<target>Pysyvä</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Poista tai korvaa tiedostoja pysyvästi</target>
+
+<source>Recycle Bin</source>
+<target>Roskakori</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Käytä Roskakoria kun poistat tai korvaat tiedostoja</target>
+
+<source>Versioning</source>
+<target>Versiointi</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Siirrä aikaleimatut tiedostot hakemistoon</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Tiedostoversioita enintäin</target>
 
 <source>Configuration</source>
 <target>Asetukset</target>
@@ -633,39 +684,6 @@ Käsky suoritetaan jos:
 <source>Conflict/item cannot be categorized</source>
 <target>Ristiriita, ei määriteltävissä</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Vertaile...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Tiedostot samat jos
-     - viimeinen kirjoitusaika ja pvm
-     - tiedostokoko
-ovat samat
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Tiedostot samat jos, 
-     - tiedoston sisältö
-on sama
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Pikakuvakkeiden hallinta</target>
-
 <source>Synchronizing...</source>
 <target>Täsmäytetään...</target>
 
@@ -681,8 +699,8 @@ on sama
 <source>Donate with PayPal</source>
 <target>Lahjoita PayPal:lla</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Suuret kiitokset FreeFileSync:n paikallistamisesta:</target>
+<source>Many thanks for localization:</source>
+<target>Paljon kiitoksia kääntäjille:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Palaute ja uudet ideat ovat tervetulleita</target>
@@ -699,9 +717,6 @@ on sama
 <source>Published under the GNU General Public License</source>
 <target>Julkaistu lisenssillä GNU General Public License</target>
 
-<source>Use Recycle Bin</source>
-<target>Käytä Roskakoria</target>
-
 <source>Delete on both sides</source>
 <target>Poista molemmilta puolilta</target>
 
@@ -771,8 +786,8 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Statistics</source>
 <target>Tilastot</target>
 
-<source>Do not show this dialog again</source>
-<target>Älä enää näytä valintaikkunaa</target>
+<source>Don't show this dialog again</source>
+<target>Älä näytä tätä uudestaan</target>
 
 <source>Find what:</source>
 <target>Etsi:</target>
@@ -855,10 +870,7 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Do you want to save changes to %x?</source>
 <target>Haluatko tallentaa muutokset: %x?</target>
 
-<source>Save</source>
-<target>Tallenna</target>
-
-<source>Don't Save</source>
+<source>Do&n't save</source>
 <target>Älä tallenna</target>
 
 <source>Configuration loaded!</source>
@@ -951,8 +963,8 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Show files that won't be copied</source>
 <target>Näytä kopioimatta jäävät tiedostot</target>
 
-<source>All directories in sync!</source>
-<target>Kaikki hakemistot täsmäävät!</target>
+<source>All folders are in sync!</source>
+<target>Kaikki hakemistot täsmäytetty!</target>
 
 <source>Comma separated list</source>
 <target>CSV-muotoinen lista</target>
@@ -1041,6 +1053,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Pause</source>
 <target>Tauko</target>
 
+<source>Logging</source>
+<target>Kirjaa</target>
+
 <source>Cannot find %x</source>
 <target>En löydä %x</target>
 
@@ -1122,21 +1137,6 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Leave as unresolved conflict</source>
 <target>Jätä ratkaisemattomana virheenä</target>
 
-<source>Delete permanently</source>
-<target>Poista pysyvästi</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Poista tai korvaa tiedostoja pysyvästi</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Käytä Roskakoria kun poistat tai korvaat tiedostoja</target>
-
-<source>Versioning</source>
-<target>Versiointi</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Siirrä tiedostot aikaleimattuun alihakemistoon</target>
-
 <source>Files</source>
 <target>Tiedostot</target>
 
@@ -1227,8 +1227,11 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Cannot copy file %x to %y.</source>
 <target>Tiedostoa %x ei voida kopioida kohtaan %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Hakemisto %x ei voida lukea.</target>
+<source>Cannot open directory %x.</source>
+<target>Hakemistoa %x ei voida avata.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Hakemistoa ei voida luetella.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Päättymätön hakemiston toisto.</target>
@@ -1254,6 +1257,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Aseta oletussuunta täsmäykselle: Vanhat tiedostot korvataan uudemilla tiedostoilla.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Roskakori puuttuu näistä polusta! Tiedostot poistetaan pysyvästi:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Ohita tämä virhe ja oleta hakemisto tyhjäksi.</target>
 
@@ -1263,6 +1269,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Hakemistot riippuvuussuhteessa! Aseta täsmäyssääntöjä varovasti:</target>
 
+<source>Start comparison</source>
+<target>Käynnistä vertailu</target>
+
 <source>Preparing synchronization...</source>
 <target>Täsmäytys alustetaan...</target>
 
@@ -1275,6 +1284,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Files %x have the same date but a different size!</source>
 <target>Tiedostoilla %x on sama päiväys mutta eri koko!</target>
 
+<source>Items differ in attributes only</source>
+<target>Kohteiden eroaa vain määritteissä</target>
+
 <source>Symbolic links %x have the same date but a different target.</source>
 <target>Pikakuvikeilla %x on sama päiväys mutta osoittavat eri kohtiin.</target>
 
@@ -1290,9 +1302,6 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Both sides are equal</source>
 <target>Puolet ovat identtiset</target>
 
-<source>Items have different attributes</source>
-<target>Kohteilla poikkeavat ominaisuudet</target>
-
 <source>Copy new item to left</source>
 <target>Monista uusi vasemmalle</target>
 
@@ -1407,14 +1416,11 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Available:</source>
 <target>Saatavilla:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Roskakori puuttuu näistä polusta! Tiedostot poistetaan pysyvästi:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Moniosaisen hakemistoparin hakemistoa muutetaan. Tarkista täsmäytyksen asetuksia.</target>
 
-<source>Processing folder pair:</source>
-<target>Käsitellään hakemistoparia:</target>
+<source>Synchronizing folder pair:</source>
+<target>Täsmäytetään  hakemistoparia:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Kohdehakemisto %x on olemassa.</target>
diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng
index db263be5..91d1c1b0 100644
--- a/BUILD/Languages/french.lng
+++ b/BUILD/Languages/french.lng
@@ -10,6 +10,15 @@
 <source>Searching for folder %x...</source>
 <target>Recherche du dossier %x...</target>
 
+<source>Items processed:</source>
+<target>Elements traités :</target>
+
+<source>Items remaining:</source>
+<target>Elements restants :</target>
+
+<source>Total time:</source>
+<target>Durée totale :</target>
+
 <source>Show in Explorer</source>
 <target>Montrer dans l'explorateur</target>
 
@@ -49,12 +58,12 @@
 <source>Create a batch job</source>
 <target>Créer un traitement batch</target>
 
-<source>Synchronization settings</source>
-<target>Paramétrage de la synchronisation</target>
-
 <source>Comparison settings</source>
 <target>Paramètres de comparaison</target>
 
+<source>Synchronization settings</source>
+<target>Paramétrage de la synchronisation</target>
+
 <source>About</source>
 <target>A propos de</target>
 
@@ -76,27 +85,6 @@
 <source>Select time span</source>
 <target>Choisir un intervalle de temps</target>
 
-<source>Show pop-up</source>
-<target>Montrer les boîtes de dialogue</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Montrer les messages d'avertissement ou d'erreur</target>
-
-<source>Ignore errors</source>
-<target>Ignorer les erreurs</target>
-
-<source>Hide all error and warning messages</source>
-<target>Masquer tous les messages d'erreurs et les avertissements</target>
-
-<source>Exit instantly</source>
-<target>Sortie immédiate</target>
-
-<source>Abort synchronization immediately</source>
-<target>Abandon immédiat de la synchronisation</target>
-
-<source>Browse</source>
-<target>Parcourir</target>
-
 <source>Invalid command line:</source>
 <target>Ligne de commande incorrecte :</target>
 
@@ -235,8 +223,8 @@
 <source>&Open...</source>
 <target>&Ouvrir...</target>
 
-<source>Save &As...</source>
-<target>&Enregistrer sous ...</target>
+<source>Save &as...</source>
+<target>S&auvegarder sous...</target>
 
 <source>&Quit</source>
 <target>&Quitter</target>
@@ -266,7 +254,7 @@
 <target>3. Cliquez sur 'Démarrer'.</target>
 
 <source>To get started just import a .ffs_batch file.</source>
-<target>Pour démarrer il faur importer un fichier .ffs_batch.</target>
+<target>Pour démarrer, il faut importer un fichier .ffs_batch.</target>
 
 <source>Folders to watch</source>
 <target>Dossiers à examiner</target>
@@ -277,6 +265,9 @@
 <source>Remove folder</source>
 <target>Supprimer le dossier</target>
 
+<source>Browse</source>
+<target>Parcourir</target>
+
 <source>Select a folder</source>
 <target>Choisissez un dossier</target>
 
@@ -309,8 +300,8 @@ La commande est déclenchée si :
 <source>Cancel</source>
 <target>Annuler</target>
 
-<source>(Build: %x)</source>
-<target>(Généré : %x)</target>
+<source>Build: %x</source>
+<target>Généré : %x</target>
 
 <source>All files</source>
 <target>Tous les fichiers</target>
@@ -330,9 +321,6 @@ La commande est déclenchée si :
 <source>A folder input field is empty.</source>
 <target>Une entrée dossier est vide.</target>
 
-<source>Logging</source>
-<target>Connexion</target>
-
 <source>File time and size</source>
 <target>Heure et taille du fichier</target>
 
@@ -354,21 +342,6 @@ La commande est déclenchée si :
 <source>FreeFileSync batch</source>
 <target>FreeFileSync batch</target>
 
-<source>Batch execution</source>
-<target>Exécution du traitement batch</target>
-
-<source>Items processed:</source>
-<target>Elements traités :</target>
-
-<source>Items remaining:</source>
-<target>Elements restants :</target>
-
-<source>Total time:</source>
-<target>Durée totale :</target>
-
-<source>Stop</source>
-<target>Arrêt</target>
-
 <source>Synchronization aborted!</source>
 <target>Synchronisation abandonnée !</target>
 
@@ -528,11 +501,11 @@ La commande est déclenchée si :
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Dernière configuration utilisée (Appuyez sur SUPPR pour l'enlever de la liste)</target>
 
-<source>Hide excluded items</source>
-<target>Masquer les éléments exclus</target>
+<source>Show excluded items</source>
+<target>Afficher les éléments exclus</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Masquer les fichiers filtrés ou exclus temporairement</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Afficher les fichiers filtrés ou temporairement exclus</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Nombre de fichiers et de dossiers qui seront créés</target>
@@ -562,7 +535,7 @@ La commande est déclenchée si :
 <target>Traitement batch</target>
 
 <source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
-<target>Créer un fichier batch pour automatiser la synchronisation. Double-cliquez sur ce fichier ou entrez-le dans le plannificateur de tâches : FreeFileSync.exe <job name>.ffs_batch</target>
+<target>Créer un fichier batch pour automatiser la synchronisation. Double-cliquez sur ce fichier ou entrez-le dans le planificateur de tâches : FreeFileSync.exe <job name>.ffs_batch</target>
 
 <source>Help</source>
 <target>Aide</target>
@@ -576,29 +549,86 @@ La commande est déclenchée si :
 <source>Right</source>
 <target>Droite</target>
 
-<source>Status feedback</source>
-<target>Retour d'informations</target>
+<source>Error handling</source>
+<target>Erreur de gestion de fichiers</target>
+
+<source>Ignore</source>
+<target>Ignorer</target>
+
+<source>Hide all error and warning messages</source>
+<target>Masquer tous les messages d'erreurs et les avertissements</target>
+
+<source>Pop-up</source>
+<target>Pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Montrer les messages d'avertissement ou d'erreur</target>
+
+<source>Exit</source>
+<target>Quitter</target>
+
+<source>Abort synchronization on first error</source>
+<target>Abandonner la synchronisation dès la première erreur</target>
+
+<source>On completion:</source>
+<target>A la fin :</target>
 
 <source>Show progress dialog</source>
 <target>Montrer la fenêtre de progression</target>
 
-<source>Error handling</source>
-<target>Erreur de gestion de fichiers</target>
+<source>Generate log file</source>
+<target>Créer le fichier log</target>
+
+<source>Select folder to save log files</source>
+<target>Choisir le dossier de sauvegarde des fichiers log</target>
 
-<source>Maximum number of log files:</source>
-<target>Nombre maximum de fichiers Log</target>
+<source>Limit</source>
+<target>Limite</target>
 
-<source>Select folder to save log files:</source>
-<target>Choisissez un dossier pour sauvegarder les fichiers log :</target>
+<source>Limit maximum number of log files</source>
+<target>Nombre maximal de fichiers log</target>
 
 <source>Batch settings</source>
 <target>Configuration du traitement batch</target>
 
+<source>Compare by...</source>
+<target>Comparaison par...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Les fichiers sont considérés comme identiques si
+     - la date et l'heure de modification
+     - la taille des fichiers
+sont les mêmes
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Les fichiers sont considérés comme identiques si
+     - leur contenu
+est identique
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Gestion des Liens Symboliques</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Choisissez une variante :</target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identifie et propage les modifications des deux côtés à l'aide d'une base de données. Les suppressions, renommage et conflits sont détectés automatiquement.</target>
+<target>Identifie et propage les modifications des deux côtés à l'aide d'une base de données. Les suppressions, renommages et conflits sont détectés automatiquement.</target>
 
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Copie miroir du dossier de gauche. Le dossier de droite est modifié pour être strictement identique après la synchronisation.</target>
@@ -612,8 +642,26 @@ La commande est déclenchée si :
 <source>Deletion handling</source>
 <target>Gestion des suppressions</target>
 
-<source>On completion:</source>
-<target>A la fin :</target>
+<source>Permanent</source>
+<target>Permanent</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Supprimer ou écraser les fichiers définitivement</target>
+
+<source>Recycle Bin</source>
+<target>Corbeille</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Utiliser la Corbeille lors de la suppression ou du remplacement d'un fichier</target>
+
+<source>Versioning</source>
+<target>Gestion des versions</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Déplacer les fichiers horodatés dans le dossier spécifié</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Nombre maximal de versions par fichier</target>
 
 <source>Configuration</source>
 <target>Configuration</target>
@@ -636,39 +684,6 @@ La commande est déclenchée si :
 <source>Conflict/item cannot be categorized</source>
 <target>Conflit/élément impossible à classer</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Comparaison par...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Les fichiers sont considérés comme identiques si
-     - la date et l'heure de modification
-     - la taille des fichiers
-sont les mêmes
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Les fichiers sont considérés comme identiques si
-     - leur contenu
-est identique
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Gestion des Liens Symboliques</target>
-
 <source>Synchronizing...</source>
 <target>Synchronisation en cours...</target>
 
@@ -684,8 +699,8 @@ est identique
 <source>Donate with PayPal</source>
 <target>Faites un don avec PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Pour les traductions de FreeFileSync, un grand merci à :</target>
+<source>Many thanks for localization:</source>
+<target>Un grand merci pour la traduction à :</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Vos commentaires et vos suggestions sont les bienvenus</target>
@@ -702,9 +717,6 @@ est identique
 <source>Published under the GNU General Public License</source>
 <target>Publié sous licence GNU General Public License</target>
 
-<source>Use Recycle Bin</source>
-<target>Utiliser la Corbeille</target>
-
 <source>Delete on both sides</source>
 <target>Suppression des deux côtés</target>
 
@@ -745,7 +757,7 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <target>Copie de fichiers sécurisé</target>
 
 <source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
-<target>Ecrit d'abord dans un fichier temporaire (*.ffs_tmp), puis le renomme. Ceci guarantit la cohérence des données même en cas d'erreur fatale.</target>
+<target>Ecrit d'abord dans un fichier temporaire (*.ffs_tmp), puis le renomme. Ceci garantit la cohérence des données même en cas d'erreur fatale.</target>
 
 <source>Copy locked files</source>
 <target>Copier les fichiers verrouillés</target>
@@ -774,8 +786,8 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Statistics</source>
 <target>Statistiques</target>
 
-<source>Do not show this dialog again</source>
-<target>Ne plus afficher ce message la prochaine fois</target>
+<source>Don't show this dialog again</source>
+<target>Ne plus afficher cette boîte de dialogue</target>
 
 <source>Find what:</source>
 <target>Chercher cela :</target>
@@ -826,7 +838,7 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <target>Exclure tout</target>
 
 <source>Show icons:</source>
-<target>Afficher les icones :</target>
+<target>Afficher les icônes :</target>
 
 <source>Small</source>
 <target>Petit</target>
@@ -856,13 +868,10 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <target>Ne jamais enregistrer les modifications</target>
 
 <source>Do you want to save changes to %x?</source>
-<target>Voulez-vous enregistrer les midifications dans %x ?</target>
-
-<source>Save</source>
-<target>Sauvegarder</target>
+<target>Voulez-vous enregistrer les modifications dans %x ?</target>
 
-<source>Don't Save</source>
-<target>Ne pas sauvegarder</target>
+<source>Do&n't save</source>
+<target>&Ne pas Sauvegarder</target>
 
 <source>Configuration loaded!</source>
 <target>Configuration chargée !</target>
@@ -954,8 +963,8 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Show files that won't be copied</source>
 <target>Afficher les fichiers qui ne seront pas copiés</target>
 
-<source>All directories in sync!</source>
-<target>Tous les répertoires sont synchronisés !</target>
+<source>All folders are in sync!</source>
+<target>Tous les dossiers sont synchronisés !</target>
 
 <source>Comma separated list</source>
 <target>Liste d'éléments séparés par une virgule</target>
@@ -971,7 +980,7 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <pluralform>%x objects deleted successfully!</pluralform>
 </source>
 <target>
-<pluralform>Objet supprimé avec suucès!</pluralform>
+<pluralform>Objet supprimé avec succès !</pluralform>
 <pluralform>%x objets supprimés avec succès!</pluralform>
 </target>
 
@@ -1044,6 +1053,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Pause</source>
 <target>Pause</target>
 
+<source>Logging</source>
+<target>Connexion</target>
+
 <source>Cannot find %x</source>
 <target>Impossible de trouver %x</target>
 
@@ -1125,21 +1137,6 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Leave as unresolved conflict</source>
 <target>Abandonner en tant que conflit non résolu</target>
 
-<source>Delete permanently</source>
-<target>Suppression définitive</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Supprimer ou écraser les fichiers définitivement</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Utiliser la Corbeille lors de la suppression ou du remplacement d'un fichier</target>
-
-<source>Versioning</source>
-<target>Gestion des versions</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Déplacer les fichiers dans un sous-dossier horodaté</target>
-
 <source>Files</source>
 <target>Fichiers</target>
 
@@ -1230,8 +1227,11 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Cannot copy file %x to %y.</source>
 <target>Impossible de copier le fichier %X vers %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Impossible de lire le répertoire %x.</target>
+<source>Cannot open directory %x.</source>
+<target>Impossible d'ouvrir le répertoire %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Impossible de parcourir le répertoire %x.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Une boucle sans fin détectée dans un répertoire.</target>
@@ -1257,6 +1257,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Directions de la synchronisation par défaut : les anciens fichiers seront remplacés par les nouveaux.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>La corbeille n'est pas valable pour les chemins suivants ! Les fichiers seront détruits définitivement :</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Vous pouvez ignorer cette erreur en considérant le dossier comme vide.</target>
 
@@ -1266,6 +1269,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <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>
 
+<source>Start comparison</source>
+<target>Démarrer la comparaison</target>
+
 <source>Preparing synchronization...</source>
 <target>Synchronisation en cours de préparation ...</target>
 
@@ -1278,6 +1284,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Files %x have the same date but a different size!</source>
 <target>Les fichiers %x ont la même date mais une taille différente !</target>
 
+<source>Items differ in attributes only</source>
+<target>Seuls les attributs des éléments diffèrent</target>
+
 <source>Symbolic links %x have the same date but a different target.</source>
 <target>Le lien symbolique %x a la même date mais pas la même cible.</target>
 
@@ -1293,9 +1302,6 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Both sides are equal</source>
 <target>Les deux cotés sont identiques</target>
 
-<source>Items have different attributes</source>
-<target>Les éléments ont des attributs différents</target>
-
 <source>Copy new item to left</source>
 <target>Copie du nouvel élément à gauche</target>
 
@@ -1339,7 +1345,7 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <target>Suppression du dossier %x</target>
 
 <source>Deleting symbolic link %x</source>
-<target>Suppression du lien symbomique %x</target>
+<target>Suppression du lien symbolique %x</target>
 
 <source>Moving file %x to recycle bin</source>
 <target>Envoi du fichier %x dans la corbeille</target>
@@ -1372,7 +1378,7 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <target>Remplacement du fichier %x</target>
 
 <source>Overwriting symbolic link %x</source>
-<target>Remplacement du lien symbomique %x</target>
+<target>Remplacement du lien symbolique %x</target>
 
 <source>Verifying file %x</source>
 <target>Contrôle du fichier %x</target>
@@ -1410,14 +1416,11 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Available:</source>
 <target>Disponible :</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>La corbeille n'est pas valable pour les chemins suivants ! Les fichiers seront détruits définitivement :</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Un dossier faisant partie de paires multiples sera modifié. Veuillez vérifier les paramètres de synchronisation.</target>
 
-<source>Processing folder pair:</source>
-<target>Traitement de la paire de dossiers :</target>
+<source>Synchronizing folder pair:</source>
+<target>Synchronisation de la paire de dossiers</target>
 
 <source>Target folder %x already existing.</source>
 <target>Le dossier destination %x existe déjà.</target>
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index ddcb4832..d142df24 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>Suche Ordner %x...</target>
 
-<source>Batch execution</source>
-<target>Batchlauf</target>
-
 <source>Items processed:</source>
 <target>Verarbeitete Elemente:</target>
 
@@ -34,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Abbruch initiiert: Warte, bis aktuelle Operation beendet ist...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target>Der Zeitstempel für die Versionierung kann nicht erstellt werden:</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatisierte Synchronisation</target>
 
@@ -61,12 +61,12 @@
 <source>Create a batch job</source>
 <target>Batch-Job erstellen</target>
 
-<source>Synchronization settings</source>
-<target>Synchronisationseinstellungen</target>
-
 <source>Comparison settings</source>
 <target>Vergleichseinstellungen</target>
 
+<source>Synchronization settings</source>
+<target>Synchronisationseinstellungen</target>
+
 <source>About</source>
 <target>Über</target>
 
@@ -88,27 +88,6 @@
 <source>Select time span</source>
 <target>Zeitspanne auswählen</target>
 
-<source>Show pop-up</source>
-<target>Pop-up zeigen</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Ein Auswahlfenster bei Fehlern oder Warnungen anzeigen</target>
-
-<source>Ignore errors</source>
-<target>Fehler ignorieren</target>
-
-<source>Hide all error and warning messages</source>
-<target>Alle Fehler- und Warnmeldungen unterdrücken</target>
-
-<source>Exit instantly</source>
-<target>Sofort beenden</target>
-
-<source>Abort synchronization immediately</source>
-<target>Synchronisation sofort abbrechen</target>
-
-<source>Browse</source>
-<target>Auswählen</target>
-
 <source>Invalid command line:</source>
 <target>Ungültige Befehlszeile:</target>
 
@@ -247,7 +226,7 @@
 <source>&Open...</source>
 <target>Ö&ffnen...</target>
 
-<source>Save &As...</source>
+<source>Save &as...</source>
 <target>Speichern &unter...</target>
 
 <source>&Quit</source>
@@ -289,6 +268,9 @@
 <source>Remove folder</source>
 <target>Ordner entfernen</target>
 
+<source>Browse</source>
+<target>Auswählen</target>
+
 <source>Select a folder</source>
 <target>Ordner auswählen</target>
 
@@ -321,8 +303,8 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Cancel</source>
 <target>Abbrechen</target>
 
-<source>(Build: %x)</source>
-<target>(Build: %x)</target>
+<source>Build: %x</source>
+<target>Build: %x</target>
 
 <source>All files</source>
 <target>Alle Dateien</target>
@@ -342,9 +324,6 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>A folder input field is empty.</source>
 <target>Ein Ordnereingabefeld ist leer.</target>
 
-<source>Logging</source>
-<target>Protokoll</target>
-
 <source>File time and size</source>
 <target>Datum und Größe</target>
 
@@ -379,7 +358,7 @@ Die Befehlszeile wird ausgelöst wenn:
 <target>Synchronisation erfolgreich abgeschlossen!</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Drücken Sie "Wechseln", um die Probleme in FreeFileSyncs Hauptdialog zu bearbeiten.</target>
+<target>Drücken Sie "Wechseln", um die Probleme in FreeFileSyncs Hauptdialog zu beheben.</target>
 
 <source>Switching to FreeFileSync main dialog...</source>
 <target>Wechsle in FreeFileSyncs Hauptdialog...</target>
@@ -525,11 +504,11 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Zuletzt benutzte Konfigurationen (Entf-Taste löscht Einträge)</target>
 
-<source>Hide excluded items</source>
-<target>Ausgeschlossene Elemente verstecken</target>
+<source>Show excluded items</source>
+<target>Ausgeschlossene Elemente anzeigen</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Gefilterte oder temporär ausgeschlossene Dateien ausblenden</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Gefilterte oder temporär ausgeschlossene Dateien zeigen</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Anzahl der zu erstellenden Dateien und Ordner</target>
@@ -573,68 +552,47 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Right</source>
 <target>Rechts</target>
 
-<source>Status feedback</source>
-<target>Statusrückmeldung</target>
-
-<source>Show progress dialog</source>
-<target>Zeige Fortschrittsdialog</target>
-
 <source>Error handling</source>
 <target>Fehlerbehandlung</target>
 
-<source>Maximum number of log files:</source>
-<target>Maximale Anzahl an Logdateien:</target>
-
-<source>Select folder to save log files:</source>
-<target>Ordner zum Sichern der Logdateien wählen:</target>
-
-<source>Batch settings</source>
-<target>Batch Einstellungen</target>
-
-<source>Select variant:</source>
-<target>Variante auswählen:</target>
+<source>Ignore</source>
+<target>Ignorieren</target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identifiziere und propagiere Änderungen auf beiden Seiten mit Hilfe einer Datenbank. Löschungen, Umbenennungen und Konflikte werden automatisch erkannt.</target>
+<source>Hide all error and warning messages</source>
+<target>Alle Fehler- und Warnmeldungen unterdrücken</target>
 
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Spiegelkopie des linken Ordners erstellen. Der rechte Ordner wird dem linken exakt angeglichen.</target>
+<source>Pop-up</source>
+<target>Nachfragen</target>
 
-<source>Copy new or updated files to right folder.</source>
-<target>Neue oder aktualisierte Dateien vom linken in den rechten Ordner kopieren.</target>
+<source>Show pop-up on errors or warnings</source>
+<target>Ein Auswahlfenster bei Fehlern oder Warnungen anzeigen</target>
 
-<source>Configure your own synchronization rules.</source>
-<target>Eigene Synchronisationsregeln definieren.</target>
+<source>Exit</source>
+<target>Beenden</target>
 
-<source>Deletion handling</source>
-<target>Behandlung von Löschungen</target>
+<source>Abort synchronization on first error</source>
+<target>Synchronisation beim ersten Fehler abbrechen</target>
 
 <source>On completion:</source>
 <target>Nach Abschluss:</target>
 
-<source>Configuration</source>
-<target>Konfiguration</target>
-
-<source>Item exists on left side only</source>
-<target>Element existiert nur links</target>
-
-<source>Item exists on right side only</source>
-<target>Element existiert nur rechts</target>
+<source>Show progress dialog</source>
+<target>Fortschrittsdialog zeigen</target>
 
-<source>Left side is newer</source>
-<target>Linke Seite ist neuer</target>
+<source>Generate log file</source>
+<target>Logdatei erzeugen</target>
 
-<source>Right side is newer</source>
-<target>Rechte Seite ist neuer</target>
+<source>Select folder to save log files</source>
+<target>Ordner zum speichern der Logdateien wählen</target>
 
-<source>Items have different content</source>
-<target>Elemente haben unterschiedlichen Inhalt</target>
+<source>Limit</source>
+<target>Limit</target>
 
-<source>Conflict/item cannot be categorized</source>
-<target>Konflikt/Element, das nicht eingeordnet werden kann</target>
+<source>Limit maximum number of log files</source>
+<target>Maximale Anzahl von Logdateien begrenzen</target>
 
-<source>OK</source>
-<target>OK</target>
+<source>Batch settings</source>
+<target>Batch Einstellungen</target>
 
 <source>Compare by...</source>
 <target>Vergleichen nach...</target>
@@ -666,6 +624,69 @@ gleich ist
 <source>Symbolic Link handling</source>
 <target>Behandlung Symbolischer Links</target>
 
+<source>OK</source>
+<target>OK</target>
+
+<source>Select variant:</source>
+<target>Variante auswählen:</target>
+
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Identifiziere und propagiere Änderungen auf beiden Seiten mit Hilfe einer Datenbank. Löschungen, Umbenennungen und Konflikte werden automatisch erkannt.</target>
+
+<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
+<target>Spiegelkopie des linken Ordners erstellen. Der rechte Ordner wird dem linken exakt angeglichen.</target>
+
+<source>Copy new or updated files to right folder.</source>
+<target>Neue oder aktualisierte Dateien in den rechten Ordner kopieren.</target>
+
+<source>Configure your own synchronization rules.</source>
+<target>Eigene Synchronisationsregeln definieren.</target>
+
+<source>Deletion handling</source>
+<target>Behandlung von Löschungen</target>
+
+<source>Permanent</source>
+<target>Endgültig</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Dateien endgültig löschen oder überschreiben</target>
+
+<source>Recycle Bin</source>
+<target>Papierkorb</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Papierkorb für zu löschende oder zu überschreibende Dateien nutzen</target>
+
+<source>Versioning</source>
+<target>Versionierung</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Dateien mit Zeitstempel in den angegebenen Ordner verschieben</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Maximale Anzahl von Versionen pro Datei begrenzen</target>
+
+<source>Configuration</source>
+<target>Konfiguration</target>
+
+<source>Item exists on left side only</source>
+<target>Element existiert nur links</target>
+
+<source>Item exists on right side only</source>
+<target>Element existiert nur rechts</target>
+
+<source>Left side is newer</source>
+<target>Linke Seite ist neuer</target>
+
+<source>Right side is newer</source>
+<target>Rechte Seite ist neuer</target>
+
+<source>Items have different content</source>
+<target>Elemente haben unterschiedlichen Inhalt</target>
+
+<source>Conflict/item cannot be categorized</source>
+<target>Konflikt/Element, das nicht eingeordnet werden kann</target>
+
 <source>Synchronizing...</source>
 <target>Synchronisiere...</target>
 
@@ -681,8 +702,8 @@ gleich ist
 <source>Donate with PayPal</source>
 <target>Mit PayPal spenden</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Vielen Dank für die Lokalisation von FreeFileSync an:</target>
+<source>Many thanks for localization:</source>
+<target>Vielen Dank für die Lokalisation:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Feedback und Vorschläge sind willkommen</target>
@@ -699,9 +720,6 @@ gleich ist
 <source>Published under the GNU General Public License</source>
 <target>Veröffentlicht unter der Allgemeinen Öffentlichen GNU-Lizenz</target>
 
-<source>Use Recycle Bin</source>
-<target>Papierkorb verwenden</target>
-
 <source>Delete on both sides</source>
 <target>Auf beiden Seiten löschen</target>
 
@@ -771,7 +789,7 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Statistics</source>
 <target>Statistiken</target>
 
-<source>Do not show this dialog again</source>
+<source>Don't show this dialog again</source>
 <target>Diesen Dialog nicht mehr anzeigen</target>
 
 <source>Find what:</source>
@@ -855,11 +873,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Do you want to save changes to %x?</source>
 <target>Möchten Sie die Änderungen an %x speichern?</target>
 
-<source>Save</source>
-<target>Speichern</target>
-
-<source>Don't Save</source>
-<target>Nicht speichern</target>
+<source>Do&n't save</source>
+<target>&Nicht speichern</target>
 
 <source>Configuration loaded!</source>
 <target>Konfiguration geladen!</target>
@@ -951,8 +966,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Show files that won't be copied</source>
 <target>Dateien die nicht kopiert werden anzeigen</target>
 
-<source>All directories in sync!</source>
-<target>Alle Verzeichnisse sind synchron!</target>
+<source>All folders are in sync!</source>
+<target>Alle Ordner sind synchron!</target>
 
 <source>Comma separated list</source>
 <target>Kommagetrennte Liste</target>
@@ -1041,6 +1056,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Pause</source>
 <target>Pause</target>
 
+<source>Logging</source>
+<target>Protokoll</target>
+
 <source>Cannot find %x</source>
 <target>%x wurde nicht gefunden.</target>
 
@@ -1092,11 +1110,11 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>- folder part only</source>
 <target>- nur Ordneranteil</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- Entsprechung der anderen Seite zu %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Entsprechung der anderen Seite zu %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Entsprechung der anderen Seite zu %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Entsprechung der anderen Seite zu %item_folder%</target>
 
 <source>Make hidden dialogs and warning messages visible again?</source>
 <target>Versteckte Dialoge und Warnungen wieder sichtbar machen?</target>
@@ -1122,21 +1140,6 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Leave as unresolved conflict</source>
 <target>Als unbehandelten Konflikt belassen</target>
 
-<source>Delete permanently</source>
-<target>Endgültig löschen</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Dateien endgültig löschen oder überschreiben</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Papierkorb für zu löschende oder zu überschreibende Dateien nutzen</target>
-
-<source>Versioning</source>
-<target>Versionierung</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Verschiebe Dateien in einen Unterordner mit Zeitstempel</target>
-
 <source>Files</source>
 <target>Dateien</target>
 
@@ -1227,8 +1230,11 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Cannot copy file %x to %y.</source>
 <target>Die Datei %x kann nicht nach %y kopiert werden.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Das Verzeichnis %x kann nicht gelesen werden.</target>
+<source>Cannot open directory %x.</source>
+<target>Das Verzeichnis %x kann nicht geöffnet werden.</target>
+
+<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>
@@ -1281,8 +1287,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Files %x have the same date but a different size!</source>
 <target>Die Dateien %x haben dasselbe Datum, aber unterschiedliche Größen!</target>
 
-<source>Items have different attributes</source>
-<target>Die Elemente haben unterschiedliche Attribute</target>
+<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>
@@ -1362,6 +1368,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Moving symbolic link %x to %y</source>
 <target>Verschiebe Symbolischen Link %x nach %y</target>
 
+<source>Removing old versions...</source>
+<target>Entferne alte Versionen...</target>
+
 <source>Creating file %x</source>
 <target>Erstelle Datei %x</target>
 
@@ -1416,7 +1425,7 @@ 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>Synchronize folder pair:</source>
+<source>Synchronizing folder pair:</source>
 <target>Synchronisiere Ordnerpaar:</target>
 
 <source>Target folder %x already existing.</source>
diff --git a/BUILD/Languages/greek.lng b/BUILD/Languages/greek.lng
index f75accaf..ed8e6f27 100644
--- a/BUILD/Languages/greek.lng
+++ b/BUILD/Languages/greek.lng
@@ -10,6 +10,15 @@
 <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>Show in Explorer</source>
 <target>Εμφάνιση στην Εξερεύνηση</target>
 
@@ -22,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Ζητήθηκε ματαίωση: Αναμονή για την λήξη της τρέχουσας εργασίας...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Αυτοματοποιημένος Συγχρονισμός</target>
 
@@ -49,12 +61,12 @@
 <source>Create a batch job</source>
 <target>Δημιουργία μιας δέσμης ενεργειών</target>
 
-<source>Synchronization settings</source>
-<target>Ρυθμίσεις συγχρονισμού</target>
-
 <source>Comparison settings</source>
 <target>Ρυθμίσεις σύγκρισης</target>
 
+<source>Synchronization settings</source>
+<target>Ρυθμίσεις συγχρονισμού</target>
+
 <source>About</source>
 <target>Σχετικά με το...</target>
 
@@ -76,27 +88,6 @@
 <source>Select time span</source>
 <target>Επιλογή χρονικού διαστήματος</target>
 
-<source>Show pop-up</source>
-<target>Εμφάνιση αναδυόμενου παράθυρου</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Εμφάνιση αναδυόμενου παράθυρου σε σφάλματα ή προειδοποιήσεις</target>
-
-<source>Ignore errors</source>
-<target>Παράβλεψη των σφαλμάτων</target>
-
-<source>Hide all error and warning messages</source>
-<target>Απόκρυψη όλων των σφαλμάτων και προειδοποιήσεων</target>
-
-<source>Exit instantly</source>
-<target>Άμεση έξοδος</target>
-
-<source>Abort synchronization immediately</source>
-<target>Άμεση ματαίωση του συγχρονισμού</target>
-
-<source>Browse</source>
-<target>Αναζήτηση</target>
-
 <source>Invalid command line:</source>
 <target>Σφάλμα στη γραμμή εντολών:</target>
 
@@ -235,8 +226,8 @@
 <source>&Open...</source>
 <target>Ά&νοιγμα...</target>
 
-<source>Save &As...</source>
-<target>Αποθή&κευση ως...</target>
+<source>Save &as...</source>
+<target>Απο&θήκευση ως...</target>
 
 <source>&Quit</source>
 <target>Έ&ξοδος</target>
@@ -277,6 +268,9 @@
 <source>Remove folder</source>
 <target>Διαγραφή του υποκαταλόγου</target>
 
+<source>Browse</source>
+<target>Αναζήτηση</target>
+
 <source>Select a folder</source>
 <target>Επιλογή υποκαταλόγου</target>
 
@@ -309,8 +303,8 @@ The command is triggered if:
 <source>Cancel</source>
 <target>Άκυρο</target>
 
-<source>(Build: %x)</source>
-<target>(Δημιουργήθηκε : %x)</target>
+<source>Build: %x</source>
+<target>Δημιουργήθηκε : %x</target>
 
 <source>All files</source>
 <target>Όλα τα αρχεία</target>
@@ -330,9 +324,6 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>Ένα πεδίο εισαγωγής υποκαταλόγων είναι άδειο.</target>
 
-<source>Logging</source>
-<target>Καταγραφή μηνυμάτων</target>
-
 <source>File time and size</source>
 <target>Ημερομηνία και μέγεθος αρχείων</target>
 
@@ -354,21 +345,6 @@ The command is triggered if:
 <source>FreeFileSync batch</source>
 <target>Δέσμη ενεργειών του FreeFileSync</target>
 
-<source>Batch execution</source>
-<target>Εκτέλεση δέσμης ενεργειών</target>
-
-<source>Items processed:</source>
-<target>Επεξεργάστηκαν στοιχεία:</target>
-
-<source>Items remaining:</source>
-<target>Περισσεύουν στοιχεία:</target>
-
-<source>Total time:</source>
-<target>Συνολική διάρκεια:</target>
-
-<source>Stop</source>
-<target>Λήξη</target>
-
 <source>Synchronization aborted!</source>
 <target>Ο συγχρονισμός ματαιώθηκε!</target>
 
@@ -528,11 +504,11 @@ The command is triggered if:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Διατάξεις που χρησιμοποιήθηκαν τελευταία (πατήστε DEL για διαγραφή από τη λίστα)</target>
 
-<source>Hide excluded items</source>
-<target>Απόκρυψη των εξαιρεθέντων στοιχείων</target>
+<source>Show excluded items</source>
+<target>Εμφάνιση εξαιρεθέντων στοιχείων</target>
 
-<source>Hide filtered or temporarily excluded files</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>
@@ -576,24 +552,81 @@ The command is triggered if:
 <source>Right</source>
 <target>Δεξιά</target>
 
-<source>Status feedback</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>On completion:</source>
+<target>Μετά την ολοκλήρωση:</target>
 
 <source>Show progress dialog</source>
 <target>Εμφάνιση της αναφοράς προόδου</target>
 
-<source>Error handling</source>
-<target>Διαχείριση σφαλμάτων</target>
+<source>Generate log file</source>
+<target>Δημιουργία αρχείων καταγραφής</target>
 
-<source>Maximum number of log files:</source>
-<target>Μέγιστος αριθμός αρχείων καταγραφής:</target>
+<source>Select folder to save log files</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>Batch settings</source>
 <target>Ρυθμίσεις δέσμης ενεργειών</target>
 
+<source>Compare by...</source>
+<target>Σύγκριση με βάση το...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Τα αρχεία θεωρούνται ίδια εάν
+     - η ημερομηνία και ώρα τελευταίας τροποποίησης
+     - το μέγεθός τους
+είναι ίδια
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Τα αρχεία θεωρούνται ίδια, εάν
+     - το περιεχόμενό τους
+είναι ίδιο
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Τρόπος διαχείρισης των συμβολικών δεσμών</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Επιλέξτε μια μέθοδο:</target>
 
@@ -610,10 +643,28 @@ The command is triggered if:
 <target>Ορίστε τους δικούς σας κανόνες συγχρονισμού.</target>
 
 <source>Deletion handling</source>
-<target>Διαχείριση των διαγραφών</target>
+<target>Διαγραφή των αρχείων</target>
 
-<source>On completion:</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 when deleting or overwriting files</source>
+<target>Χρήση του Κάδου Ανακύκλωσης κατά τη διαγραφή ή αντικατάσταση αρχείων</target>
+
+<source>Versioning</source>
+<target>Διατήρηση παλιών εκδόσεων</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Μεταφορά χρονοσημασμένων αρχείων σε συγκεκριμένο υποκατάλογο</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Περιορισμός του μέγιστου αριθμού εκδόσεων ανά αρχείο</target>
 
 <source>Configuration</source>
 <target>Διάταξη</target>
@@ -636,39 +687,6 @@ The command is triggered if:
 <source>Conflict/item cannot be categorized</source>
 <target>Διένεξη/το αντικείμενο δεν μπορεί να κατηγοριοποιηθεί</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Σύγκριση με βάση το...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Τα αρχεία θεωρούνται ίδια εάν
-     - η ημερομηνία και ώρα τελευταίας τροποποίησης
-     - το μέγεθός τους
-είναι ίδια
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Τα αρχεία θεωρούνται ίδια, εάν
-     - το περιεχόμενό τους
-είναι ίδιο
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Τρόπος διαχείρισης των συμβολικών δεσμών</target>
-
 <source>Synchronizing...</source>
 <target>Γίνεται συγχρονισμός...</target>
 
@@ -684,8 +702,8 @@ is the same
 <source>Donate with PayPal</source>
 <target>Κάντε μια δωρεά μέσω PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Για τις μεταφράσεις του FreeFileSync, ευχαριστούμε τους:</target>
+<source>Many thanks for localization:</source>
+<target>Πολλές ευχαριστίες για τις μεταφράσεις:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Τα σχόλια και οι προτάσεις σας είναι ευπρόσδεκτα</target>
@@ -702,9 +720,6 @@ is the same
 <source>Published under the GNU General Public License</source>
 <target>Διανέμεται υπό την Γενική Άδεια Δημόσιας Χρήσης GNU</target>
 
-<source>Use Recycle Bin</source>
-<target>Χρήση του Κάδου Ανακύκλωσης</target>
-
 <source>Delete on both sides</source>
 <target>Διαγραφή και στις δυο πλευρές</target>
 
@@ -774,7 +789,7 @@ Note: File names must be relative to base directories!
 <source>Statistics</source>
 <target>Στατιστικά</target>
 
-<source>Do not show this dialog again</source>
+<source>Don't show this dialog again</source>
 <target>Να μην εμφανιστεί ξανά αυτό το μήνυμα</target>
 
 <source>Find what:</source>
@@ -858,11 +873,8 @@ Note: File names must be relative to base directories!
 <source>Do you want to save changes to %x?</source>
 <target>Θέλετε να αποθηκεύσετε τις αλλαγές στο %x;</target>
 
-<source>Save</source>
-<target>Αποθήκευση</target>
-
-<source>Don't Save</source>
-<target>Χωρίς αποθήκευση</target>
+<source>Do&n't save</source>
+<target>Να &μην αποθηκευθούν</target>
 
 <source>Configuration loaded!</source>
 <target>Η διάταξη έχει ανοιχθεί!</target>
@@ -954,7 +966,7 @@ Note: File names must be relative to base directories!
 <source>Show files that won't be copied</source>
 <target>Εμφάνιση των αρχείων που δε θα αντιγραφούν</target>
 
-<source>All directories in sync!</source>
+<source>All folders are in sync!</source>
 <target>Όλοι οι υποκατάλογοι είναι συγχρονισμένοι!</target>
 
 <source>Comma separated list</source>
@@ -1044,6 +1056,9 @@ Note: File names must be relative to base directories!
 <source>Pause</source>
 <target>Παύση</target>
 
+<source>Logging</source>
+<target>Καταγραφή μηνυμάτων</target>
+
 <source>Cannot find %x</source>
 <target>Δεν μπορεί να βρεθεί το %x</target>
 
@@ -1125,21 +1140,6 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>Παράβλεψη ως ανεπίλυτη διένεξη</target>
 
-<source>Delete permanently</source>
-<target>Μόνιμη διαγραφή</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Μόνιμη διαγραφή ή αντικατάσταση των αρχείων</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Χρήση του Κάδου Ανακύκλωσης κατά τη διαγραφή ή αντικατάσταση αρχείων</target>
-
-<source>Versioning</source>
-<target>Διατήρηση παλιών εκδόσεων</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Μεταφορά αρχείων σε υποκατάλογο με χρονική περιγραφή</target>
-
 <source>Files</source>
 <target>Αρχεία</target>
 
@@ -1230,8 +1230,11 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>Δεν μπορεί να αντιγραφεί το αρχείο %x στο %y.</target>
 
-<source>Cannot read directory %x.</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>
@@ -1240,7 +1243,7 @@ Note: File names must be relative to base directories!
 <target>Τα δικαιώματα %x δεν μπορούν να οριστούν.</target>
 
 <source>Unable to move %x to the Recycle Bin!</source>
-<target>Το αρχείο %x δεν μπόρεσε να μεταφερθεί στον Κάδο Ανακύκλωσης!</target>
+<target>Το αρχείο %x δεν ήταν δυνατό να μεταφερθεί στον Κάδο Ανακύκλωσης!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Και οι δυο πλευρές έχουν αλλάξει από τον τελευταίο συγχρονισμό!</target>
@@ -1257,6 +1260,9 @@ Note: File names must be relative to base directories!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Ρύθμιση προεπιλεγμένης κατεύθυνσης συγχρονισμού: Τα νεότερα αρχεία θα αντικαταστήσουν τα παλιότερα.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Ο Κάδος Ανακύκλωσης δεν είναι διαθέσιμος για τις ακόλουθες διαδρομές! Τα αρχεία θα διαγραφούν μόνιμα:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Μπορείτε να αγνοήσετε αυτό το λάθος, για να θεωρήσετε ότι ο υποκατάλογος είναι κενός.</target>
 
@@ -1266,6 +1272,9 @@ Note: File names must be relative to base directories!
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Οι υποκατάλογοι είναι εξαρτώμενοι. Προσοχή κατά την εισαγωγή των κανόνων συγχρονισμού:</target>
 
+<source>Start comparison</source>
+<target>Έναρξη σύγκρισης</target>
+
 <source>Preparing synchronization...</source>
 <target>Προετοιμασία του συγχρονισμού...</target>
 
@@ -1278,6 +1287,9 @@ Note: File names must be relative to base directories!
 <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>Symbolic links %x have the same date but a different target.</source>
 <target>Οι συμβολικοί δεσμοί %x έχουν την ίδια ημερομηνία αλλά διαφορετικό προορισμό.</target>
 
@@ -1293,9 +1305,6 @@ Note: File names must be relative to base directories!
 <source>Both sides are equal</source>
 <target>Οι δυο πλευρές είναι ίδιες</target>
 
-<source>Items have different attributes</source>
-<target>Τα στοιχεία έχουν διαφορετικά χαρακτηριστικά</target>
-
 <source>Copy new item to left</source>
 <target>Αντιγραφή του νέου στοιχείου στα αριστερά</target>
 
@@ -1359,6 +1368,9 @@ Note: File names must be relative to base directories!
 <source>Moving symbolic link %x to %y</source>
 <target>Μεταφορά του συμβολικού δεσμού %x στο %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>Δημιουργία του αρχείου %x</target>
 
@@ -1410,14 +1422,11 @@ Note: File names must be relative to base directories!
 <source>Available:</source>
 <target>Διαθέσιμος:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Ο Κάδος Ανακύκλωσης δεν είναι διαθέσιμος για τις ακόλουθες διαδρομές! Τα αρχεία θα διαγραφούν μόνιμα:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Θα τροποποιηθεί ένας υποκατάλογος που είναι μέρος από πολλαπλά ζεύγη υποκαταλόγων. Παρακαλούμε επανελέγξτε τις ρυθμίσεις συγχρονισμού.</target>
 
-<source>Processing folder pair:</source>
-<target>Σύγκριση του ζεύγους υποκαταλόγων:</target>
+<source>Synchronizing folder pair:</source>
+<target>Συγχρονίζεται το ζευγάρι υποκαταλόγων:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Ο υποκατάλογος-στόχος %x υπάρχει ήδη.</target>
diff --git a/BUILD/Languages/hebrew.lng b/BUILD/Languages/hebrew.lng
index db4dd2c6..16d7919a 100644
--- a/BUILD/Languages/hebrew.lng
+++ b/BUILD/Languages/hebrew.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>מחפש את תיקייה %x...</target>
 
-<source>Batch execution</source>
-<target>פעולת אצווה</target>
-
 <source>Items processed:</source>
 <target>אלמנטים עובדו:</target>
 
@@ -34,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>התקבלה בקשת ביטול: מחכה לפעולה הנוכחית להסתיים...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - סינכרון  אוטומטי</target>
 
@@ -61,12 +61,12 @@
 <source>Create a batch job</source>
 <target>יוצר עבודת אצווה</target>
 
-<source>Synchronization settings</source>
-<target>הגדרות סנכרון</target>
-
 <source>Comparison settings</source>
 <target>הגדרות השוואה</target>
 
+<source>Synchronization settings</source>
+<target>הגדרות סנכרון</target>
+
 <source>About</source>
 <target>אודות</target>
 
@@ -88,27 +88,6 @@
 <source>Select time span</source>
 <target>בחר תחום זמן</target>
 
-<source>Show pop-up</source>
-<target>הראה חלונות מוקפצים</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>הראה חלונות מוקפצים עבור שגיאות או אזהרות</target>
-
-<source>Ignore errors</source>
-<target>התעלם מטעויות</target>
-
-<source>Hide all error and warning messages</source>
-<target>הסתר את כל הודעות ההזהרה והשגיאה</target>
-
-<source>Exit instantly</source>
-<target>צא מידית</target>
-
-<source>Abort synchronization immediately</source>
-<target>הפסק סנכרון מידית</target>
-
-<source>Browse</source>
-<target>עיין</target>
-
 <source>Invalid command line:</source>
 <target>שורת פקודה בלתי חוקית:</target>
 
@@ -247,8 +226,8 @@
 <source>&Open...</source>
 <target>&פתח...</target>
 
-<source>Save &As...</source>
-<target>שמור בשם&</target>
+<source>Save &as...</source>
+<target>שמור &בשם...</target>
 
 <source>&Quit</source>
 <target>&יציאה</target>
@@ -289,6 +268,9 @@
 <source>Remove folder</source>
 <target>הסר מחיצה</target>
 
+<source>Browse</source>
+<target>עיין</target>
+
 <source>Select a folder</source>
 <target>בחר מחיצה</target>
 
@@ -321,8 +303,8 @@ The command is triggered if:
 <source>Cancel</source>
 <target>בטל</target>
 
-<source>(Build: %x)</source>
-<target>(מבנה: %x)</target>
+<source>Build: %x</source>
+<target>מבנה: %x</target>
 
 <source>All files</source>
 <target>כל הקבצים</target>
@@ -342,9 +324,6 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>שדה קלט תיקייה ריק.</target>
 
-<source>Logging</source>
-<target>רישום ביומן</target>
-
 <source>File time and size</source>
 <target>זמן וגודל קובץ</target>
 
@@ -525,11 +504,11 @@ The command is triggered if:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>תצורות אחרונות שהיו בשמוש (לחץ DEL להסרה מהרשימה)</target>
 
-<source>Hide excluded items</source>
-<target>החבא פריטים נשללים</target>
+<source>Show excluded items</source>
+<target>הראה פריטים שלא נכללו</target>
 
-<source>Hide filtered or temporarily excluded files</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>
@@ -573,24 +552,81 @@ The command is triggered if:
 <source>Right</source>
 <target>שמאל</target>
 
-<source>Status feedback</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>On completion:</source>
+<target>לאחר סיום:</target>
 
 <source>Show progress dialog</source>
 <target>הראה שיח התקדמות</target>
 
-<source>Error handling</source>
-<target>טיפול בשגיאות</target>
+<source>Generate log file</source>
+<target>יצר קובץ יומן</target>
+
+<source>Select folder to save log files</source>
+<target>בחר תיקיה לשמירת קובץ יומן</target>
 
-<source>Maximum number of log files:</source>
-<target>מספר מכסימלי של קבצי יומן</target>
+<source>Limit</source>
+<target>הגבלה</target>
 
-<source>Select folder to save log files:</source>
-<target>בחר תיקייה לשמירה קבצי יומן:</target>
+<source>Limit maximum number of log files</source>
+<target>הגבל מספר מכסימלי של קבצי יומן</target>
 
 <source>Batch settings</source>
 <target>הגדרות אצווה</target>
 
+<source>Compare by...</source>
+<target>השווה ע"י...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+הקבצים יימצאו כזהים אם
+     - זמן ותאריך שמירה אחרונים
+     - גודל קובץ
+הם זהים
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+קבצים מוגדרים כזהים אם
+     - תכולת הקובץ
+היא זהה
+</target>
+
+<source>Symbolic Link handling</source>
+<target>טיפול בקישור סימבולי</target>
+
+<source>OK</source>
+<target>אשר</target>
+
 <source>Select variant:</source>
 <target>בחר משתנה:</target>
 
@@ -609,8 +645,26 @@ The command is triggered if:
 <source>Deletion handling</source>
 <target>טיפול במחיקות</target>
 
-<source>On completion:</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 when deleting or overwriting files</source>
+<target>השתמש בסל המיחזור כאשר מוחק או דורס קבצים</target>
+
+<source>Versioning</source>
+<target>עדכון גרסאות</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>העבר קבצים עם חתימת זמן לתיקיה מיוחדת</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>הגבל מספר מכסימלי של גרסאות לקובץ</target>
 
 <source>Configuration</source>
 <target>תצורה</target>
@@ -633,39 +687,6 @@ The command is triggered if:
 <source>Conflict/item cannot be categorized</source>
 <target>סתירה/פריט אינו ניתן לסיווג</target>
 
-<source>OK</source>
-<target>אשר</target>
-
-<source>Compare by...</source>
-<target>השווה ע"י...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-הקבצים יימצאו כזהים אם
-     - זמן ותאריך שמירה אחרונים
-     - גודל קובץ
-הם זהים
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-קבצים מוגדרים כזהים אם
-     - תכולת הקובץ
-היא זהה
-</target>
-
-<source>Symbolic Link handling</source>
-<target>טיפול בקישור סימבולי</target>
-
 <source>Synchronizing...</source>
 <target>מסנכרן...</target>
 
@@ -681,8 +702,8 @@ is the same
 <source>Donate with PayPal</source>
 <target>תרום עם פייפל</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>תודות עבור עבודות התרגום של תוכנת הסנכרון:</target>
+<source>Many thanks for localization:</source>
+<target>תודות עבור תרגום שפות:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>משוב והצעות יתקבלו בברכה</target>
@@ -699,9 +720,6 @@ is the same
 <source>Published under the GNU General Public License</source>
 <target>מפורסם במסגרת GNU General Public License</target>
 
-<source>Use Recycle Bin</source>
-<target>השתמש בסל המיחזור</target>
-
 <source>Delete on both sides</source>
 <target>מחק בשני הצדדים</target>
 
@@ -771,8 +789,8 @@ Note: File names must be relative to base directories!
 <source>Statistics</source>
 <target>סטטיסטיקה</target>
 
-<source>Do not show this dialog again</source>
-<target>אל תראה מסך זה שנית</target>
+<source>Don't show this dialog again</source>
+<target>אל תראה דו-שיח זה שוב</target>
 
 <source>Find what:</source>
 <target>חפש מה:</target>
@@ -855,11 +873,8 @@ Note: File names must be relative to base directories!
 <source>Do you want to save changes to %x?</source>
 <target>האם לשמור שינויים אל %x?</target>
 
-<source>Save</source>
-<target>שמור</target>
-
-<source>Don't Save</source>
-<target>אל תשמור</target>
+<source>Do&n't save</source>
+<target>אל &תשמור</target>
 
 <source>Configuration loaded!</source>
 <target>תצורה הוטענה!</target>
@@ -951,8 +966,8 @@ Note: File names must be relative to base directories!
 <source>Show files that won't be copied</source>
 <target>הראה קבצים שלא יועתקו</target>
 
-<source>All directories in sync!</source>
-<target>כל המחיצות מסונכרנות!</target>
+<source>All folders are in sync!</source>
+<target>כל התיקיות מסונכרנות</target>
 
 <source>Comma separated list</source>
 <target>רשימה מופרדת פסיקים</target>
@@ -1041,6 +1056,9 @@ Note: File names must be relative to base directories!
 <source>Pause</source>
 <target>עצור</target>
 
+<source>Logging</source>
+<target>רישום ביומן</target>
+
 <source>Cannot find %x</source>
 <target>לא מוצא %x</target>
 
@@ -1122,21 +1140,6 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>השאר כקונפליקט לא מטופל</target>
 
-<source>Delete permanently</source>
-<target>מחק לצמיתות</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>מחק או דרוס קבצים לצמיתות</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>השתמש בסל המיחזור כאשר מוחק או דורס קבצים</target>
-
-<source>Versioning</source>
-<target>עדכון גרסאות</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>העבר קבצים לתיקייה המסומנת בחותמת-זמן</target>
-
 <source>Files</source>
 <target>קבצים</target>
 
@@ -1227,8 +1230,11 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>לא יכול להעתיק קובץ %x  אל %y.</target>
 
-<source>Cannot read directory %x.</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>
@@ -1254,6 +1260,9 @@ Note: File names must be relative to base directories!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>בחר ברירת מחדל של סנכרון: קבצים ישנים ידרסו ע"י קבצים חדשים יותר.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>סל מחזור אינו זמין עבור הנתיבים הבאים! קבצים ימחקו לצמיתות:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>ניתן להתעלם משגיאה זו ולהחשיב התיקייה כריקה.</target>
 
@@ -1263,6 +1272,9 @@ Note: File names must be relative to base directories!
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>מחיצות תלויות! זהירות בהגדרת כללי סנכרון:</target>
 
+<source>Start comparison</source>
+<target>התחל השוואה</target>
+
 <source>Preparing synchronization...</source>
 <target>מכין סינכרון...</target>
 
@@ -1275,6 +1287,9 @@ Note: File names must be relative to base directories!
 <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>Symbolic links %x have the same date but a different target.</source>
 <target>לקישורים סימבוליים %x יש תאריך זהה אבל יעד שונה.</target>
 
@@ -1290,9 +1305,6 @@ Note: File names must be relative to base directories!
 <source>Both sides are equal</source>
 <target>שני הצדדים שווים</target>
 
-<source>Items have different attributes</source>
-<target>הפריטים הם בעלי תכונות שונות</target>
-
 <source>Copy new item to left</source>
 <target>העתק פריט חדש לצד ימין</target>
 
@@ -1356,6 +1368,9 @@ Note: File names must be relative to base directories!
 <source>Moving symbolic link %x to %y</source>
 <target>מעביר קישור סימבולי %x אל %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>יוצר קובץ %x</target>
 
@@ -1407,14 +1422,11 @@ Note: File names must be relative to base directories!
 <source>Available:</source>
 <target>זמין:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>סל מחזור אינו זמין עבור הנתיבים הבאים! קבצים ימחקו לצמיתות:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>התיקייה שתשתנה היא חלק מריבוי זוגות תיקיות. אנא סקור מחדש הגדרות סינכרון.</target>
 
-<source>Processing folder pair:</source>
-<target>מבצע זוג מחיצות:</target>
+<source>Synchronizing folder pair:</source>
+<target>מסנכרן זוג תיקיות:</target>
 
 <source>Target folder %x already existing.</source>
 <target>תיקיית מטרה %x כבר קיימת.</target>
diff --git a/BUILD/Languages/hungarian.lng b/BUILD/Languages/hungarian.lng
index f1b0ae8b..adca1b46 100644
--- a/BUILD/Languages/hungarian.lng
+++ b/BUILD/Languages/hungarian.lng
@@ -10,6 +10,15 @@
 <source>Searching for folder %x...</source>
 <target>A(z) %x mappa keresése...</target>
 
+<source>Items processed:</source>
+<target>Feldolgozott elemek száma:</target>
+
+<source>Items remaining:</source>
+<target>Hátralévő elemek száma:</target>
+
+<source>Total time:</source>
+<target>Becsült idő:</target>
+
 <source>Show in Explorer</source>
 <target>Mutatás az Intézőben</target>
 
@@ -22,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Megszakítási kérelem: Várakozás a folyamatban lévő művelet befejezésére...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatikus szinkronizálás</target>
 
@@ -49,12 +61,12 @@
 <source>Create a batch job</source>
 <target>Kötegelt feladat létrehozása</target>
 
-<source>Synchronization settings</source>
-<target>Szinkronizáció beállításai</target>
-
 <source>Comparison settings</source>
 <target>Összehasonlítási beállítások</target>
 
+<source>Synchronization settings</source>
+<target>Szinkronizáció beállításai</target>
+
 <source>About</source>
 <target>A programról</target>
 
@@ -76,27 +88,6 @@
 <source>Select time span</source>
 <target>Időintervallum kiválasztása</target>
 
-<source>Show pop-up</source>
-<target>Párbeszédablak mutatása</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Párbeszédablakok mutatása hiba vagy figyelmeztetés esetén</target>
-
-<source>Ignore errors</source>
-<target>Hibák figyelmen kívül hagyása</target>
-
-<source>Hide all error and warning messages</source>
-<target>Összes hibaüzenet és figyelmeztetés elrejtése</target>
-
-<source>Exit instantly</source>
-<target>Kilépés azonnal</target>
-
-<source>Abort synchronization immediately</source>
-<target>Szinkronizáció azonnali megszakítása</target>
-
-<source>Browse</source>
-<target>Tallózás</target>
-
 <source>Invalid command line:</source>
 <target>Érvénytelen parancssor:</target>
 
@@ -146,7 +137,7 @@
 <target>A következő adatbázisfájl nem létezik: %x.</target>
 
 <source>Database file is corrupt:</source>
-<target></target>
+<target>Sérült adatbázisfájl:</target>
 
 <source>Out of memory!</source>
 <target>Elfogyott a szabad memória!</target>
@@ -235,8 +226,8 @@
 <source>&Open...</source>
 <target>&Megnyitás...</target>
 
-<source>Save &As...</source>
-<target></target>
+<source>Save &as...</source>
+<target>Mentés m&ásként...</target>
 
 <source>&Quit</source>
 <target>&Kilépés</target>
@@ -277,6 +268,9 @@
 <source>Remove folder</source>
 <target>Mappa eltávolítása</target>
 
+<source>Browse</source>
+<target>Tallózás</target>
+
 <source>Select a folder</source>
 <target>Mappa kiválasztása</target>
 
@@ -309,11 +303,11 @@ A parancs végrehajtódik, ha:
 <source>Cancel</source>
 <target>Mégsem</target>
 
-<source>(Build: %x)</source>
-<target>(Build: %x)</target>
+<source>Build: %x</source>
+<target>Build: %x</target>
 
 <source>All files</source>
-<target></target>
+<target>Összes fájl</target>
 
 <source>&Restore</source>
 <target>&Visszaállítás</target>
@@ -328,10 +322,7 @@ A parancs végrehajtódik, ha:
 <target>Várakozás a hiányzó mappákra...</target>
 
 <source>A folder input field is empty.</source>
-<target></target>
-
-<source>Logging</source>
-<target>Naplózás</target>
+<target>A mappa beviteli mezeje üres.</target>
 
 <source>File time and size</source>
 <target>Fájl dátuma és mérete</target>
@@ -352,22 +343,7 @@ A parancs végrehajtódik, ha:
 <target>Egyedi</target>
 
 <source>FreeFileSync batch</source>
-<target></target>
-
-<source>Batch execution</source>
-<target>Kötegelt végrehajtás</target>
-
-<source>Items processed:</source>
-<target>Feldolgozott elemek száma:</target>
-
-<source>Items remaining:</source>
-<target>Hátralévő elemek száma:</target>
-
-<source>Total time:</source>
-<target>Becsült idő:</target>
-
-<source>Stop</source>
-<target>Megállítás</target>
+<target>FreeFileSync kötegelt fájl</target>
 
 <source>Synchronization aborted!</source>
 <target>A szinkronizáció megszakítva!</target>
@@ -391,7 +367,7 @@ A parancs végrehajtódik, ha:
 <target>A csatlakozás a sourceforge.net-hez sikertelen!</target>
 
 <source>A new version of FreeFileSync is available:</source>
-<target></target>
+<target>Elérhető a FreeFileSync új verziója:</target>
 
 <source>Download now?</source>
 <target>Letöltsem most?</target>
@@ -436,10 +412,10 @@ A parancs végrehajtódik, ha:
 <target>Kiterjesztés</target>
 
 <source>Size:</source>
-<target></target>
+<target>Méret:</target>
 
 <source>Date:</source>
-<target></target>
+<target>Dátum:</target>
 
 <source>Action</source>
 <target>Művelet</target>
@@ -475,7 +451,7 @@ A parancs végrehajtódik, ha:
 <target>&Új</target>
 
 <source>&Save</source>
-<target></target>
+<target>&Mentés</target>
 
 <source>&Language</source>
 <target>&Nyelv</target>
@@ -528,11 +504,11 @@ A parancs végrehajtódik, ha:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Utoljára használt beállítások (DEL billentyűvel törölhető a listából)</target>
 
-<source>Hide excluded items</source>
-<target>A kizárt elemek elrejtése</target>
+<source>Show excluded items</source>
+<target>Kizárt elemek mutatása</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>A kiszűrt vagy ideiglenesen kizárt fájlok elrejtése</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>A szűrt vagy ideiglenesen kizárt fájlok mutatása</target>
 
 <source>Number of files and folders that will be created</source>
 <target>A létrehozandó fájlok és mappák száma</target>
@@ -544,7 +520,7 @@ A parancs végrehajtódik, ha:
 <target>A törlendő fájlok és mappák száma</target>
 
 <source>Total bytes to copy</source>
-<target></target>
+<target>Összesen másolandó bájtok</target>
 
 <source>Items found:</source>
 <target>Talált elemek száma:</target>
@@ -553,10 +529,10 @@ A parancs végrehajtódik, ha:
 <target>Sebesség:</target>
 
 <source>Time remaining:</source>
-<target></target>
+<target>Hátralévő idő:</target>
 
 <source>Time elapsed:</source>
-<target></target>
+<target>Eltelt idő:</target>
 
 <source>Batch job</source>
 <target>Kötegelt feladat</target>
@@ -576,24 +552,79 @@ A parancs végrehajtódik, ha:
 <source>Right</source>
 <target>Jobb oldal</target>
 
-<source>Status feedback</source>
-<target>Státusz visszajelzés</target>
+<source>Error handling</source>
+<target>Hibakezelés</target>
+
+<source>Ignore</source>
+<target>Kihagy</target>
+
+<source>Hide all error and warning messages</source>
+<target>Összes hibaüzenet és figyelmeztetés elrejtése</target>
+
+<source>Pop-up</source>
+<target>Párbeszédablak</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Párbeszédablakok mutatása hiba vagy figyelmeztetés esetén</target>
+
+<source>Exit</source>
+<target>Kilépés</target>
+
+<source>Abort synchronization on first error</source>
+<target>Szinkronizáció leállítása az első hibánál</target>
+
+<source>On completion:</source>
+<target>Végrehajtás után:</target>
 
 <source>Show progress dialog</source>
 <target>Folyamatjelző párbeszédablak mutatása</target>
 
-<source>Error handling</source>
-<target>Hibakezelés</target>
+<source>Generate log file</source>
+<target>Naplófájl generálása</target>
 
-<source>Maximum number of log files:</source>
-<target>Naplófájlok maximális száma:</target>
+<source>Select folder to save log files</source>
+<target>Válaszd ki a mappát a naplófájlok mentéséhez</target>
 
-<source>Select folder to save log files:</source>
-<target>Válaszd ki a mappát a naplófájlok mentéséhez:</target>
+<source>Limit</source>
+<target>Korlát</target>
+
+<source>Limit maximum number of log files</source>
+<target>Naplófájlok maximális számának korlátozása</target>
 
 <source>Batch settings</source>
 <target>Beállítások</target>
 
+<source>Compare by...</source>
+<target>Összehasonlítás</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+A fájlok egyezőnek tekintendők, ha megegyezik
+     - az utolsó módosításuk dátuma és ideje
+     - a fájlméret
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+A fájlok megegyeznek, ha megegyezik
+  - a fájlok tartalma
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Symlink kezelés</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Változat kiválasztása:</target>
 
@@ -612,8 +643,26 @@ A parancs végrehajtódik, ha:
 <source>Deletion handling</source>
 <target>Törlések kezelése</target>
 
-<source>On completion:</source>
-<target>Végrehajtás után:</target>
+<source>Permanent</source>
+<target>Állandó</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>A fájlok folyamatos törlése vagy felülírása</target>
+
+<source>Recycle Bin</source>
+<target>Lomtár (Recycle Bin)</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>A Lomtár (Recycle Bin) használata fájlok törlésénél vagy felülírásánál</target>
+
+<source>Versioning</source>
+<target>Verziókövetés</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Időbélyeges fájlok mozgatása a megadott mappába</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Verziók maximális számának korlátozása fájlonként</target>
 
 <source>Configuration</source>
 <target>Beállítás</target>
@@ -636,37 +685,6 @@ A parancs végrehajtódik, ha:
 <source>Conflict/item cannot be categorized</source>
 <target>Az ütközés vagy elem nem kategorizálható</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Összehasonlítás</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-A fájlok egyezőnek tekintendők, ha megegyezik
-     - az utolsó módosításuk dátuma és ideje
-     - a fájlméret
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-A fájlok megegyeznek, ha megegyezik
-  - a fájlok tartalma
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Symlink kezelés</target>
-
 <source>Synchronizing...</source>
 <target>Szinkronizálás folyamatban...</target>
 
@@ -682,11 +700,8 @@ A fájlok megegyeznek, ha megegyezik
 <source>Donate with PayPal</source>
 <target>Ha szereted a FreeFileSync-et, támogasd a PayPal segítségével.</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>
-Nagy köszönet a FreeFileSync lokalizációjáért
-a következő személyeknek:
-</target>
+<source>Many thanks for localization:</source>
+<target>Ezer köszönet a lokalizációért:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Várjuk a visszajelzéseket és az ötleteket</target>
@@ -703,9 +718,6 @@ a következő személyeknek:
 <source>Published under the GNU General Public License</source>
 <target>Kiadva a GNU General Public License alatt</target>
 
-<source>Use Recycle Bin</source>
-<target>Lomtár (Recycle Bin) használata</target>
-
 <source>Delete on both sides</source>
 <target>Törlés mindkét oldalon</target>
 
@@ -775,8 +787,8 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Statistics</source>
 <target>Statisztikák</target>
 
-<source>Do not show this dialog again</source>
-<target>Ne mutasd újra ezt a párbeszédablakot</target>
+<source>Don't show this dialog again</source>
+<target>Ne mutasd ezt a párbeszédablakot többé</target>
 
 <source>Find what:</source>
 <target>Mit keresünk:</target>
@@ -857,13 +869,10 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <target>Változtatások figyelmen kívül hagyása</target>
 
 <source>Do you want to save changes to %x?</source>
-<target></target>
+<target>Akarod menteni a %x változtatásait?</target>
 
-<source>Save</source>
-<target></target>
-
-<source>Don't Save</source>
-<target></target>
+<source>Do&n't save</source>
+<target>Ne mentsd</target>
 
 <source>Configuration loaded!</source>
 <target>Beállítások betöltve!</target>
@@ -955,7 +964,7 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Show files that won't be copied</source>
 <target>A nem másolandó fájlok mutatása</target>
 
-<source>All directories in sync!</source>
+<source>All folders are in sync!</source>
 <target>Minden mappa szinkronban!</target>
 
 <source>Comma separated list</source>
@@ -1045,6 +1054,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Pause</source>
 <target>Szünet</target>
 
+<source>Logging</source>
+<target>Naplózás</target>
+
 <source>Cannot find %x</source>
 <target>Nem található: %x</target>
 
@@ -1126,21 +1138,6 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Leave as unresolved conflict</source>
 <target>Feloldatlan ütközésként hagyni</target>
 
-<source>Delete permanently</source>
-<target>Folyamatosan törölni</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>A fájlok folyamatos törlése vagy felülírása</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>A Lomtár (Recycle Bin) használata fájlok törlésénél vagy felülírásánál</target>
-
-<source>Versioning</source>
-<target>Verziókövetés</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Fájlok mozgatása egy időbélyeges almappába</target>
-
 <source>Files</source>
 <target>Fájlok</target>
 
@@ -1231,8 +1228,11 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Cannot copy file %x to %y.</source>
 <target>%x fájl másolása a(z) %y fájlba sikertelen.</target>
 
-<source>Cannot read directory %x.</source>
-<target>A következő mappa olvasása sikertelen: %x.</target>
+<source>Cannot open directory %x.</source>
+<target>A következő mappa megnyitása sikertelen: %x.</target>
+
+<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>
@@ -1253,11 +1253,14 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <target>Az utolsó szinkronizálás után nem történt változás.</target>
 
 <source>The corresponding database entries are not in sync considering current settings.</source>
-<target></target>
+<target>A megfelelő adatbázisbejegyzések nincsenek szinkronban a jelenlegi beállításokat tekintve.</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Alapértelmezett szinkronizációs irányok beállítása: a régebbi fájlok felülíródnak az újabbakkal.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>A Lomtár (Recycle Bin) nem elérhető a következő útvonalakhoz! A fájlok azonnali törlésre kerülnek helyette:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Figyelmen kívül hagyhatod ezt a hibát ezzel üresnek tekintve a mappát.</target>
 
@@ -1267,6 +1270,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <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>Preparing synchronization...</source>
 <target>Szinkronizálás előkészítése...</target>
 
@@ -1279,6 +1285,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Files %x have the same date but a different size!</source>
 <target>A(z) %x fájlok dátuma megegyezik, de a mérete nem!</target>
 
+<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>
 
@@ -1294,9 +1303,6 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Both sides are equal</source>
 <target>Mindkét oldal egyforma</target>
 
-<source>Items have different attributes</source>
-<target>Az elemek attribútumai különböznek</target>
-
 <source>Copy new item to left</source>
 <target>Új elemek másolása a bal oldalra</target>
 
@@ -1360,6 +1366,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Moving symbolic link %x to %y</source>
 <target>%x symlink mozgatása ide: %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>%x fájl létrehozása</target>
 
@@ -1382,13 +1391,13 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <target>A(z) %x attribútumainak frissítése</target>
 
 <source>Target folder input field must not be empty.</source>
-<target></target>
+<target>A célmappa beviteli mezeje nem lehet üres.</target>
 
 <source>Folder input field for versioning must not be empty.</source>
-<target></target>
+<target>A verziókövetés mappájának beviteli mezeje nem lehet üres.</target>
 
 <source>Source folder %x not found.</source>
-<target></target>
+<target>A következő forrásmappa nem található: %x.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Feloldatlan ütközések vannak!</target>
@@ -1406,22 +1415,19 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <target>Nincs elég szabad lemezterület:</target>
 
 <source>Required:</source>
-<target></target>
+<target>Szükséges:</target>
 
 <source>Available:</source>
-<target></target>
-
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>A Lomtár (Recycle Bin) nem elérhető a következő útvonalakhoz! A fájlok azonnali törlésre kerülnek helyette:</target>
+<target>Szabad:</target>
 
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Egy olyan mappa kerül módosításra, amely része több mappapárnak. Kérjük, ellenőrizze a szinkronizációs beállításokat.</target>
 
-<source>Processing folder pair:</source>
-<target>Mappapár feldolgozása:</target>
+<source>Synchronizing folder pair:</source>
+<target>Mappapár szinkronizálása:</target>
 
 <source>Target folder %x already existing.</source>
-<target></target>
+<target>A következő célmappa már létezik: %x.</target>
 
 <source>Generating database...</source>
 <target>Adatbázis generálása...</target>
diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng
index 53e4b011..177ea600 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>Ricerca della cartella %x...</target>
 
-<source>Batch execution</source>
-<target>Esecuzione in batch</target>
-
 <source>Items processed:</source>
 <target>Elementi processati:</target>
 
@@ -34,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Selezionata interruazione: conclusione dell'operazione...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronizzazione automatizzata</target>
 
@@ -61,12 +61,12 @@
 <source>Create a batch job</source>
 <target>Creazione di un attività batch</target>
 
-<source>Synchronization settings</source>
-<target>Parametri di sincronizzazione</target>
-
 <source>Comparison settings</source>
 <target>Impostazioni di comparazione</target>
 
+<source>Synchronization settings</source>
+<target>Parametri di sincronizzazione</target>
+
 <source>About</source>
 <target>Info su</target>
 
@@ -88,27 +88,6 @@
 <source>Select time span</source>
 <target>Seleziona intervallo di tempo</target>
 
-<source>Show pop-up</source>
-<target>Mostra popup</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Mostra popup di errore o avviso</target>
-
-<source>Ignore errors</source>
-<target>Ignora errori</target>
-
-<source>Hide all error and warning messages</source>
-<target>Nascondi tutti gli errori e i messaggi d'avviso</target>
-
-<source>Exit instantly</source>
-<target>Esci istantaneamente</target>
-
-<source>Abort synchronization immediately</source>
-<target>Interrompi immediatamente la sincronizzazione</target>
-
-<source>Browse</source>
-<target>Sfoglia</target>
-
 <source>Invalid command line:</source>
 <target>Linea di comando non valida:</target>
 
@@ -247,8 +226,8 @@
 <source>&Open...</source>
 <target>&Apri...</target>
 
-<source>Save &As...</source>
-<target>Salva &Con nome...</target>
+<source>Save &as...</source>
+<target>Salva &come...</target>
 
 <source>&Quit</source>
 <target>&Esci</target>
@@ -289,6 +268,9 @@
 <source>Remove folder</source>
 <target>Rimuovi cartella</target>
 
+<source>Browse</source>
+<target>Sfoglia</target>
+
 <source>Select a folder</source>
 <target>Seleziona una cartella</target>
 
@@ -321,8 +303,8 @@ Il comando è attivato se:
 <source>Cancel</source>
 <target>Annulla</target>
 
-<source>(Build: %x)</source>
-<target>(Versione: %x)</target>
+<source>Build: %x</source>
+<target>Versione: %x</target>
 
 <source>All files</source>
 <target>Tutti i file</target>
@@ -342,9 +324,6 @@ Il comando è attivato se:
 <source>A folder input field is empty.</source>
 <target>Un campo cartella input è vuoto.</target>
 
-<source>Logging</source>
-<target>Registo attività</target>
-
 <source>File time and size</source>
 <target>Ora e dimensione file</target>
 
@@ -525,11 +504,11 @@ Il comando è attivato se:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Ultima configurazione utilizzata (premi CANC per rimuovere dall'elenco)</target>
 
-<source>Hide excluded items</source>
-<target>Nascondi oggetti esclusi</target>
+<source>Show excluded items</source>
+<target>Mostra oggetti esclusi</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Nascondi file filtrati o temporaneamente esclusi</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Mostra file filtrati o temporaneamente esclusi</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Numero di file e cartelle che verranno creati</target>
@@ -573,24 +552,81 @@ Il comando è attivato se:
 <source>Right</source>
 <target>Destra</target>
 
-<source>Status feedback</source>
-<target>Feedback di stato</target>
+<source>Error handling</source>
+<target>Gestione degli errori</target>
+
+<source>Ignore</source>
+<target>Ignora</target>
+
+<source>Hide all error and warning messages</source>
+<target>Nascondi tutti gli errori e i messaggi d'avviso</target>
+
+<source>Pop-up</source>
+<target>Pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Mostra popup di errore o avviso</target>
+
+<source>Exit</source>
+<target></target>
+
+<source>Abort synchronization on first error</source>
+<target>Abortisci sincronizzazione al primo errore</target>
+
+<source>On completion:</source>
+<target>In completamento:</target>
 
 <source>Show progress dialog</source>
 <target>Mostra stato di avanzamento</target>
 
-<source>Error handling</source>
-<target>Gestione degli errori</target>
+<source>Generate log file</source>
+<target>Genera file log</target>
+
+<source>Select folder to save log files</source>
+<target>Seleziona cartella dove salvare i file log</target>
 
-<source>Maximum number of log files:</source>
-<target>Numero massimo di file registro:</target>
+<source>Limit</source>
+<target>Limita</target>
 
-<source>Select folder to save log files:</source>
-<target>Seleziona cartella per il salvataggio dei file registro:</target>
+<source>Limit maximum number of log files</source>
+<target>Limita il numero massimo di file log</target>
 
 <source>Batch settings</source>
 <target>Impostazioni batch</target>
 
+<source>Compare by...</source>
+<target>Compara per...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+I file sono considerati identici se
+     - data e ora di ultima modifica
+     - dimensione
+sono identici
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+I file sono considerati identici se
+     - il contenuto
+è identico
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Gestione Collegamenti</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Seleziona una variante:</target>
 
@@ -609,8 +645,26 @@ Il comando è attivato se:
 <source>Deletion handling</source>
 <target>Gestione cancellazione</target>
 
-<source>On completion:</source>
-<target>In completamento:</target>
+<source>Permanent</source>
+<target>Permanente</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Elimina o sovrascrivi file definitivamente</target>
+
+<source>Recycle Bin</source>
+<target>Cestino</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Usa il Cestino quando si elimina o sovrascrive un file</target>
+
+<source>Versioning</source>
+<target>Versione</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Sposta file con indicazione datata nella cartella specifica</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Limita numero massimo di versioni per ogni file</target>
 
 <source>Configuration</source>
 <target>Configurazione</target>
@@ -633,39 +687,6 @@ Il comando è attivato se:
 <source>Conflict/item cannot be categorized</source>
 <target>Conflitto/elemento non categorizzabile</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Compara per...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-I file sono considerati identici se
-     - data e ora di ultima modifica
-     - dimensione
-sono identici
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-I file sono considerati identici se
-     - il contenuto
-è identico
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Gestione Collegamenti</target>
-
 <source>Synchronizing...</source>
 <target>Sincronizzazione...</target>
 
@@ -681,8 +702,8 @@ I file sono considerati identici se
 <source>Donate with PayPal</source>
 <target>Fai una donazione con PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Per la traduzione di FreeFileSync, un grazie va a:</target>
+<source>Many thanks for localization:</source>
+<target>Ringraziamenti per la localizzazione:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Ogni commento o suggerimento è ben accetto</target>
@@ -699,9 +720,6 @@ I file sono considerati identici se
 <source>Published under the GNU General Public License</source>
 <target>Pubblicato sotto licenza GNU General Public</target>
 
-<source>Use Recycle Bin</source>
-<target>Usa il Cestino</target>
-
 <source>Delete on both sides</source>
 <target>Elimina su entrambi i lati</target>
 
@@ -771,8 +789,8 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Statistics</source>
 <target>Statistiche</target>
 
-<source>Do not show this dialog again</source>
-<target>Non visualizzare più questo messaggio</target>
+<source>Don't show this dialog again</source>
+<target>Non mostrare più questo messaggio</target>
 
 <source>Find what:</source>
 <target>Trova questo:</target>
@@ -855,11 +873,8 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Do you want to save changes to %x?</source>
 <target>Vuoi salvare le modifiche a %x?</target>
 
-<source>Save</source>
-<target>Salva</target>
-
-<source>Don't Save</source>
-<target>Non salvare</target>
+<source>Do&n't save</source>
+<target>No&n salvare</target>
 
 <source>Configuration loaded!</source>
 <target>Configurazione caricata!</target>
@@ -951,8 +966,8 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Show files that won't be copied</source>
 <target>Mostra file che non saranno copiati</target>
 
-<source>All directories in sync!</source>
-<target>Tutte le cartelle sincronizzate!</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>
@@ -1041,6 +1056,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Pause</source>
 <target>Pausa</target>
 
+<source>Logging</source>
+<target>Registo attività</target>
+
 <source>Cannot find %x</source>
 <target>Impossibile trovare %x</target>
 
@@ -1122,21 +1140,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Leave as unresolved conflict</source>
 <target>Lascia come conflitti irrisolti</target>
 
-<source>Delete permanently</source>
-<target>Elimina definitivamente</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Elimina o sovrascrivi file definitivamente</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Usa il Cestino quando si elimina o sovrascrive un file</target>
-
-<source>Versioning</source>
-<target>Versione</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Sposta file in una sotto-cartella con data e ora</target>
-
 <source>Files</source>
 <target>File</target>
 
@@ -1227,8 +1230,11 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Cannot copy file %x to %y.</source>
 <target>Impossibile copiare file %x in %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Impossibile leggere cartella %x.</target>
+<source>Cannot open directory %x.</source>
+<target>Impossibile aprire cartella %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Impossibile numerare cartella %x.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Rilevato percorso ricorsivo senza fine.</target>
@@ -1254,6 +1260,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Imposta direzioni di sincronizzazione dpredefinite: i vecchi file saranno sovrascritti dai nuovi.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Cestino non disponibile per i seguenti percorsi! I file verranno cancellati in modo permanente:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Puoi ignorare questo errore per considerare la cartella come vuota.</target>
 
@@ -1263,6 +1272,9 @@ 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>Preparing synchronization...</source>
 <target>Preparazione sincronizzazione...</target>
 
@@ -1275,6 +1287,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Files %x have the same date but a different size!</source>
 <target>I file %x hanno la stessa data ma dimensione diversa!</target>
 
+<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>
 
@@ -1290,9 +1305,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Both sides are equal</source>
 <target>Entrambi i lati sono uguali</target>
 
-<source>Items have different attributes</source>
-<target>Gli elementi hanno differenti attributi</target>
-
 <source>Copy new item to left</source>
 <target>Copia nuovo elemento a sinistra</target>
 
@@ -1356,6 +1368,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Moving symbolic link %x to %y</source>
 <target>Spostamento collegamento %x in %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>Creazione file %x</target>
 
@@ -1407,14 +1422,11 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Available:</source>
 <target>Dispobilile:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Cestino non disponibile per i seguenti percorsi! I file verranno cancellati in modo permanente:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Verrà modificata una cartella che è parte di molteplici coppie di cartelle. Controlla le impostazioni di sincronizzazione.</target>
 
-<source>Processing folder pair:</source>
-<target>Elaborazione coppia di cartelle:</target>
+<source>Synchronizing folder pair:</source>
+<target>Sincronizzazione della coppia di cartelle:</target>
 
 <source>Target folder %x already existing.</source>
 <target>La cartella di destinazione %x è già esistente.</target>
diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng
index e40b6f92..6745cced 100644
--- a/BUILD/Languages/japanese.lng
+++ b/BUILD/Languages/japanese.lng
@@ -10,6 +10,15 @@
 <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>Show in Explorer</source>
 <target>エクスプローラで表示</target>
 
@@ -49,12 +58,12 @@
 <source>Create a batch job</source>
 <target>一括ジョブを作成</target>
 
-<source>Synchronization settings</source>
-<target>同期処理設定</target>
-
 <source>Comparison settings</source>
 <target>比較設定</target>
 
+<source>Synchronization settings</source>
+<target>同期処理設定</target>
+
 <source>About</source>
 <target>情報</target>
 
@@ -76,27 +85,6 @@
 <source>Select time span</source>
 <target>タイムスパンを選択</target>
 
-<source>Show pop-up</source>
-<target>ポップアップ表示</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>エラーと警告をポップアップで表示</target>
-
-<source>Ignore errors</source>
-<target>エラーを無視</target>
-
-<source>Hide all error and warning messages</source>
-<target>すべてのエラーと警告メッセージを非表示</target>
-
-<source>Exit instantly</source>
-<target>すぐに終了</target>
-
-<source>Abort synchronization immediately</source>
-<target>今すぐに同期処理を中断</target>
-
-<source>Browse</source>
-<target>参照</target>
-
 <source>Invalid command line:</source>
 <target>無効なコマンドライン:</target>
 
@@ -232,7 +220,7 @@
 <source>&Open...</source>
 <target>開く(&O)...</target>
 
-<source>Save &As...</source>
+<source>Save &as...</source>
 <target>別名保存(&A)...</target>
 
 <source>&Quit</source>
@@ -274,6 +262,9 @@
 <source>Remove folder</source>
 <target>フォルダ除去</target>
 
+<source>Browse</source>
+<target>参照</target>
+
 <source>Select a folder</source>
 <target>フォルダを選択</target>
 
@@ -306,8 +297,8 @@ The command is triggered if:
 <source>Cancel</source>
 <target>キャンセル</target>
 
-<source>(Build: %x)</source>
-<target>(ビルド: %x)</target>
+<source>Build: %x</source>
+<target>ビルド: %x</target>
 
 <source>All files</source>
 <target>すべてのファイル</target>
@@ -327,9 +318,6 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>フォルダ入力欄が空白です.</target>
 
-<source>Logging</source>
-<target>ログ</target>
-
 <source>File time and size</source>
 <target>ファイル時刻とサイズ</target>
 
@@ -351,21 +339,6 @@ The command is triggered if:
 <source>FreeFileSync batch</source>
 <target>FreeFileSync 一括</target>
 
-<source>Batch execution</source>
-<target>一括処理を実行</target>
-
-<source>Items processed:</source>
-<target>処理された要素:</target>
-
-<source>Items remaining:</source>
-<target>残りの要素:</target>
-
-<source>Total time:</source>
-<target>合計時間:</target>
-
-<source>Stop</source>
-<target>停止</target>
-
 <source>Synchronization aborted!</source>
 <target>同期処理を中断!</target>
 
@@ -525,11 +498,11 @@ The command is triggered if:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>前回使用した構成設定(DEL キーでリストから除去します)</target>
 
-<source>Hide excluded items</source>
-<target>除外アイテムを隠す</target>
+<source>Show excluded items</source>
+<target>除外した項目を表示</target>
 
-<source>Hide filtered or temporarily excluded files</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>
@@ -573,24 +546,81 @@ The command is triggered if:
 <source>Right</source>
 <target>右側</target>
 
-<source>Status feedback</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>On completion:</source>
+<target>完了時:</target>
 
 <source>Show progress dialog</source>
 <target>進捗ダイアログを表示</target>
 
-<source>Error handling</source>
-<target>ハンドリングのエラー時:</target>
+<source>Generate log file</source>
+<target>ログファイルを生成</target>
+
+<source>Select folder to save log files</source>
+<target>ログファイル保存先フォルダを選択</target>
 
-<source>Maximum number of log files:</source>
-<target>ログファイルの最大数:</target>
+<source>Limit</source>
+<target>制限</target>
 
-<source>Select folder to save log files:</source>
-<target>ログファイル保存先フォルダを選択:</target>
+<source>Limit maximum number of log files</source>
+<target>ログファイルの最大数を制限</target>
 
 <source>Batch settings</source>
 <target>一括設定</target>
 
+<source>Compare by...</source>
+<target>比較対象...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+ファイルが同様だった場合
+     - 最終書き込み時刻、日時
+     - ファイルサイズ
+で判断する
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+ファイルが同様だった場合
+     - ファイル内容
+で判断する
+</target>
+
+<source>Symbolic Link handling</source>
+<target>ｼﾝﾎﾞﾘｯｸ・ﾘﾝｸの取り扱い</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>変数を選択:</target>
 
@@ -609,8 +639,26 @@ The command is triggered if:
 <source>Deletion handling</source>
 <target>削除の取り扱い</target>
 
-<source>On completion:</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 when deleting or overwriting files</source>
+<target>ファイルの削除、上書き時にゴミ箱を使用する</target>
+
+<source>Versioning</source>
+<target>バージョン付け</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>ファイルのタイムスタンプで指定フォルダに移動</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>ファイル当たりのバージョン番号制限</target>
 
 <source>Configuration</source>
 <target>構成設定</target>
@@ -633,39 +681,6 @@ The command is triggered if:
 <source>Conflict/item cannot be categorized</source>
 <target>競合/項目を分類化できません</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>比較対象...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-ファイルが同様だった場合
-     - 最終書き込み時刻、日時
-     - ファイルサイズ
-で判断する
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-ファイルが同様だった場合
-     - ファイル内容
-で判断する
-</target>
-
-<source>Symbolic Link handling</source>
-<target>シンボリック・リンクの取り扱い</target>
-
 <source>Synchronizing...</source>
 <target>同期処理中...</target>
 
@@ -681,8 +696,8 @@ is the same
 <source>Donate with PayPal</source>
 <target>PayPal から寄付する</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>FreeFileSync のローカライズへの協力に感謝します:</target>
+<source>Many thanks for localization:</source>
+<target>ローカライズのご協力に感謝します:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>フィードバック、提案などはこちらから</target>
@@ -699,9 +714,6 @@ is the same
 <source>Published under the GNU General Public License</source>
 <target>GNU 一般共有使用許諾に基づき公開されています</target>
 
-<source>Use Recycle Bin</source>
-<target>ゴミ箱を使用</target>
-
 <source>Delete on both sides</source>
 <target>両方を削除</target>
 
@@ -771,8 +783,8 @@ Note: File names must be relative to base directories!
 <source>Statistics</source>
 <target>統計</target>
 
-<source>Do not show this dialog again</source>
-<target>次回から表示しない</target>
+<source>Don't show this dialog again</source>
+<target>次回からダイアログを表示しない</target>
 
 <source>Find what:</source>
 <target>検索語:</target>
@@ -855,11 +867,8 @@ Note: File names must be relative to base directories!
 <source>Do you want to save changes to %x?</source>
 <target>本当に %x の変更を保存しますか?</target>
 
-<source>Save</source>
-<target>保存</target>
-
-<source>Don't Save</source>
-<target>保存しない</target>
+<source>Do&n't save</source>
+<target>保存しない(&N)</target>
 
 <source>Configuration loaded!</source>
 <target>構成設定を読み込み中!</target>
@@ -951,8 +960,8 @@ Note: File names must be relative to base directories!
 <source>Show files that won't be copied</source>
 <target>コピーされなかったファイルを表示</target>
 
-<source>All directories in sync!</source>
-<target>すべてのディレクトリを同期!</target>
+<source>All folders are in sync!</source>
+<target>すべてのフォルダを同期!</target>
 
 <source>Comma separated list</source>
 <target>カンマ区切り</target>
@@ -1037,6 +1046,9 @@ Note: File names must be relative to base directories!
 <source>Pause</source>
 <target>一時停止</target>
 
+<source>Logging</source>
+<target>ログ</target>
+
 <source>Cannot find %x</source>
 <target>%x は見つかりません</target>
 
@@ -1116,21 +1128,6 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>未解決の競合はそのまま残す</target>
 
-<source>Delete permanently</source>
-<target>完全に削除</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>ファイルを上書き、または完全に削除</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>ファイルの削除、上書き時にゴミ箱を使用する</target>
-
-<source>Versioning</source>
-<target>バージョン付け</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>サブフォルダのタイムスタンプでファイルを移動</target>
-
 <source>Files</source>
 <target>ファイル</target>
 
@@ -1218,8 +1215,11 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>%x から %y にコピーできません.</target>
 
-<source>Cannot read directory %x.</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>
@@ -1245,6 +1245,9 @@ Note: File names must be relative to base directories!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>同期方向のデフォルト設定: 古いファイルに新しいファイルを上書き</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>以下のパスにあるゴミ箱が利用できません! 代わりにファイルは完全削除されます:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>フォルダを空と想定する場合は、このエラーは無視できます.</target>
 
@@ -1254,6 +1257,9 @@ Note: File names must be relative to base directories!
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>ディレクトリが依存関係にあります! 同期規則の設定時には注意してください:</target>
 
+<source>Start comparison</source>
+<target>比較を開始</target>
+
 <source>Preparing synchronization...</source>
 <target>同期処理の準備中...</target>
 
@@ -1266,6 +1272,9 @@ Note: File names must be relative to base directories!
 <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>Symbolic links %x have the same date but a different target.</source>
 <target>シンボリックリンク %x の日付は同じですが、対象が異なっています.</target>
 
@@ -1281,9 +1290,6 @@ Note: File names must be relative to base directories!
 <source>Both sides are equal</source>
 <target>両側とも等しく</target>
 
-<source>Items have different attributes</source>
-<target>属性が異なる項目</target>
-
 <source>Copy new item to left</source>
 <target>新しい項目を左にコピー</target>
 
@@ -1398,14 +1404,11 @@ Note: File names must be relative to base directories!
 <source>Available:</source>
 <target>利用可能:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>以下のパスにあるゴミ箱が利用できません! 代わりにファイルは完全削除されます:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>複数フォルダペアの一部であるフォルダが変更されています. 同期設定を確認してください.</target>
 
-<source>Processing folder pair:</source>
-<target>フォルダペアを処理中:</target>
+<source>Synchronizing folder pair:</source>
+<target>フォルダペアを同期処理中:</target>
 
 <source>Target folder %x already existing.</source>
 <target>対象フォルダ %x は既に存在します.</target>
diff --git a/BUILD/Languages/korean.lng b/BUILD/Languages/korean.lng
index 79f58d51..db2d73a6 100644
--- a/BUILD/Languages/korean.lng
+++ b/BUILD/Languages/korean.lng
@@ -10,6 +10,15 @@
 <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>Show in Explorer</source>
 <target>탐색기에 표시</target>
 
@@ -49,12 +58,12 @@
 <source>Create a batch job</source>
 <target>일괄작업 생성</target>
 
-<source>Synchronization settings</source>
-<target>동기화 설정</target>
-
 <source>Comparison settings</source>
 <target>비교 설정</target>
 
+<source>Synchronization settings</source>
+<target>동기화 설정</target>
+
 <source>About</source>
 <target>상세 정보</target>
 
@@ -76,27 +85,6 @@
 <source>Select time span</source>
 <target>시간간격(타임스팬) 선택</target>
 
-<source>Show pop-up</source>
-<target>팝업 보이기</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>오류 또는 경고에 대한 팝업 보이기</target>
-
-<source>Ignore errors</source>
-<target>오류 무시</target>
-
-<source>Hide all error and warning messages</source>
-<target>모든 오류/경고 메세지 숨기기</target>
-
-<source>Exit instantly</source>
-<target>즉시 종료</target>
-
-<source>Abort synchronization immediately</source>
-<target>동기화 작업 즉시 중단</target>
-
-<source>Browse</source>
-<target>찾아보기</target>
-
 <source>Invalid command line:</source>
 <target>잘못된 명령줄 :</target>
 
@@ -232,8 +220,8 @@
 <source>&Open...</source>
 <target>열기(&O)</target>
 
-<source>Save &As...</source>
-<target>다른 이름으로 저장(&A)</target>
+<source>Save &as...</source>
+<target>다른 이름으로 저장(&a)</target>
 
 <source>&Quit</source>
 <target>종료(&Q)</target>
@@ -274,6 +262,9 @@
 <source>Remove folder</source>
 <target>폴더 제거</target>
 
+<source>Browse</source>
+<target>찾아보기</target>
+
 <source>Select a folder</source>
 <target>폴더 선택</target>
 
@@ -306,8 +297,8 @@ The command is triggered if:
 <source>Cancel</source>
 <target>취소</target>
 
-<source>(Build: %x)</source>
-<target>(빌드: %x)</target>
+<source>Build: %x</source>
+<target>빌드: %x</target>
 
 <source>All files</source>
 <target>모든 파일</target>
@@ -327,9 +318,6 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>폴더 입력 필드 하나가 비어 있습니다.</target>
 
-<source>Logging</source>
-<target>로깅</target>
-
 <source>File time and size</source>
 <target>파일 시간 및 크기</target>
 
@@ -351,21 +339,6 @@ The command is triggered if:
 <source>FreeFileSync batch</source>
 <target>FreeFileSync 일괄처리(배치)</target>
 
-<source>Batch execution</source>
-<target>일괄 실행</target>
-
-<source>Items processed:</source>
-<target>처리된 항목 :</target>
-
-<source>Items remaining:</source>
-<target>남은 항목 :</target>
-
-<source>Total time:</source>
-<target>전체 시간 :</target>
-
-<source>Stop</source>
-<target>정지</target>
-
 <source>Synchronization aborted!</source>
 <target>동기화 중단!</target>
 
@@ -448,7 +421,7 @@ The command is triggered if:
 <target>드래그 && 드랍 (마우스로 파일 끌어다 놓기)</target>
 
 <source>Close progress dialog</source>
-<target>프로그레스 다이얼로그 (진행창) 닫기</target>
+<target>프로그레스 다이얼로그 (진행 창) 닫기</target>
 
 <source>Standby</source>
 <target>대기</target>
@@ -525,20 +498,20 @@ The command is triggered if:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>마지막으로 사용한 설정 (DEL 키를 누르면 리스트에서 삭제)</target>
 
-<source>Hide excluded items</source>
-<target>제외된 항목 숨기기</target>
+<source>Show excluded items</source>
+<target>제외 항목 보이기</target>
 
-<source>Hide filtered or temporarily excluded files</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>
+<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>
+<target>삭제될 파일 및 폴더 개수</target>
 
 <source>Total bytes to copy</source>
 <target>복사할 전체 바이트 크기</target>
@@ -559,7 +532,7 @@ The command is triggered if:
 <target>일괄 작업</target>
 
 <source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
-<target>자동 동기화 작업을 위한 일괄 파일을 만듭니다. 본 파일을 더블 클릭하거나 시스템 태스크 플래너에 다음과 같이 예약하세요 : FreeFileSync.exe <job name>.ffs_batch</target>
+<target>자동 동기화를 위한 일괄 파일을 만듭니다. 본 파일을 더블 클릭하거나 시스템 태스크 플래너에 다음과 같이 예약하세요 : FreeFileSync.exe <job name>.ffs_batch</target>
 
 <source>Help</source>
 <target>도움말</target>
@@ -573,24 +546,81 @@ The command is triggered if:
 <source>Right</source>
 <target>우측</target>
 
-<source>Status feedback</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>On completion:</source>
+<target>완료 :</target>
 
 <source>Show progress dialog</source>
-<target>프로그레스 다이얼로그 (진행창) 보기</target>
+<target>프로그레스 다이얼로그 (진행 창) 보기</target>
 
-<source>Error handling</source>
-<target>오류 발생시 :</target>
+<source>Generate log file</source>
+<target>로그 파일 생성</target>
 
-<source>Maximum number of log files:</source>
-<target>최대 로그파일 개수 :</target>
+<source>Select folder to save log files</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>Batch settings</source>
 <target>일괄 설정</target>
 
+<source>Compare by...</source>
+<target>대상 별 비교...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+비교된 양쪽 파일은
+마지막 쓰기 시간과 날짜,
+그리고 파일 크기가 모두 같을 경우,
+동일한 파일로 간주됩니다.
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+비교된 양쪽 파일은
+파일 내용이 같을 경우,
+동일한 파일로 간주됩니다.
+</target>
+
+<source>Symbolic Link handling</source>
+<target>심볼릭 링크 처리</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>옵션 선택 :</target>
 
@@ -609,8 +639,26 @@ The command is triggered if:
 <source>Deletion handling</source>
 <target>삭제 처리 옵션</target>
 
-<source>On completion:</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 when deleting or overwriting files</source>
+<target>파일을 삭제하거나 덮어쓰기 할 때, 휴지통 사용</target>
+
+<source>Versioning</source>
+<target>버저닝</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>타임스탬핑(생성시간 날인)된 파일을 지정된 폴더로 이동</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>파일 당 버전 최대 개수 제한</target>
 
 <source>Configuration</source>
 <target>구성 설정</target>
@@ -633,39 +681,6 @@ The command is triggered if:
 <source>Conflict/item cannot be categorized</source>
 <target>충돌 / 항목을 분류할 수 없음</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>대상 별 비교...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-비교된 양쪽 파일은
-마지막 쓰기 시간과 날짜,
-그리고 파일 크기가 같을 경우,
-동일한 파일로 간주됩니다.
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-비교된 양쪽 파일은
-파일 내용이 같을 경우,
-동일한 파일로 간주됩니다.
-</target>
-
-<source>Symbolic Link handling</source>
-<target>심볼릭 링크 처리</target>
-
 <source>Synchronizing...</source>
 <target>동기화 작업 중...</target>
 
@@ -681,8 +696,8 @@ is the same
 <source>Donate with PayPal</source>
 <target>PayPal로 기부하기</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>FreeFileSync 현지화에 도움을 주신 분들께 감사 드립니다 :</target>
+<source>Many thanks for localization:</source>
+<target>현지화 작업에 깊은 감사 드립니다:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>모든 의견 및 건의/제안을 환영합니다</target>
@@ -699,9 +714,6 @@ is the same
 <source>Published under the GNU General Public License</source>
 <target>GNU 일반 공용 라이센스에 의한 출시</target>
 
-<source>Use Recycle Bin</source>
-<target>휴지통 사용</target>
-
 <source>Delete on both sides</source>
 <target>양측 모두 삭제</target>
 
@@ -757,7 +769,7 @@ Note: File names must be relative to base directories!
 <target>파일 및 폴더 사용 권한 전송 (관리자 권한 필요)</target>
 
 <source>Restore hidden dialogs</source>
-<target>숨겨진 대화창 복원</target>
+<target>숨겨진 대화 상자 복원</target>
 
 <source>External applications</source>
 <target>외부 응용 프로그램</target>
@@ -771,8 +783,8 @@ Note: File names must be relative to base directories!
 <source>Statistics</source>
 <target>통계</target>
 
-<source>Do not show this dialog again</source>
-<target>다음부터 표시하지 않음</target>
+<source>Don't show this dialog again</source>
+<target>이 대화 상자를 다시 표시하지 않음</target>
 
 <source>Find what:</source>
 <target>검색어 :</target>
@@ -855,11 +867,8 @@ Note: File names must be relative to base directories!
 <source>Do you want to save changes to %x?</source>
 <target>%x의 변경사항을 저장하시겠습니까?</target>
 
-<source>Save</source>
-<target>저장</target>
-
-<source>Don't Save</source>
-<target>저장 안 함.</target>
+<source>Do&n't save</source>
+<target>저장하기 않기(&n)</target>
 
 <source>Configuration loaded!</source>
 <target>설정 로드 완료!</target>
@@ -951,8 +960,8 @@ Note: File names must be relative to base directories!
 <source>Show files that won't be copied</source>
 <target>복사되지 않을 파일 표시</target>
 
-<source>All directories in sync!</source>
-<target>모든 디렉토리 동기화!</target>
+<source>All folders are in sync!</source>
+<target>모든 폴더가 동기화 되었음!</target>
 
 <source>Comma separated list</source>
 <target>콤마 분리 목록</target>
@@ -1037,6 +1046,9 @@ Note: File names must be relative to base directories!
 <source>Pause</source>
 <target>일시정지</target>
 
+<source>Logging</source>
+<target>로깅</target>
+
 <source>Cannot find %x</source>
 <target>%x 을(를) 찾을 수 없습니다.</target>
 
@@ -1095,7 +1107,7 @@ Note: File names must be relative to base directories!
 <target>- %dir 의 반대측 대상</target>
 
 <source>Make hidden dialogs and warning messages visible again?</source>
-<target>숨겨진 대화창이나 경고 메세지를 다시 보이게 하시겠습니까?</target>
+<target>숨겨진 대화 상자나 경고 메세지를 다시 보이게 하시겠습니까?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1116,21 +1128,6 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>해결되지 않은 충돌로 놔두기</target>
 
-<source>Delete permanently</source>
-<target>영구 삭제</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>파일 영구 삭제 또는 덮어쓰기</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>파일을 삭제하거나 덮어쓰기 할 때, 휴지통 사용</target>
-
-<source>Versioning</source>
-<target>버저닝</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>시간 기록이 남는 하위 폴더로 파일 이동</target>
-
 <source>Files</source>
 <target>파일</target>
 
@@ -1218,8 +1215,11 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>파일 %x 을(를) %y (으)로 복사할 수 없습니다.</target>
 
-<source>Cannot read directory %x.</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>
@@ -1245,6 +1245,9 @@ Note: File names must be relative to base directories!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>기본값 동기화 방향 설정 : 이전 파일들은 신규 파일들로 덮어 쓰여집니다.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>다음 경로로는 휴지통을 사용할 수 없습니다! 대신 파일을 영구적으로 삭제합니다 :</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>폴더를 빈 상태로 가정할 경우, 이 오류는 무시될 수 있습니다.</target>
 
@@ -1254,6 +1257,9 @@ Note: File names must be relative to base directories!
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>디렉토리가 의존 관계에 있습니다. 동기화 규칙 설정시 주의하십시오.</target>
 
+<source>Start comparison</source>
+<target>비교 시작</target>
+
 <source>Preparing synchronization...</source>
 <target>동기화 준비 중...</target>
 
@@ -1266,6 +1272,9 @@ Note: File names must be relative to base directories!
 <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>Symbolic links %x have the same date but a different target.</source>
 <target>심볼릭 링크 %x 의 날짜는 같으나, 타겟이 다릅니다.</target>
 
@@ -1281,9 +1290,6 @@ Note: File names must be relative to base directories!
 <source>Both sides are equal</source>
 <target>양측이 같음</target>
 
-<source>Items have different attributes</source>
-<target>항목의 속성이 서로 다릅니다.</target>
-
 <source>Copy new item to left</source>
 <target>좌측에 새 항목 복사</target>
 
@@ -1398,14 +1404,11 @@ Note: File names must be relative to base directories!
 <source>Available:</source>
 <target>여유 공간(크기) :</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>다음 경로로는 휴지통을 사용할 수 없습니다! 대신 파일을 영구적으로 삭제합니다 :</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>다중 폴더 페어의 일부인 폴더가 변경됩니다. 동기화 설정을 재검토하세요.</target>
 
-<source>Processing folder pair:</source>
-<target>폴더 페어 처리 중 :</target>
+<source>Synchronizing folder pair:</source>
+<target>폴더 페어(짝) 동기화 진행 중</target>
 
 <source>Target folder %x already existing.</source>
 <target>대상 폴더 %x이(가) 이미 존재함.</target>
diff --git a/BUILD/Languages/lithuanian.lng b/BUILD/Languages/lithuanian.lng
index 7b44874a..c4e82e6f 100644
--- a/BUILD/Languages/lithuanian.lng
+++ b/BUILD/Languages/lithuanian.lng
@@ -10,6 +10,15 @@
 <source>Searching for folder %x...</source>
 <target>Ieškoma aplanko %x...</target>
 
+<source>Items processed:</source>
+<target>Elementų apdorota:</target>
+
+<source>Items remaining:</source>
+<target>Likę elementai:</target>
+
+<source>Total time:</source>
+<target>Visas laikas:</target>
+
 <source>Show in Explorer</source>
 <target>Rodyti naršyklėje</target>
 
@@ -22,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Nutraukti: laukiama kol baigsis esama operacija...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatizuotas sinchronizavimas</target>
 
@@ -49,12 +61,12 @@
 <source>Create a batch job</source>
 <target>Sukurti paketinę užduotį</target>
 
-<source>Synchronization settings</source>
-<target>Sinchronizavimo nustatymai</target>
-
 <source>Comparison settings</source>
 <target>Sulyginimo nustatymai</target>
 
+<source>Synchronization settings</source>
+<target>Sinchronizavimo nustatymai</target>
+
 <source>About</source>
 <target>Apie</target>
 
@@ -76,27 +88,6 @@
 <source>Select time span</source>
 <target>Pažymėti laiko trukmę</target>
 
-<source>Show pop-up</source>
-<target>Rodyti pranešimą</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Rodyti pranešimą esant klaidoms ar perspėjimams</target>
-
-<source>Ignore errors</source>
-<target>Ignoruoti klaidas</target>
-
-<source>Hide all error and warning messages</source>
-<target>Slėpti visus klaidų ir perspėjimų pranešimus</target>
-
-<source>Exit instantly</source>
-<target>Išeiti iškart</target>
-
-<source>Abort synchronization immediately</source>
-<target>Atšaukti sinchronizavimą dabar</target>
-
-<source>Browse</source>
-<target>Naršyti</target>
-
 <source>Invalid command line:</source>
 <target>Netinkama komandinė eilutė:</target>
 
@@ -148,7 +139,7 @@
 <target>Duomenų bazės failo %x dar nėra.</target>
 
 <source>Database file is corrupt:</source>
-<target></target>
+<target>Duomenų bazės failas sugadintas</target>
 
 <source>Out of memory!</source>
 <target>Trūksta atminties!</target>
@@ -241,8 +232,8 @@
 <source>&Open...</source>
 <target>&Atverti...</target>
 
-<source>Save &As...</source>
-<target></target>
+<source>Save &as...</source>
+<target>Išsaugoti &kaip...</target>
 
 <source>&Quit</source>
 <target>&Išeiti</target>
@@ -283,6 +274,9 @@
 <source>Remove folder</source>
 <target>Pašalinti aplanką</target>
 
+<source>Browse</source>
+<target>Naršyti</target>
+
 <source>Select a folder</source>
 <target>Pažymėti aplanką</target>
 
@@ -315,11 +309,11 @@ Komanda inicijuojama jei:
 <source>Cancel</source>
 <target>Atšaukti</target>
 
-<source>(Build: %x)</source>
-<target>(Komponavimo versija: %x)</target>
+<source>Build: %x</source>
+<target>Versija: %x</target>
 
 <source>All files</source>
-<target></target>
+<target>Visi failai</target>
 
 <source>&Restore</source>
 <target>&Atstatyti</target>
@@ -334,10 +328,7 @@ Komanda inicijuojama jei:
 <target>Laikiama trūkstamų katalogų...</target>
 
 <source>A folder input field is empty.</source>
-<target></target>
-
-<source>Logging</source>
-<target>Užduoties duomenys</target>
+<target>Aplanko įvesties laukas yra tuščias.</target>
 
 <source>File time and size</source>
 <target>Failo laiką ir dydį</target>
@@ -358,22 +349,7 @@ Komanda inicijuojama jei:
 <target>Savitas</target>
 
 <source>FreeFileSync batch</source>
-<target></target>
-
-<source>Batch execution</source>
-<target>Paketinės užduoties vykdymas</target>
-
-<source>Items processed:</source>
-<target>Elementų apdorota:</target>
-
-<source>Items remaining:</source>
-<target>Likę elementai:</target>
-
-<source>Total time:</source>
-<target>Visas laikas:</target>
-
-<source>Stop</source>
-<target>Stabdyti</target>
+<target>FreeFileSync paketinė užduotis</target>
 
 <source>Synchronization aborted!</source>
 <target>Synchronizavimas nutrauktas!</target>
@@ -397,7 +373,7 @@ Komanda inicijuojama jei:
 <target>Nepavyksta prisijungti prie sourceforge.net!</target>
 
 <source>A new version of FreeFileSync is available:</source>
-<target></target>
+<target>Yra nauja FreeFileSync versija:</target>
 
 <source>Download now?</source>
 <target>Atsiųsti dabar?</target>
@@ -442,10 +418,10 @@ Komanda inicijuojama jei:
 <target>Plėtinys</target>
 
 <source>Size:</source>
-<target></target>
+<target>Dydis:</target>
 
 <source>Date:</source>
-<target></target>
+<target>Data:</target>
 
 <source>Action</source>
 <target>Veiksmas</target>
@@ -481,7 +457,7 @@ Komanda inicijuojama jei:
 <target>&Naujas</target>
 
 <source>&Save</source>
-<target></target>
+<target>&Išsaugoti</target>
 
 <source>&Language</source>
 <target>&Kalba</target>
@@ -534,11 +510,11 @@ Komanda inicijuojama jei:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Paskiausiai naudoti nustatymai (spauskite DEL, kad pašalinti iš sąrašo)</target>
 
-<source>Hide excluded items</source>
-<target>Slėpti neįtrauktus elementus</target>
+<source>Show excluded items</source>
+<target>Rodyti išskirtus elementus</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Slėpti išfiltruotus ar laikinai neįtrauktus failus</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Rodyti išfiltruotus ar laikinai išskirtus failus</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Failų ir aplankų, kurie bus sukurti, skaičius</target>
@@ -550,7 +526,7 @@ Komanda inicijuojama jei:
 <target>Failų ir aplankų, kurie bus ištrinti, skaičius</target>
 
 <source>Total bytes to copy</source>
-<target></target>
+<target>Viso baitų kopijuoti</target>
 
 <source>Items found:</source>
 <target>Rasta elementų:</target>
@@ -559,10 +535,10 @@ Komanda inicijuojama jei:
 <target>Greitis:</target>
 
 <source>Time remaining:</source>
-<target></target>
+<target>Likęs laikas:</target>
 
 <source>Time elapsed:</source>
-<target></target>
+<target>Praėjęs laikas:</target>
 
 <source>Batch job</source>
 <target>Paketinė užduotis</target>
@@ -582,24 +558,81 @@ Komanda inicijuojama jei:
 <source>Right</source>
 <target>Dešinė</target>
 
-<source>Status feedback</source>
-<target>Būsenos grįžtamasis ryšys</target>
+<source>Error handling</source>
+<target>Klaidų valdymas</target>
+
+<source>Ignore</source>
+<target>Ignoruoti</target>
+
+<source>Hide all error and warning messages</source>
+<target>Slėpti visus klaidų ir perspėjimų pranešimus</target>
+
+<source>Pop-up</source>
+<target>Iššokti</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Rodyti pranešimą esant klaidoms ar perspėjimams</target>
+
+<source>Exit</source>
+<target>Išeiti</target>
+
+<source>Abort synchronization on first error</source>
+<target>Nutraukti sinchronizavimą su pirma klaida</target>
+
+<source>On completion:</source>
+<target>Baigus:</target>
 
 <source>Show progress dialog</source>
 <target>Rodyti eigos langą</target>
 
-<source>Error handling</source>
-<target>Klaidų valdymas</target>
+<source>Generate log file</source>
+<target>Bendras ataskaitos failas</target>
+
+<source>Select folder to save log files</source>
+<target>Pasirinkite aplanką ataskaitos failų saugojimui</target>
 
-<source>Maximum number of log files:</source>
-<target>Didžiausias ataskaitų failų skaičius:</target>
+<source>Limit</source>
+<target>Riba</target>
 
-<source>Select folder to save log files:</source>
-<target>Pasirinkite aplanką, kuriame saugoti ataskaitų failus:</target>
+<source>Limit maximum number of log files</source>
+<target>Apriboti ataskaitų failų skaičių</target>
 
 <source>Batch settings</source>
 <target>Paketinės užduoties nustatymai</target>
 
+<source>Compare by...</source>
+<target>Sulyginti pagal...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Failai laikomi lygiais jei
+     - paskutinis rašymo laikas ir data
+     - failo dydis
+yra tokie patys
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Failai laikomi lygiais jei
+     - failo turinys
+yra toks pats
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Simbolinių nuorodų valdymas</target>
+
+<source>OK</source>
+<target>Gerai</target>
+
 <source>Select variant:</source>
 <target>Pažymėkite variantą:</target>
 
@@ -618,8 +651,26 @@ Komanda inicijuojama jei:
 <source>Deletion handling</source>
 <target>Trinimo valdymas</target>
 
-<source>On completion:</source>
-<target>Baigus:</target>
+<source>Permanent</source>
+<target>Visiškai</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Trinti ar perrašyti failus visam laikui</target>
+
+<source>Recycle Bin</source>
+<target>Šiukšliadėžė</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Naudoti šiukšliadėžę kaii trinami ar perrašomi failai</target>
+
+<source>Versioning</source>
+<target>Versijavimas</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Perkelti su laiko žyme failus į nurodytą aplanką</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Apriboti versijų skaičių failui</target>
 
 <source>Configuration</source>
 <target>Nustatymai</target>
@@ -642,39 +693,6 @@ Komanda inicijuojama jei:
 <source>Conflict/item cannot be categorized</source>
 <target>Konfliktas/elementas negali būti kategorizuojamas</target>
 
-<source>OK</source>
-<target>Gerai</target>
-
-<source>Compare by...</source>
-<target>Sulyginti pagal...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Failai laikomi lygiais jei
-     - paskutinis rašymo laikas ir data
-     - failo dydis
-yra tokie patys
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Failai laikomi lygiais jei
-     - failo turinys
-yra toks pats
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Simbolinių nuorodų valdymas</target>
-
 <source>Synchronizing...</source>
 <target>Sinchronizuojama...</target>
 
@@ -690,8 +708,8 @@ yra toks pats
 <source>Donate with PayPal</source>
 <target>Paremkite per PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Didelė padėka už FreeFileSync vertimą reiškiama:</target>
+<source>Many thanks for localization:</source>
+<target>Labai dėkojame už vertimą:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Nuomonė ir patarimai laukiami</target>
@@ -708,9 +726,6 @@ yra toks pats
 <source>Published under the GNU General Public License</source>
 <target>Platinama su GNU General Public licenzija</target>
 
-<source>Use Recycle Bin</source>
-<target>Naudoti šiukšliadėžę</target>
-
 <source>Delete on both sides</source>
 <target>Ištrinti abiejose pusėse</target>
 
@@ -780,8 +795,8 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Statistics</source>
 <target>Statistika</target>
 
-<source>Do not show this dialog again</source>
-<target>Nerodyti šio lango daugiau</target>
+<source>Don't show this dialog again</source>
+<target>Daugiau nerodyti šio dialogo</target>
 
 <source>Find what:</source>
 <target>Rasti kas:</target>
@@ -862,13 +877,10 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <target>Niekada nesaugoti pakeitimų</target>
 
 <source>Do you want to save changes to %x?</source>
-<target></target>
+<target>Ar norite išsaugoti %x pakeitimus?</target>
 
-<source>Save</source>
-<target></target>
-
-<source>Don't Save</source>
-<target></target>
+<source>Do&n't save</source>
+<target>&Nesaugoti</target>
 
 <source>Configuration loaded!</source>
 <target>Nustatymai įkelti!</target>
@@ -960,8 +972,8 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Show files that won't be copied</source>
 <target>Rodyti failus, kurie ne bus kopijuojami</target>
 
-<source>All directories in sync!</source>
-<target>Visi katalogai sinchronizuoti!</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>
@@ -1058,6 +1070,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Pause</source>
 <target>Pristabdyti</target>
 
+<source>Logging</source>
+<target>Užduoties duomenys</target>
+
 <source>Cannot find %x</source>
 <target>Nepavyksta rasti %x</target>
 
@@ -1143,21 +1158,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Leave as unresolved conflict</source>
 <target>Palikti kaip neišpręstą konfliktą</target>
 
-<source>Delete permanently</source>
-<target>Ištrinti visam laikui</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Trinti ar perrašyti failus visam laikui</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Naudoti šiukšliadėžę kaii trinami ar perrašomi failai</target>
-
-<source>Versioning</source>
-<target>Versijavimas</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Perkelti failus į laiku pažymėtus poaplankius</target>
-
 <source>Files</source>
 <target>Failai</target>
 
@@ -1254,8 +1254,11 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Cannot copy file %x to %y.</source>
 <target>Nepavyksta nukopijuoti failo %x į %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Nepavyksta nuskaityti katalogo %x.</target>
+<source>Cannot open directory %x.</source>
+<target>Nepavyksta atverti direktorijos %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Nepavyksta sunumeruoti direktorijos %x.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Aptikri nesibaigiančią katalogo rekursiją.</target>
@@ -1276,11 +1279,14 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <target>Nėra pakitimo nuo pakutinio sinchronizavimo!</target>
 
 <source>The corresponding database entries are not in sync considering current settings.</source>
-<target></target>
+<target>Atitinkami duomenų bazės įrašai nėra susinchronizuoti atsižvelgiant į dabartinius nustatymus.</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Nustatomos numatytos sinchronizavimo kryptys: Seni failai bus perrašyti naujesniais failais.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Šiukšliadėžė nepasiekiama sekantiems keliams! Failai bus ištrinti visam laikui išskyrus:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Galite ignoruoti šią klaidą, kad laikyti aplanką tuščiu.</target>
 
@@ -1290,6 +1296,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <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>Preparing synchronization...</source>
 <target>Ruošiamas sinchronizavimas...</target>
 
@@ -1302,6 +1311,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Files %x have the same date but a different size!</source>
 <target>Failai %x turi tokią pačią datą bet skirtingą dydį!</target>
 
+<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>
 
@@ -1317,9 +1329,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Both sides are equal</source>
 <target>Abi pusės yra lygios</target>
 
-<source>Items have different attributes</source>
-<target>Elementai turi skirtingus atributus</target>
-
 <source>Copy new item to left</source>
 <target>Kopijuoti naują elementą į kairę</target>
 
@@ -1383,6 +1392,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Moving symbolic link %x to %y</source>
 <target>Perkeliama simbolinė nuoroda %x į %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>Kuriamas failas %x</target>
 
@@ -1405,13 +1417,13 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <target>Atnaujinami atributai %x</target>
 
 <source>Target folder input field must not be empty.</source>
-<target></target>
+<target>Tikslo aplanko įvesties laukas negali būti tuščias.</target>
 
 <source>Folder input field for versioning must not be empty.</source>
-<target></target>
+<target>Aplanko įvesties laukas versijavimui negali būti tuščias.</target>
 
 <source>Source folder %x not found.</source>
-<target></target>
+<target>Šaltinio aplankas %x nerastas.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Yra neišspręstų konfliktų!</target>
@@ -1429,22 +1441,19 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <target>Nepakanka laisvos disko vietos:</target>
 
 <source>Required:</source>
-<target></target>
+<target>Reikia:</target>
 
 <source>Available:</source>
-<target></target>
-
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Šiukšliadėžė nepasiekiama sekantiems keliams! Failai bus ištrinti visam laikui išskyrus:</target>
+<target>Pasiekiama:</target>
 
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Aplankas, kuris yra dalis keletos aplankų porų, bus pakeistas. Prašome peržiūrėti sinchronizavimo nustatymus.</target>
 
-<source>Processing folder pair:</source>
-<target>Apdorojama aplankų pora:</target>
+<source>Synchronizing folder pair:</source>
+<target>Sinchrinizuojama aplankų pora:</target>
 
 <source>Target folder %x already existing.</source>
-<target></target>
+<target>Tikslo aplankas %x jau yra.</target>
 
 <source>Generating database...</source>
 <target>Generuojama duomenų bazė...</target>
diff --git a/BUILD/Languages/norwegian.lng b/BUILD/Languages/norwegian.lng
index 6ac894b0..947406c8 100644
--- a/BUILD/Languages/norwegian.lng
+++ b/BUILD/Languages/norwegian.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>Leter etter mappen %x</target>
 
-<source>Batch execution</source>
-<target>Batch-kjøring</target>
-
 <source>Items processed:</source>
 <target>Elementer behandlet:</target>
 
@@ -61,12 +58,12 @@
 <source>Create a batch job</source>
 <target>Opprett en batch-jobb</target>
 
-<source>Synchronization settings</source>
-<target>Innstillinger for synkronisering</target>
-
 <source>Comparison settings</source>
 <target>Innstillinger for sammenligning</target>
 
+<source>Synchronization settings</source>
+<target>Innstillinger for synkronisering</target>
+
 <source>About</source>
 <target>Om</target>
 
@@ -88,27 +85,6 @@
 <source>Select time span</source>
 <target>Velg tidsområde</target>
 
-<source>Show pop-up</source>
-<target>Vis pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Vis pop-upvindu ved feil eller advarsler</target>
-
-<source>Ignore errors</source>
-<target>Ignorer feil</target>
-
-<source>Hide all error and warning messages</source>
-<target>Skjul feilmeldinger og advarsler</target>
-
-<source>Exit instantly</source>
-<target>Avslutt med en gang</target>
-
-<source>Abort synchronization immediately</source>
-<target>Avbryt synkronisering umiddelbart</target>
-
-<source>Browse</source>
-<target>Bla gjennom</target>
-
 <source>Invalid command line:</source>
 <target>Ugyldig kommando:</target>
 
@@ -247,8 +223,8 @@
 <source>&Open...</source>
 <target>&Åpne</target>
 
-<source>Save &As...</source>
-<target>Lagre &som...</target>
+<source>Save &as...</source>
+<target></target>
 
 <source>&Quit</source>
 <target>&Avslutt</target>
@@ -289,6 +265,9 @@
 <source>Remove folder</source>
 <target>Fjern mappe</target>
 
+<source>Browse</source>
+<target>Bla gjennom</target>
+
 <source>Select a folder</source>
 <target>Velg en mappe</target>
 
@@ -321,8 +300,8 @@ Kommandoen utløses hvis:
 <source>Cancel</source>
 <target>Avbryt</target>
 
-<source>(Build: %x)</source>
-<target>(Build: %x)</target>
+<source>Build: %x</source>
+<target>Build: %x</target>
 
 <source>All files</source>
 <target>Alle filer</target>
@@ -342,9 +321,6 @@ Kommandoen utløses hvis:
 <source>A folder input field is empty.</source>
 <target>Et mappefelt er tomt.</target>
 
-<source>Logging</source>
-<target>Logging</target>
-
 <source>File time and size</source>
 <target>Fildato og størrelse</target>
 
@@ -525,11 +501,11 @@ Kommandoen utløses hvis:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Sist brukte innstillinger (trykk DEL for å fjerne fra liste)</target>
 
-<source>Hide excluded items</source>
-<target>Skjul ekskluderte elementer</target>
+<source>Show excluded items</source>
+<target></target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Skjul filtrerte eller midlertidig ekskluderte filer</target>
+<source>Show filtered or temporarily excluded files</source>
+<target></target>
 
 <source>Number of files and folders that will be created</source>
 <target>Antall filer og mapper som vil opprettes</target>
@@ -573,24 +549,81 @@ Kommandoen utløses hvis:
 <source>Right</source>
 <target>Høyre</target>
 
-<source>Status feedback</source>
-<target>Status-tilbakemelding</target>
+<source>Error handling</source>
+<target>Feilhåndtering</target>
+
+<source>Ignore</source>
+<target></target>
+
+<source>Hide all error and warning messages</source>
+<target>Skjul feilmeldinger og advarsler</target>
+
+<source>Pop-up</source>
+<target></target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Vis pop-upvindu ved feil eller advarsler</target>
+
+<source>Exit</source>
+<target></target>
+
+<source>Abort synchronization on first error</source>
+<target></target>
+
+<source>On completion:</source>
+<target>Ved fullføring:</target>
 
 <source>Show progress dialog</source>
 <target>Vis dialogboks</target>
 
-<source>Error handling</source>
-<target>Feilhåndtering</target>
+<source>Generate log file</source>
+<target></target>
 
-<source>Maximum number of log files:</source>
-<target>Maksimale antall loggfiler:</target>
+<source>Select folder to save log files</source>
+<target></target>
 
-<source>Select folder to save log files:</source>
-<target>Velg en mappe for loggfiler:</target>
+<source>Limit</source>
+<target></target>
+
+<source>Limit maximum number of log files</source>
+<target></target>
 
 <source>Batch settings</source>
 <target>Batch-innstillinger</target>
 
+<source>Compare by...</source>
+<target>Sammenlign etter...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Filer blir funnet like hvis
+     - sist skrevne tid og dato
+     - filstørrelse
+er den samme
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Filer blir funnet like hvis
+     - filinnhold
+er det samme
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Symbolsk lenkehåndtering</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Velg variant:</target>
 
@@ -609,8 +642,26 @@ Kommandoen utløses hvis:
 <source>Deletion handling</source>
 <target>Slette-håndtering</target>
 
-<source>On completion:</source>
-<target>Ved fullføring:</target>
+<source>Permanent</source>
+<target></target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Slett eller overskriv filer permanent</target>
+
+<source>Recycle Bin</source>
+<target></target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Bruk papirkurv ved sletting eller filoverskrivning</target>
+
+<source>Versioning</source>
+<target>Versjonshåndtering</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target></target>
+
+<source>Limit maximum number of versions per file</source>
+<target></target>
 
 <source>Configuration</source>
 <target>Innstilling</target>
@@ -633,39 +684,6 @@ Kommandoen utløses hvis:
 <source>Conflict/item cannot be categorized</source>
 <target>Konflikt/element kan ikke kategoriseres</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Sammenlign etter...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Filer blir funnet like hvis
-     - sist skrevne tid og dato
-     - filstørrelse
-er den samme
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Filer blir funnet like hvis
-     - filinnhold
-er det samme
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Symbolsk lenkehåndtering</target>
-
 <source>Synchronizing...</source>
 <target>Synkroniserer...</target>
 
@@ -681,8 +699,8 @@ er det samme
 <source>Donate with PayPal</source>
 <target>Doner med PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Stor takk for oversettelse av FreeFileSync går til:</target>
+<source>Many thanks for localization:</source>
+<target></target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Tilbakemelding og forslag er velkomne</target>
@@ -699,9 +717,6 @@ er det samme
 <source>Published under the GNU General Public License</source>
 <target>Utgitt under GNU General Public Licence</target>
 
-<source>Use Recycle Bin</source>
-<target>Bruk papirkurv</target>
-
 <source>Delete on both sides</source>
 <target>Slett på begge sider</target>
 
@@ -771,8 +786,8 @@ Merk: Filnavn må være relative til basismapper!
 <source>Statistics</source>
 <target>Statistikk</target>
 
-<source>Do not show this dialog again</source>
-<target>Ikke vis denne dialog igjen</target>
+<source>Don't show this dialog again</source>
+<target></target>
 
 <source>Find what:</source>
 <target>Søk hva:</target>
@@ -855,11 +870,8 @@ Merk: Filnavn må være relative til basismapper!
 <source>Do you want to save changes to %x?</source>
 <target>Vil du lagre endringene til %x?</target>
 
-<source>Save</source>
-<target>Lagre</target>
-
-<source>Don't Save</source>
-<target>Ikke lagre</target>
+<source>Do&n't save</source>
+<target></target>
 
 <source>Configuration loaded!</source>
 <target>Innstilling lastet!</target>
@@ -951,8 +963,8 @@ Merk: Filnavn må være relative til basismapper!
 <source>Show files that won't be copied</source>
 <target>Vis filer som ikke blir kopiert</target>
 
-<source>All directories in sync!</source>
-<target>Alle mapper er synkronisert!</target>
+<source>All folders are in sync!</source>
+<target></target>
 
 <source>Comma separated list</source>
 <target>Komma-separert liste</target>
@@ -1041,6 +1053,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Pause</source>
 <target>Pause</target>
 
+<source>Logging</source>
+<target>Logging</target>
+
 <source>Cannot find %x</source>
 <target>Kan ikke finne %x</target>
 
@@ -1122,21 +1137,6 @@ Merk: Filnavn må være relative til basismapper!
 <source>Leave as unresolved conflict</source>
 <target>Etterlat som uløste konflikter</target>
 
-<source>Delete permanently</source>
-<target>Slett permanent</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Slett eller overskriv filer permanent</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Bruk papirkurv ved sletting eller filoverskrivning</target>
-
-<source>Versioning</source>
-<target>Versjonshåndtering</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Flytt filer til en undermappe med tidsstempel</target>
-
 <source>Files</source>
 <target>Filer</target>
 
@@ -1227,8 +1227,11 @@ Merk: Filnavn må være relative til basismapper!
 <source>Cannot copy file %x to %y.</source>
 <target>Kan ikke kopiere filen %x til %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Kan ikke lese mappen %x.</target>
+<source>Cannot open directory %x.</source>
+<target></target>
+
+<source>Cannot enumerate directory %x.</source>
+<target></target>
 
 <source>Detected endless directory recursion.</source>
 <target>Fant uendelig dyp mappestruktur (lenker til mapper høyere opp i strukturen)</target>
@@ -1266,6 +1269,9 @@ Merk: Filnavn må være relative til basismapper!
 <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></target>
+
 <source>Preparing synchronization...</source>
 <target>Forbereder synkronisering...</target>
 
@@ -1278,8 +1284,8 @@ Merk: Filnavn må være relative til basismapper!
 <source>Files %x have the same date but a different size!</source>
 <target>Filer %x har den samme datoen, men forskjellig størrelse!</target>
 
-<source>Items have different attributes</source>
-<target>Elementer har forskjellige attributter</target>
+<source>Items differ in attributes only</source>
+<target></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>
@@ -1413,8 +1419,8 @@ 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>Processing folder pair:</source>
-<target>Behandler mappepar:</target>
+<source>Synchronizing folder pair:</source>
+<target></target>
 
 <source>Target folder %x already existing.</source>
 <target>Målmappe %x eksisterer allerede.</target>
diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng
index 08b5366c..d338f97a 100644
--- a/BUILD/Languages/polish.lng
+++ b/BUILD/Languages/polish.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>Wyszukiwanie katalogu %x...</target>
 
-<source>Batch execution</source>
-<target>Uruchomienie pliku wsadowego</target>
-
 <source>Items processed:</source>
 <target>Przetworzeone elementy:</target>
 
@@ -61,12 +58,12 @@
 <source>Create a batch job</source>
 <target>Utwórz plik wsadowy</target>
 
-<source>Synchronization settings</source>
-<target>Ustawienia synchronizacji</target>
-
 <source>Comparison settings</source>
 <target>Ustawienia porównywania</target>
 
+<source>Synchronization settings</source>
+<target>Ustawienia synchronizacji</target>
+
 <source>About</source>
 <target>O Programie</target>
 
@@ -88,27 +85,6 @@
 <source>Select time span</source>
 <target>Określ przedział czasowy</target>
 
-<source>Show pop-up</source>
-<target>Pokazuj okna pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Pokazuj okna pop-up dla błędów i ostrzeżeń</target>
-
-<source>Ignore errors</source>
-<target>Ignoruj błędy</target>
-
-<source>Hide all error and warning messages</source>
-<target>Ukryj wszystkie informacje błędach i ostrzeżeniach</target>
-
-<source>Exit instantly</source>
-<target>Wyjdź natychmiast</target>
-
-<source>Abort synchronization immediately</source>
-<target>Natychmiast zakończ synchronizację</target>
-
-<source>Browse</source>
-<target>Przeglądaj</target>
-
 <source>Invalid command line:</source>
 <target>Nieprawidłowa komenda:</target>
 
@@ -250,11 +226,11 @@
 <source>&Open...</source>
 <target>&Otwórz...</target>
 
-<source>Save &As...</source>
-<target>Zapi&sz jako...</target>
+<source>Save &as...</source>
+<target>&Zapisz jako...</target>
 
 <source>&Quit</source>
-<target>&Zamknij</target>
+<target>Zam&knij</target>
 
 <source>&Program</source>
 <target>&Program</target>
@@ -266,7 +242,7 @@
 <target>O Program&ie</target>
 
 <source>&Help</source>
-<target>P&omoc</target>
+<target>Pomo&c</target>
 
 <source>Usage:</source>
 <target>Użycie:</target>
@@ -292,6 +268,9 @@
 <source>Remove folder</source>
 <target>Usuń katalog</target>
 
+<source>Browse</source>
+<target>Przeglądaj</target>
+
 <source>Select a folder</source>
 <target>Wybierz katalog</target>
 
@@ -324,8 +303,8 @@ Komenda jest wykonywana gdy:
 <source>Cancel</source>
 <target>Anuluj</target>
 
-<source>(Build: %x)</source>
-<target>(Zbudowano: %x)</target>
+<source>Build: %x</source>
+<target>Zbudowano: %x</target>
 
 <source>All files</source>
 <target>Wszystkie pliki</target>
@@ -345,9 +324,6 @@ Komenda jest wykonywana gdy:
 <source>A folder input field is empty.</source>
 <target>Pole katalog źródłowy jest puste.</target>
 
-<source>Logging</source>
-<target>Tworzenie logów</target>
-
 <source>File time and size</source>
 <target>Czas modyfikacji i rozmiar</target>
 
@@ -528,11 +504,11 @@ Komenda jest wykonywana gdy:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Ostatnio użyta konfiguracja (naciśnij DEL żeby usunąć z listy)</target>
 
-<source>Hide excluded items</source>
-<target>Ukryj wykluczone pliki</target>
+<source>Show excluded items</source>
+<target>Pokaż wykluczone elementy</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Ukryj pliki filtrowane lub tymczasowo wykluczone</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Pokaż pliki wykluczone tymczasowo lub pliki wykluczone tymczasowo</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Liczba plików i katalogów, które zostaną utworzone</target>
@@ -576,68 +552,47 @@ Komenda jest wykonywana gdy:
 <source>Right</source>
 <target>Prawy</target>
 
-<source>Status feedback</source>
-<target>Status</target>
-
-<source>Show progress dialog</source>
-<target>Pokaż okno postępu</target>
-
 <source>Error handling</source>
 <target>Obsługa błędów</target>
 
-<source>Maximum number of log files:</source>
-<target>Maksymalna liczba plików z logami:</target>
-
-<source>Select folder to save log files:</source>
-<target>Wybierz katalog, do które będą zapisywane logi:</target>
-
-<source>Batch settings</source>
-<target>Ustawienia trybu wsadowego</target>
+<source>Ignore</source>
+<target>Ignoruj</target>
 
-<source>Select variant:</source>
-<target>Wybierz wariant:</target>
-
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Znajdź i zastosuj zmiany po obu stronach przy pomocy bazy danych. Usunięnia, zmiany nazwy plików oraz konflikty są usuwane automatycznie.</target>
+<source>Hide all error and warning messages</source>
+<target>Ukryj wszystkie informacje błędach i ostrzeżeniach</target>
 
-<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Lustrzana kopia lewego folderu. Prawy folder po synchronizacji jest lustrzaną kopią lewego folderu.</target>
+<source>Pop-up</source>
+<target>Pop-up</target>
 
-<source>Copy new or updated files to right folder.</source>
-<target>Kopiuj nowe lub aktualniejsze pliki na prawą stronę.</target>
+<source>Show pop-up on errors or warnings</source>
+<target>Pokazuj okna pop-up dla błędów i ostrzeżeń</target>
 
-<source>Configure your own synchronization rules.</source>
-<target>Skonfiguruj swoje własne reguły synchronizacji.</target>
+<source>Exit</source>
+<target>Wyjście</target>
 
-<source>Deletion handling</source>
-<target>Obsługa usuwania</target>
+<source>Abort synchronization on first error</source>
+<target>Zakończ synchronizację przy pierwszym błędzie</target>
 
 <source>On completion:</source>
 <target>Po zakończeniu:</target>
 
-<source>Configuration</source>
-<target>Konfiguracja</target>
-
-<source>Item exists on left side only</source>
-<target>Element istnieje tylko po lewej stronie</target>
-
-<source>Item exists on right side only</source>
-<target>Element istnieje tylko po prawej stronie</target>
+<source>Show progress dialog</source>
+<target>Pokaż okno postępu</target>
 
-<source>Left side is newer</source>
-<target>Lewa strona jest nowsza</target>
+<source>Generate log file</source>
+<target>Twórz plik logów</target>
 
-<source>Right side is newer</source>
-<target>Prawa strona jest nowsza</target>
+<source>Select folder to save log files</source>
+<target>Określ katalog z logami</target>
 
-<source>Items have different content</source>
-<target><Elementy różnią się zawartością</target>
+<source>Limit</source>
+<target>Limit</target>
 
-<source>Conflict/item cannot be categorized</source>
-<target>Konflikt/element nie może zostać skategoryzowany</target>
+<source>Limit maximum number of log files</source>
+<target>Określ maksymalną liczbę plików z logami</target>
 
-<source>OK</source>
-<target>OK</target>
+<source>Batch settings</source>
+<target>Ustawienia trybu wsadowego</target>
 
 <source>Compare by...</source>
 <target>Porównaj przez...</target>
@@ -669,6 +624,69 @@ jest identyczna
 <source>Symbolic Link handling</source>
 <target>Obsługa dowiązań symbolicznych</target>
 
+<source>OK</source>
+<target>OK</target>
+
+<source>Select variant:</source>
+<target>Wybierz wariant:</target>
+
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Znajdź i zastosuj zmiany po obu stronach przy pomocy bazy danych. Usunięnia, zmiany nazwy plików oraz konflikty są usuwane automatycznie.</target>
+
+<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
+<target>Lustrzana kopia lewego folderu. Prawy folder po synchronizacji jest lustrzaną kopią lewego folderu.</target>
+
+<source>Copy new or updated files to right folder.</source>
+<target>Kopiuj nowe lub aktualniejsze pliki na prawą stronę.</target>
+
+<source>Configure your own synchronization rules.</source>
+<target>Skonfiguruj swoje własne reguły synchronizacji.</target>
+
+<source>Deletion handling</source>
+<target>Usuwanie</target>
+
+<source>Permanent</source>
+<target>Trwały</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Usuń lub nadpisz pliki na stałe</target>
+
+<source>Recycle Bin</source>
+<target>Kosz</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Używaj Kosza podczas usuwania lub nadpisywania plików</target>
+
+<source>Versioning</source>
+<target>Wersjonowanie</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Pliki wersji oznaczone datą przenieś do określonego katalogu</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Określ maksymalną liczbę wersji dla pliku</target>
+
+<source>Configuration</source>
+<target>Konfiguracja</target>
+
+<source>Item exists on left side only</source>
+<target>Element istnieje tylko po lewej stronie</target>
+
+<source>Item exists on right side only</source>
+<target>Element istnieje tylko po prawej stronie</target>
+
+<source>Left side is newer</source>
+<target>Lewa strona jest nowsza</target>
+
+<source>Right side is newer</source>
+<target>Prawa strona jest nowsza</target>
+
+<source>Items have different content</source>
+<target>Elementy różnią się zawartością</target>
+
+<source>Conflict/item cannot be categorized</source>
+<target>Konflikt/element nie może zostać skategoryzowany</target>
+
 <source>Synchronizing...</source>
 <target>Synchronizuję...</target>
 
@@ -684,8 +702,8 @@ jest identyczna
 <source>Donate with PayPal</source>
 <target>Wesprzyj z PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Podziękowania za tłumaczenie FreeFileSync:</target>
+<source>Many thanks for localization:</source>
+<target>Podziękowania za tłumaczenia:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Wszelkie opinie i sugestie mile widziane</target>
@@ -702,9 +720,6 @@ jest identyczna
 <source>Published under the GNU General Public License</source>
 <target>Udostępnione na zasadach licencji GNU General Public License</target>
 
-<source>Use Recycle Bin</source>
-<target>Użyj kosza</target>
-
 <source>Delete on both sides</source>
 <target>Usuń po obu stronach</target>
 
@@ -774,8 +789,8 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Statistics</source>
 <target>Statystyki</target>
 
-<source>Do not show this dialog again</source>
-<target>Nie pokazuj tego okna ponownie</target>
+<source>Don't show this dialog again</source>
+<target>Nie pokazuj więcej tego okna</target>
 
 <source>Find what:</source>
 <target>Co:</target>
@@ -858,11 +873,8 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Do you want to save changes to %x?</source>
 <target>Czy chcesz zapisać zmiany w %x?</target>
 
-<source>Save</source>
-<target>Zapisz</target>
-
-<source>Don't Save</source>
-<target>Nie zapisuj</target>
+<source>Do&n't save</source>
+<target>&Nie zapisuj</target>
 
 <source>Configuration loaded!</source>
 <target>Konfiguracja wczytana!</target>
@@ -954,8 +966,8 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Show files that won't be copied</source>
 <target>Pokaż pliki, które nie będą kopiowane</target>
 
-<source>All directories in sync!</source>
-<target>Wszystkie katalogi zsynchronizowane!</target>
+<source>All folders are in sync!</source>
+<target>Wszystkie katalogi są zsynchronizowane!</target>
 
 <source>Comma separated list</source>
 <target>Lista oddzielona przecinkami</target>
@@ -1048,6 +1060,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Pause</source>
 <target>Pauza</target>
 
+<source>Logging</source>
+<target>Tworzenie logów</target>
+
 <source>Cannot find %x</source>
 <target>Nie można znaleźć %x</target>
 
@@ -1131,21 +1146,6 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Leave as unresolved conflict</source>
 <target>Zostaw jako nierozwiązany konflikt</target>
 
-<source>Delete permanently</source>
-<target>Usuń na stałe</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Usuń lub nadpisz pliki na stałe</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Używaj Kosza podczas usuwania lub nadpisywania plików</target>
-
-<source>Versioning</source>
-<target>Wersjonowanie</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Przenieś pliki do podkatalogu ze zmodyfikowanym czasem.</target>
-
 <source>Files</source>
 <target>Pliki</target>
 
@@ -1239,8 +1239,11 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Cannot copy file %x to %y.</source>
 <target>Nie można skopiować pliku %x do %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Nie można odczytać katalogu %x.</target>
+<source>Cannot open directory %x.</source>
+<target>Nie można otworzyć katalogu %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Nie można wyliczyć katalogu %x.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Wykryto nieskończoną pętlę katalogów</target>
@@ -1266,6 +1269,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Ustawianie domyślnego kierunku synchronizacji: Stare pliki zostaną nadpisane nowszymi.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Kosz nie jest dostępny dla określonych ścieżek! Pliki zostaną nieodwracalnie usuniętę:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Możesz zignorować ten błąd traktując katalog jako pusty.</target>
 
@@ -1275,6 +1281,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <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>
 
+<source>Start comparison</source>
+<target>Rozpocznij porównywanie</target>
+
 <source>Preparing synchronization...</source>
 <target>Przygotowywanie synchronizacji...</target>
 
@@ -1287,6 +1296,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Files %x have the same date but a different size!</source>
 <target>Pliki %x mają tą samą datę lecz różne rozmiary!</target>
 
+<source>Items differ in attributes only</source>
+<target>Elementy różnią się wyłącznie atrybutami</target>
+
 <source>Symbolic links %x have the same date but a different target.</source>
 <target>Dowiązania symboliczne %x mają tą samą datę, ale różne źródła.</target>
 
@@ -1302,9 +1314,6 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Both sides are equal</source>
 <target>Obie strony są równe</target>
 
-<source>Items have different attributes</source>
-<target>Elementy mają różne atrybuty</target>
-
 <source>Copy new item to left</source>
 <target>Kopiuj nowy element na lewą stronę</target>
 
@@ -1393,7 +1402,7 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <target>Pole katalog docelowy nie może być puste.</target>
 
 <source>Folder input field for versioning must not be empty.</source>
-<target>Pole katalog źródłowy nie może być puste.</target>
+<target>Określ katalog do przechowywania wersjonowanych plików.</target>
 
 <source>Source folder %x not found.</source>
 <target>Nie znaleziono katalogu docelowego %x.</target>
@@ -1419,14 +1428,11 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Available:</source>
 <target>Dostępne:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Kosz nie jest dostępny dla określonych ścieżek! Pliki zostaną nieodwracalnie usuniętę:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Katalog zostanie zmodyfikowany w związku z synchronizacją wielu katalogów. Zweryfikuj ustawienia synchronizacji.</target>
 
-<source>Processing folder pair:</source>
-<target>Przetwarzanie folderów:</target>
+<source>Synchronizing folder pair:</source>
+<target>Synchronizacja katalgów:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Katalog docelowy %x już istnieje.</target>
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index af35040b..d825097c 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>À procura da pasta %x...</target>
 
-<source>Batch execution</source>
-<target>Execução do batch</target>
-
 <source>Items processed:</source>
 <target>Elementos processados:</target>
 
@@ -34,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Abortar pedido: À espera do fim da operação atual...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronização Automatizada</target>
 
@@ -61,12 +61,12 @@
 <source>Create a batch job</source>
 <target>Criar ficheiro batch</target>
 
-<source>Synchronization settings</source>
-<target>Parametros de sincronização</target>
-
 <source>Comparison settings</source>
 <target>Opções de comparação</target>
 
+<source>Synchronization settings</source>
+<target>Parametros de sincronização</target>
+
 <source>About</source>
 <target>Sobre</target>
 
@@ -88,27 +88,6 @@
 <source>Select time span</source>
 <target>Selecionar intervalo de tempo</target>
 
-<source>Show pop-up</source>
-<target>Mostrar popup</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Mostrar popup em caso de erros ou avisos</target>
-
-<source>Ignore errors</source>
-<target>Ignorar erros</target>
-
-<source>Hide all error and warning messages</source>
-<target>Ocultar todas as mensagens de erro/aviso</target>
-
-<source>Exit instantly</source>
-<target>Sair imediatamente</target>
-
-<source>Abort synchronization immediately</source>
-<target>Abortar sincronização imediatamente</target>
-
-<source>Browse</source>
-<target>Procurar</target>
-
 <source>Invalid command line:</source>
 <target>Linha de comando inválida:</target>
 
@@ -247,8 +226,8 @@
 <source>&Open...</source>
 <target>&Abrir...</target>
 
-<source>Save &As...</source>
-<target>Guar&dar como...</target>
+<source>Save &as...</source>
+<target>Guardar &como...</target>
 
 <source>&Quit</source>
 <target>&Sair</target>
@@ -289,6 +268,9 @@
 <source>Remove folder</source>
 <target>Remover pasta(s)</target>
 
+<source>Browse</source>
+<target>Procurar</target>
+
 <source>Select a folder</source>
 <target>Selecione uma pasta</target>
 
@@ -321,8 +303,8 @@ O comando é executado se:
 <source>Cancel</source>
 <target>Cancelar</target>
 
-<source>(Build: %x)</source>
-<target>(Build: %x)</target>
+<source>Build: %x</source>
+<target>Build: %x</target>
 
 <source>All files</source>
 <target>Todos os ficheiros</target>
@@ -342,9 +324,6 @@ O comando é executado se:
 <source>A folder input field is empty.</source>
 <target>Um dos campos de directório para comparar está vazio.</target>
 
-<source>Logging</source>
-<target>A escrever em log</target>
-
 <source>File time and size</source>
 <target>Data e tamanho do ficheiro</target>
 
@@ -525,11 +504,11 @@ O comando é executado se:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Última configuração utilizada (pressione DEL para remover da lista)</target>
 
-<source>Hide excluded items</source>
-<target>Ocultar itens excluidos</target>
+<source>Show excluded items</source>
+<target>Mostrar itens excluidos</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Ocultar ficheiros filtrados ou temporariamente excluidos</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Mostrar ficheiros filtrados ou temporariamente excluidos</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Número de ficheiros e pastas a ser criados</target>
@@ -573,24 +552,80 @@ O comando é executado se:
 <source>Right</source>
 <target>Direita</target>
 
-<source>Status feedback</source>
-<target>Retorno de estado</target>
+<source>Error handling</source>
+<target>Controlador de erros</target>
+
+<source>Ignore</source>
+<target>Ignorar</target>
+
+<source>Hide all error and warning messages</source>
+<target>Ocultar todas as mensagens de erro/aviso</target>
+
+<source>Pop-up</source>
+<target>Pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Mostrar popup em caso de erros ou avisos</target>
+
+<source>Exit</source>
+<target>Sair</target>
+
+<source>Abort synchronization on first error</source>
+<target>Abortar sincronização ao primeiro erro</target>
+
+<source>On completion:</source>
+<target>Ao concluir:</target>
 
 <source>Show progress dialog</source>
 <target>Mostrar diálogo de progresso</target>
 
-<source>Error handling</source>
-<target>Controlador de erros</target>
+<source>Generate log file</source>
+<target>Gerar ficheiro log</target>
+
+<source>Select folder to save log files</source>
+<target>Seleccionar pasta para guardar ficheiros log</target>
 
-<source>Maximum number of log files:</source>
-<target>Número máximo de ficheiros log:</target>
+<source>Limit</source>
+<target>Limitar</target>
 
-<source>Select folder to save log files:</source>
-<target>Selecionar pasta onde guardar os logs:</target>
+<source>Limit maximum number of log files</source>
+<target>Limitar o número máximo de ficheiros log</target>
 
 <source>Batch settings</source>
 <target>Opções do batch</target>
 
+<source>Compare by...</source>
+<target>Comparar por...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Ficheiros considerados iguais se
+	 - data da última modificação
+	 - tamanho
+são iguais
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Os ficheiros são considerados iguais se
+     - o conteúdo é o mesmo
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Tratamento de links simbólicos</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Selecione uma variante:</target>
 
@@ -609,8 +644,26 @@ O comando é executado se:
 <source>Deletion handling</source>
 <target>Controlo eliminação</target>
 
-<source>On completion:</source>
-<target>Ao concluir:</target>
+<source>Permanent</source>
+<target>Permanente</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Apagar ou substituir ficheiros permanentemente</target>
+
+<source>Recycle Bin</source>
+<target>Reciclagem</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Utilizar Reciclagem ao apagar ou substituir ficheiros</target>
+
+<source>Versioning</source>
+<target>Manter versões anteriores</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Mover ficheiros datados para a pasta especificada</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Limitar número máximo de versões por ficheiro</target>
 
 <source>Configuration</source>
 <target>Configuração</target>
@@ -633,38 +686,6 @@ O comando é executado se:
 <source>Conflict/item cannot be categorized</source>
 <target>Conflito/item não pode ser categorizado</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Comparar por...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Ficheiros considerados iguais se
-	 - data da última modificação
-	 - tamanho
-são iguais
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Os ficheiros são considerados iguais se
-     - o conteúdo é o mesmo
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Tratamento de links simbólicos</target>
-
 <source>Synchronizing...</source>
 <target>A sincronizar...</target>
 
@@ -680,8 +701,8 @@ Os ficheiros são considerados iguais se
 <source>Donate with PayPal</source>
 <target>Doar usando PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Pela tradução de FreeFileSync, um agradecimento a:</target>
+<source>Many thanks for localization:</source>
+<target>Muito obrigado pela localização:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Comentários e sugestões são apreciados</target>
@@ -698,9 +719,6 @@ Os ficheiros são considerados iguais se
 <source>Published under the GNU General Public License</source>
 <target>Publicado sobre GNU General Public License</target>
 
-<source>Use Recycle Bin</source>
-<target>Utilizar Reciclagem</target>
-
 <source>Delete on both sides</source>
 <target>Eliminar em ambos os lados</target>
 
@@ -770,7 +788,7 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Statistics</source>
 <target>Estatísticas</target>
 
-<source>Do not show this dialog again</source>
+<source>Don't show this dialog again</source>
 <target>Não mostrar este diálogo novamente</target>
 
 <source>Find what:</source>
@@ -854,11 +872,8 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Do you want to save changes to %x?</source>
 <target>Deseja guardar as alterações a %x?</target>
 
-<source>Save</source>
-<target>Guardar</target>
-
-<source>Don't Save</source>
-<target>Não Guardar</target>
+<source>Do&n't save</source>
+<target>Não g&uardar</target>
 
 <source>Configuration loaded!</source>
 <target>Configuração carregada!</target>
@@ -950,8 +965,8 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Show files that won't be copied</source>
 <target>Mostrar ficheiros que não serão copiados</target>
 
-<source>All directories in sync!</source>
-<target>Todas as pastas sincronizadas!</target>
+<source>All folders are in sync!</source>
+<target>Todas as pastas estão sincronizadas!</target>
 
 <source>Comma separated list</source>
 <target>Lista de itens separados por vírgulas</target>
@@ -1040,6 +1055,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Pause</source>
 <target>Pausa</target>
 
+<source>Logging</source>
+<target>A escrever em log</target>
+
 <source>Cannot find %x</source>
 <target>Não é possível descobrir %x</target>
 
@@ -1121,21 +1139,6 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Leave as unresolved conflict</source>
 <target>Deixar como conflito</target>
 
-<source>Delete permanently</source>
-<target>Apagar permanentemente</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Apagar ou substituir ficheiros permanentemente</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Utilizar Reciclagem ao apagar ou substituir ficheiros</target>
-
-<source>Versioning</source>
-<target>Manter versões anteriores</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Mover ficheiros para uma subpasta com hora e data</target>
-
 <source>Files</source>
 <target>Ficheiros</target>
 
@@ -1226,8 +1229,11 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Cannot copy file %x to %y.</source>
 <target>Não é possível copiar o ficheiro %x para %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Não é possível ler o directório %x.</target>
+<source>Cannot open directory %x.</source>
+<target>Não é possível abrir o directório %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Não é possível enumerar o directório %x.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Recursão infinita detetada no directório</target>
@@ -1253,6 +1259,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Escolher direcção de sincronização por defeito: Os ficheiros antigos serão substituídos pelos novos.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Reciclagem não disponível para os seguintes caminhos! Os ficheiros serão apagados permanentemente:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Pode ignorar este erro para considerar a pasta como vazia.</target>
 
@@ -1262,6 +1271,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <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>
 
+<source>Start comparison</source>
+<target>Iniciar comparação</target>
+
 <source>Preparing synchronization...</source>
 <target>A preparar sincronização...</target>
 
@@ -1274,6 +1286,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Files %x have the same date but a different size!</source>
 <target>Os ficheiros %x têm a mesma data, mas tamanho diferente!</target>
 
+<source>Items differ in attributes only</source>
+<target>Itens diferem apenas nos atributos</target>
+
 <source>Symbolic links %x have the same date but a different target.</source>
 <target>Links simbólicos %x tem a mesma data, mas alvos diferentes.</target>
 
@@ -1289,9 +1304,6 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Both sides are equal</source>
 <target>Ambos os lados iguais</target>
 
-<source>Items have different attributes</source>
-<target>Itens tem diferentes atributos</target>
-
 <source>Copy new item to left</source>
 <target>Copiar novo item para a esquerda</target>
 
@@ -1355,6 +1367,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Moving symbolic link %x to %y</source>
 <target>Mover link simbólico %x para %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>Criar ficheiro %x</target>
 
@@ -1406,14 +1421,11 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Available:</source>
 <target>Disponível:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Reciclagem não disponível para os seguintes caminhos! Os ficheiros serão apagados permanentemente:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Uma pasta que faz parte de vários pares vai ser modificada. Por favor, reveja os parametros de sincronização.</target>
 
-<source>Processing folder pair:</source>
-<target>A processar o par do directorio:</target>
+<source>Synchronizing folder pair:</source>
+<target>Sincronizar o par de pastas:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Directório de destino %x já existe.</target>
diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng
index bac56f55..e64cdba5 100644
--- a/BUILD/Languages/portuguese_br.lng
+++ b/BUILD/Languages/portuguese_br.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>Buscando pela pasta %x...</target>
 
-<source>Batch execution</source>
-<target>Execução da tarefa em lote</target>
-
 <source>Items processed:</source>
 <target>Elementos processados:</target>
 
@@ -34,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Cancelar solicitado: Esperando fim da operação...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronização Automatizada</target>
 
@@ -61,12 +61,12 @@
 <source>Create a batch job</source>
 <target>Criar arquivo de lote</target>
 
+<source>Comparison settings</source>
+<target>Parâmetros de comparação</target>
+
 <source>Synchronization settings</source>
 <target>Parâmetros de sincronização</target>
 
-<source>Comparison settings</source>
-<target>Parâmetros da comparação</target>
-
 <source>About</source>
 <target>Sobre</target>
 
@@ -88,27 +88,6 @@
 <source>Select time span</source>
 <target>Selecionar intervalo de tempo</target>
 
-<source>Show pop-up</source>
-<target>Mostrar pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Mostrar pop-up em caso de erros ou avisos</target>
-
-<source>Ignore errors</source>
-<target>Ignorar erros</target>
-
-<source>Hide all error and warning messages</source>
-<target>Ocultar todas as mensagens de erro e aviso</target>
-
-<source>Exit instantly</source>
-<target>Sair imediatamente</target>
-
-<source>Abort synchronization immediately</source>
-<target>Cancelar a sincronização imediatamente</target>
-
-<source>Browse</source>
-<target>Procurar</target>
-
 <source>Invalid command line:</source>
 <target>Linha de comando inválida:</target>
 
@@ -247,8 +226,8 @@
 <source>&Open...</source>
 <target>&Abrir...</target>
 
-<source>Save &As...</source>
-<target>Salvar &Como...</target>
+<source>Save &as...</source>
+<target>Salvar &como...</target>
 
 <source>&Quit</source>
 <target>Sai&r</target>
@@ -289,6 +268,9 @@
 <source>Remove folder</source>
 <target>Remover pasta</target>
 
+<source>Browse</source>
+<target>Procurar</target>
+
 <source>Select a folder</source>
 <target>Selecionar uma pasta</target>
 
@@ -321,8 +303,8 @@ O comando é disparado se:
 <source>Cancel</source>
 <target>Cancelar</target>
 
-<source>(Build: %x)</source>
-<target>(Versão: %x)</target>
+<source>Build: %x</source>
+<target>Versão: %x</target>
 
 <source>All files</source>
 <target>Todos os arquivos</target>
@@ -342,9 +324,6 @@ O comando é disparado se:
 <source>A folder input field is empty.</source>
 <target>Um campo de entrada de pasta está vazio.</target>
 
-<source>Logging</source>
-<target>Ver Log</target>
-
 <source>File time and size</source>
 <target>Data e tamanho do arquivo</target>
 
@@ -499,7 +478,7 @@ O comando é disparado se:
 <target>Comparar os dois lados</target>
 
 <source>&Abort</source>
-<target>&Abortar</target>
+<target>&Cancelar</target>
 
 <source>Synchronize</source>
 <target>Sincronizar</target>
@@ -525,11 +504,11 @@ O comando é disparado se:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Últimas configurações usadas (pressione DEL para remover da lista)</target>
 
-<source>Hide excluded items</source>
-<target>Ocultar itens excluídos</target>
+<source>Show excluded items</source>
+<target>Mostrar itens excluídos</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Ocultar arquivos filtrados ou temporariamente excluídos</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Mostra arquivos que foram filtrados ou excluídos temporariamente</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Número de arquivos e pastas que serão criados</target>
@@ -573,24 +552,81 @@ O comando é disparado se:
 <source>Right</source>
 <target>Direita</target>
 
-<source>Status feedback</source>
-<target>Informação do Status</target>
+<source>Error handling</source>
+<target>Tratamento de erros</target>
+
+<source>Ignore</source>
+<target>Ignorar</target>
+
+<source>Hide all error and warning messages</source>
+<target>Oculta todas as mensagens de erros e avisos</target>
+
+<source>Pop-up</source>
+<target>Pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Mostra pop-up em caso de erros ou avisos</target>
+
+<source>Exit</source>
+<target>Sair</target>
+
+<source>Abort synchronization on first error</source>
+<target>Cancela sincronização no primeiro erro</target>
+
+<source>On completion:</source>
+<target>Ao terminar:</target>
 
 <source>Show progress dialog</source>
 <target>Mostrar indicador de progresso</target>
 
-<source>Error handling</source>
-<target>Tratamento de erros</target>
+<source>Generate log file</source>
+<target>Gerar arquivo de log</target>
+
+<source>Select folder to save log files</source>
+<target>Seleciona pasta para salvar arquivos de log</target>
 
-<source>Maximum number of log files:</source>
-<target>Número máximo de arquivos de log:</target>
+<source>Limit</source>
+<target>Limite</target>
 
-<source>Select folder to save log files:</source>
-<target>Selecione a pasta para salvar os arquivos de log:</target>
+<source>Limit maximum number of log files</source>
+<target>Limita número máximo de arquivos de log</target>
 
 <source>Batch settings</source>
 <target>Configurações da tarefa em lote</target>
 
+<source>Compare by...</source>
+<target>Comparar por...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Os arquivos são considerados iguais se
+     - data e hora de modificação e
+     - tamanho do arquivo
+são os mesmos
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Os arquivos são considerados iguais se
+     - o conteúdo do arquivo
+é o mesmo
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Tratamento de Links Simbólicos</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Selecione um modo:</target>
 
@@ -609,8 +645,26 @@ O comando é disparado se:
 <source>Deletion handling</source>
 <target>Tratamento da exclusão</target>
 
-<source>On completion:</source>
-<target>Ao terminar:</target>
+<source>Permanent</source>
+<target>Permante</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Apaga ou substitui arquivos permanentemente</target>
+
+<source>Recycle Bin</source>
+<target>Lixeira</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Usa a Lixeira quando apagar ou substituir arquivos</target>
+
+<source>Versioning</source>
+<target>Controle de versões</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Move os arquivos com estampa de tempo para uma pasta especificada</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Limita número máximo de versões por arquivo</target>
 
 <source>Configuration</source>
 <target>Configuração</target>
@@ -633,39 +687,6 @@ O comando é disparado se:
 <source>Conflict/item cannot be categorized</source>
 <target>Conflito/item não pode ser categorizado</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Comparar por...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Os arquivos são considerados iguais se
-     - data e hora de modificação e
-     - tamanho do arquivo
-são os mesmos
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Os arquivos são considerados iguais se
-     - o conteúdo do arquivo
-é o mesmo
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Tratamento de Links Simbólicos</target>
-
 <source>Synchronizing...</source>
 <target>Sincronizando...</target>
 
@@ -681,8 +702,8 @@ Os arquivos são considerados iguais se
 <source>Donate with PayPal</source>
 <target>Doar usando PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Pela tradução do FreeFileSync, um agradecimento a:</target>
+<source>Many thanks for localization:</source>
+<target>Pela tradução, um agradecimento a:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Críticas e sugestões são bem-vindas</target>
@@ -699,9 +720,6 @@ Os arquivos são considerados iguais se
 <source>Published under the GNU General Public License</source>
 <target>Publicado sobre a GNU General Public License</target>
 
-<source>Use Recycle Bin</source>
-<target>Utilizar Lixeira</target>
-
 <source>Delete on both sides</source>
 <target>Apagar em ambos os lados</target>
 
@@ -771,8 +789,8 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Statistics</source>
 <target>Estatísticas</target>
 
-<source>Do not show this dialog again</source>
-<target>Não mostrar este diálogo novamente</target>
+<source>Don't show this dialog again</source>
+<target>Não mostrar esta caixa de diálogo novamente</target>
 
 <source>Find what:</source>
 <target>Localizar o que:</target>
@@ -855,11 +873,8 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Do you want to save changes to %x?</source>
 <target>Gostaria de salvar as alterações para %x?</target>
 
-<source>Save</source>
-<target>Salvar</target>
-
-<source>Don't Save</source>
-<target>Não Salvar</target>
+<source>Do&n't save</source>
+<target>&Não salvar</target>
 
 <source>Configuration loaded!</source>
 <target>Configuração carregada!</target>
@@ -951,8 +966,8 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Show files that won't be copied</source>
 <target>Mostrar arquivos que não serão copiados</target>
 
-<source>All directories in sync!</source>
-<target>Todos os diretórios em sincronismo!</target>
+<source>All folders are in sync!</source>
+<target>Todas as pastas estão sincronizadas!</target>
 
 <source>Comma separated list</source>
 <target>Lista de itens separados por vírgulas</target>
@@ -1041,6 +1056,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Pause</source>
 <target>Pausar</target>
 
+<source>Logging</source>
+<target>Ver Log</target>
+
 <source>Cannot find %x</source>
 <target>Não foi possível encontrar %x</target>
 
@@ -1122,21 +1140,6 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Leave as unresolved conflict</source>
 <target>Deixar como conflito não resolvido</target>
 
-<source>Delete permanently</source>
-<target>Apagar permanentemente</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Apagar ou substituir arquivos permanentemente</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Usar a Lixeira quando apagar ou substituir arquivos</target>
-
-<source>Versioning</source>
-<target>Controle de versões</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Move os arquivos para uma subpasta com estampa de tempo</target>
-
 <source>Files</source>
 <target>Arquivos</target>
 
@@ -1227,8 +1230,11 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Cannot copy file %x to %y.</source>
 <target>Não foi possível copiar o arquivo %x para %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Não foi possível ler o diretório %x.</target>
+<source>Cannot open directory %x.</source>
+<target>Não foi possível abrir o diretório %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Não foi possível enumerar o diretório %x.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Detectada recursão de diretório infinita.</target>
@@ -1254,6 +1260,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Configurando direções padrões de sincronização: Arquivos antigos serão substituídos por arquivos mais novos.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>A Lixeira não está disponível para os seguintes caminhos! Os arquivos serão apagados permanentemente:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Você pode ignorar este erro para considerar a pasta como vazia.</target>
 
@@ -1263,6 +1272,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <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>
 
+<source>Start comparison</source>
+<target>Iniciar a comparação</target>
+
 <source>Preparing synchronization...</source>
 <target>Preparando sincronização...</target>
 
@@ -1275,6 +1287,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Files %x have the same date but a different size!</source>
 <target>Os arquivos %x têm a mesma data mas tamanhos diferentes!</target>
 
+<source>Items differ in attributes only</source>
+<target>Os itens diferem apenas nos atributos</target>
+
 <source>Symbolic links %x have the same date but a different target.</source>
 <target>Os links simbólicos %x têm a mesma data mas um destino diferente.</target>
 
@@ -1290,9 +1305,6 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Both sides are equal</source>
 <target>Ambos os lados são iguais</target>
 
-<source>Items have different attributes</source>
-<target>Itens têm atributos diferentes</target>
-
 <source>Copy new item to left</source>
 <target>Copiar novo item para a esquerda</target>
 
@@ -1356,6 +1368,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Moving symbolic link %x to %y</source>
 <target>Movendo link simbólico %x para %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>Criando arquivo %x</target>
 
@@ -1402,19 +1417,16 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <target>Espaço em disco insuficiente em:</target>
 
 <source>Required:</source>
-<target>Requerido:</target>
+<target>Necessário:</target>
 
 <source>Available:</source>
 <target>Disponível:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>A Lixeira não está disponível para os seguintes caminhos! Os arquivos serão apagados permanentemente:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Uma pasta que é parte de múltiplos pares de pasta será modificada. Por favor, revise as configurações de sincronização.</target>
 
-<source>Processing folder pair:</source>
-<target>Processando par de pastas:</target>
+<source>Synchronizing folder pair:</source>
+<target>Sincronizando par de pastas:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Pasta de destino %x já existe.</target>
diff --git a/BUILD/Languages/romanian.lng b/BUILD/Languages/romanian.lng
index 9c0f7999..196d9393 100644
--- a/BUILD/Languages/romanian.lng
+++ b/BUILD/Languages/romanian.lng
@@ -10,6 +10,15 @@
 <source>Searching for folder %x...</source>
 <target>Caut dosarul %x...</target>
 
+<source>Items processed:</source>
+<target>Elemente Procesate:</target>
+
+<source>Items remaining:</source>
+<target>Elemente Rămase:</target>
+
+<source>Total time:</source>
+<target>Timp Total:</target>
+
 <source>Show in Explorer</source>
 <target>Arată în Exploratorul de File</target>
 
@@ -49,12 +58,12 @@
 <source>Create a batch job</source>
 <target>Creează o Sarcină Set [Batch Job]</target>
 
-<source>Synchronization settings</source>
-<target>Setările Sincronizării</target>
-
 <source>Comparison settings</source>
 <target>Setările Comparării</target>
 
+<source>Synchronization settings</source>
+<target>Setările Sincronizării</target>
+
 <source>About</source>
 <target>Despre</target>
 
@@ -76,27 +85,6 @@
 <source>Select time span</source>
 <target>Selectează intervalul de timp</target>
 
-<source>Show pop-up</source>
-<target>Arată un popîc</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Va fi afișată o fereastră popîc [popup] la erori sau avertizări</target>
-
-<source>Ignore errors</source>
-<target>Ignoră erorile</target>
-
-<source>Hide all error and warning messages</source>
-<target>Sînt ascunse toate mesajele de eroare și de avertizare</target>
-
-<source>Exit instantly</source>
-<target>Ieși imediat</target>
-
-<source>Abort synchronization immediately</source>
-<target>Abandonează imediat sincronizarea</target>
-
-<source>Browse</source>
-<target>Explorează</target>
-
 <source>Invalid command line:</source>
 <target>Linie de comandă nevalidă:</target>
 
@@ -238,7 +226,7 @@
 <source>&Open...</source>
 <target>&Deschide...</target>
 
-<source>Save &As...</source>
+<source>Save &as...</source>
 <target>Salvează c&a...</target>
 
 <source>&Quit</source>
@@ -280,6 +268,9 @@
 <source>Remove folder</source>
 <target>Înlătură Dosarul</target>
 
+<source>Browse</source>
+<target>Explorează</target>
+
 <source>Select a folder</source>
 <target>Selectează un Dosar</target>
 
@@ -312,8 +303,8 @@ Comanda este declanșată dacă:
 <source>Cancel</source>
 <target>Anulează</target>
 
-<source>(Build: %x)</source>
-<target>(Compilația: %x)</target>
+<source>Build: %x</source>
+<target>Compilația: %x</target>
 
 <source>All files</source>
 <target>Toate Filele</target>
@@ -333,9 +324,6 @@ Comanda este declanșată dacă:
 <source>A folder input field is empty.</source>
 <target>Un cîmp de introducere a dosarului este gol.</target>
 
-<source>Logging</source>
-<target>Jurnal</target>
-
 <source>File time and size</source>
 <target>Timpul și Mărimea Filelor</target>
 
@@ -357,21 +345,6 @@ Comanda este declanșată dacă:
 <source>FreeFileSync batch</source>
 <target>Set FreeFileSync</target>
 
-<source>Batch execution</source>
-<target>Execută Fila Set</target>
-
-<source>Items processed:</source>
-<target>Elemente Procesate:</target>
-
-<source>Items remaining:</source>
-<target>Elemente Rămase:</target>
-
-<source>Total time:</source>
-<target>Timp Total:</target>
-
-<source>Stop</source>
-<target>Oprește</target>
-
 <source>Synchronization aborted!</source>
 <target>Sincronizare abandonată!</target>
 
@@ -531,11 +504,11 @@ Comanda este declanșată dacă:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Ultimele configurații utilizate (apasă tasta DEL pentru a înlătura din listă)</target>
 
-<source>Hide excluded items</source>
-<target>Ascunde elementele excluse</target>
+<source>Show excluded items</source>
+<target>Arată itemurile excluse</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Ascunde elementele (file/dosare) filtrate sau excluse temporar</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Arată filele filtrate sau excluse temporar</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Numărul de file și dosare care vor fi create</target>
@@ -579,29 +552,86 @@ Comanda este declanșată dacă:
 <source>Right</source>
 <target>Dreapta</target>
 
-<source>Status feedback</source>
-<target>Afișarea Stării</target>
+<source>Error handling</source>
+<target>Gestionarea Erorilor</target>
+
+<source>Ignore</source>
+<target>Ignorare</target>
+
+<source>Hide all error and warning messages</source>
+<target>Mesajele de eroare și de avertizare nu sînt arătate</target>
+
+<source>Pop-up</source>
+<target>Popîc</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>În caz de erori sau avertizări este arătată o fereastră popîc [popup]</target>
+
+<source>Exit</source>
+<target>Ieși</target>
+
+<source>Abort synchronization on first error</source>
+<target>Abandonează sincronizarea la prima eroare</target>
+
+<source>On completion:</source>
+<target>La Terminare:</target>
 
 <source>Show progress dialog</source>
 <target>Arată progresul sincronizării</target>
 
-<source>Error handling</source>
-<target>Gestionarea Erorilor</target>
+<source>Generate log file</source>
+<target>Generează filă jurnal [log]</target>
+
+<source>Select folder to save log files</source>
+<target>Selectează dosarul cu filele jurnal</target>
 
-<source>Maximum number of log files:</source>
-<target>Numărul maxim de file jurnal:</target>
+<source>Limit</source>
+<target>Limită</target>
 
-<source>Select folder to save log files:</source>
-<target>Selectează dosarul unde să fie salvate filele jurnal [log files]</target>
+<source>Limit maximum number of log files</source>
+<target>Limitează numărul maxim de file jurnal</target>
 
 <source>Batch settings</source>
 <target>Setările Setului</target>
 
+<source>Compare by...</source>
+<target>Compară după:</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Filele sînt considerate identice dacă
+     - data și ora ultimei scrieri
+     - mărimea filelor
+sînt aceleași
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Filele sînt considerate identice dacă
+     - conținutul filelor
+este același
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Gestionarea Legăturilor Simbolice</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Selectează Varianta de Sincronizare:</target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identificare și propagare a modificărilor din ambele părți folosind o bază de date. Ștergerile, renumirile și conflictele sînt detectate automat</target>
+<target>Identificare și propagare a modificărilor din ambele părți folosind o bază de date. Ștergerile, renumirile și conflictele sînt detectate automat.</target>
 
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Conservare [backup] în oglindă a dosarului stîng. Dosarul drept e modificat pentru a fi identic după sincronizare cu cel stîng.</target>
@@ -615,8 +645,26 @@ Comanda este declanșată dacă:
 <source>Deletion handling</source>
 <target>Gestionarea Ștergerii</target>
 
-<source>On completion:</source>
-<target>La Terminare:</target>
+<source>Permanent</source>
+<target>Definitivă</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Filele sînt șterse sau suprascrise în mod definitiv, fără a mai putea fi recuperate</target>
+
+<source>Recycle Bin</source>
+<target>Reciclator</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Filele șterse sau suprascrise sînt puse în Reciclator [Recycle Bin], de unde pot fi recuperate la nevoie</target>
+
+<source>Versioning</source>
+<target>Versionare</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Filelor le este adăugat un marcaj de timp și apoi sînt mutate în dosarul specificat</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Limitează numărul maxim de versiuni per filă</target>
 
 <source>Configuration</source>
 <target>Configurație</target>
@@ -639,39 +687,6 @@ Comanda este declanșată dacă:
 <source>Conflict/item cannot be categorized</source>
 <target>Conflictul/elementul nu poate fi inclus într-o anumită categorie</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Compară după:</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Filele sînt considerate identice dacă
-     - data și ora ultimei scrieri
-     - mărimea filelor
-sînt aceleași
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Filele sînt considerate identice dacă
-     - conținutul filelor
-este același
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Gestionarea Legăturilor Simbolice (Simleg.)</target>
-
 <source>Synchronizing...</source>
 <target>Sincronizare Aflată în Curs...</target>
 
@@ -687,8 +702,8 @@ este același
 <source>Donate with PayPal</source>
 <target>Donează prin PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Mulțumiri pentru traducerea FreeFileSync:</target>
+<source>Many thanks for localization:</source>
+<target>Multe mulțumiri pentru localizare:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Opiniile și sugestiile despre program sînt binevenite</target>
@@ -705,9 +720,6 @@ este același
 <source>Published under the GNU General Public License</source>
 <target>Publicat sub licența GNU GPL</target>
 
-<source>Use Recycle Bin</source>
-<target>Mută în Reciclator</target>
-
 <source>Delete on both sides</source>
 <target>Șterge din ambele părți</target>
 
@@ -777,8 +789,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Statistics</source>
 <target>Statistici</target>
 
-<source>Do not show this dialog again</source>
-<target>Nu arăta acest dialog din nou</target>
+<source>Don't show this dialog again</source>
+<target>Nu arăta fereastra asta din nou</target>
 
 <source>Find what:</source>
 <target>Găsește Asta:</target>
@@ -861,11 +873,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Do you want to save changes to %x?</source>
 <target>Vrei să salvezi modificările făcute la %x?</target>
 
-<source>Save</source>
-<target>Salvează</target>
-
-<source>Don't Save</source>
-<target>Nu Salva</target>
+<source>Do&n't save</source>
+<target>&Nu salva</target>
 
 <source>Configuration loaded!</source>
 <target>Configurație deschisă !</target>
@@ -957,8 +966,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Show files that won't be copied</source>
 <target>Arată elementele (file/dosare) care nu vor fi copiate</target>
 
-<source>All directories in sync!</source>
-<target>Toate dosarele au fost sincronizate!</target>
+<source>All folders are in sync!</source>
+<target>Toate dosarele sînt sincronizate!</target>
 
 <source>Comma separated list</source>
 <target>Listă de elemente separate prin virgulă</target>
@@ -1051,6 +1060,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Pause</source>
 <target>Pauzează</target>
 
+<source>Logging</source>
+<target>Jurnal</target>
+
 <source>Cannot find %x</source>
 <target>Nu pot găsi %x</target>
 
@@ -1134,21 +1146,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Leave as unresolved conflict</source>
 <target>Lasă ca Conflict Nerezolvat</target>
 
-<source>Delete permanently</source>
-<target>Șterge definitiv</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Filele sînt șterse sau suprascrise în mod definitiv, fără a mai putea fi recuperate</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Filele șterse sau suprascrise sînt puse în Reciclator [Recycle Bin], de unde pot fi recuperate la nevoie</target>
-
-<source>Versioning</source>
-<target>Versionează</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Filele sînt mutate într-un subdosar cu marcaj de timp</target>
-
 <source>Files</source>
 <target>File</target>
 
@@ -1242,8 +1239,11 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Cannot copy file %x to %y.</source>
 <target>Nu pot copia fila %x în %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Nu pot citi dosarul %x.</target>
+<source>Cannot open directory %x.</source>
+<target>Nu pot deschide dosarul %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Nu pot enumera dosarul %x.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>A fost detectată o recursivitate infinită a dosarului.</target>
@@ -1269,6 +1269,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Baza de date existentă va fi făcută compatibilă cu versiunea softului și apoi va fi setat sensul implicit de sincronizare: Filele vechi vor fi suprascrise de cele noi.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Reciclatorul nu este disponibil pentru căile următoare! Filele vor fi deci șterse definitiv:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Poți ignora această eroare dacă vrei ca dosarul să fie considerat gol.</target>
 
@@ -1278,6 +1281,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <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>
 
+<source>Start comparison</source>
+<target>Pornește compararea</target>
+
 <source>Preparing synchronization...</source>
 <target>Pregătesc sincronizarea...</target>
 
@@ -1290,6 +1296,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Files %x have the same date but a different size!</source>
 <target>Filele %x au dată identică, dar mărime diferită!</target>
 
+<source>Items differ in attributes only</source>
+<target>Itemurile diferă doar prin atributele lor</target>
+
 <source>Symbolic links %x have the same date but a different target.</source>
 <target>Legăturile simbolice %x au aceeași dată, dar ținte diferite.</target>
 
@@ -1305,9 +1314,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Both sides are equal</source>
 <target>Ambele părți sînt identice</target>
 
-<source>Items have different attributes</source>
-<target>Elementele au atribute diferite</target>
-
 <source>Copy new item to left</source>
 <target>Copiază elementul nou în stînga</target>
 
@@ -1422,14 +1428,11 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Available:</source>
 <target>Disponibil:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Reciclatorul nu este disponibil pentru căile următoare! Filele vor fi deci șterse definitiv:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Va fi modificat un dosar care face parte din mai multe perechi de dosare! Reverifică setările de sincronizare!</target>
 
-<source>Processing folder pair:</source>
-<target>Procesez perechea de dosare:</target>
+<source>Synchronizing folder pair:</source>
+<target>Sincronizez perechea de dosare:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Dosarul țintă %x există deja.</target>
diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng
index 2bf43563..59740f22 100644
--- a/BUILD/Languages/russian.lng
+++ b/BUILD/Languages/russian.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>Поиск папки %x...</target>
 
-<source>Batch execution</source>
-<target>Выполнение пакетного задания</target>
-
 <source>Items processed:</source>
 <target>Элементов обработано:</target>
 
@@ -61,12 +58,12 @@
 <source>Create a batch job</source>
 <target>Создать пакетное задание</target>
 
-<source>Synchronization settings</source>
-<target>Настройки синхронизации</target>
-
 <source>Comparison settings</source>
 <target>Настройки сравнения</target>
 
+<source>Synchronization settings</source>
+<target>Настройки синхронизации</target>
+
 <source>About</source>
 <target>О программе</target>
 
@@ -88,27 +85,6 @@
 <source>Select time span</source>
 <target>Выберите промежуток времени</target>
 
-<source>Show pop-up</source>
-<target>Показывать всплывающие окна</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Показывать всплывающие окна при ошибках и замечаниях</target>
-
-<source>Ignore errors</source>
-<target>Игнорировать ошибки</target>
-
-<source>Hide all error and warning messages</source>
-<target>Скрывать все ошибки и сообщения с предупреждениями</target>
-
-<source>Exit instantly</source>
-<target>Выйти немедленно</target>
-
-<source>Abort synchronization immediately</source>
-<target>Отменить синхронизацию немедленно</target>
-
-<source>Browse</source>
-<target>Обзор</target>
-
 <source>Invalid command line:</source>
 <target>Неверная командная строка:</target>
 
@@ -250,7 +226,7 @@
 <source>&Open...</source>
 <target>&Открыть...</target>
 
-<source>Save &As...</source>
+<source>Save &as...</source>
 <target>Сохранить &как...</target>
 
 <source>&Quit</source>
@@ -266,7 +242,7 @@
 <target>&О программе</target>
 
 <source>&Help</source>
-<target>&Помощь</target>
+<target>П&омощь</target>
 
 <source>Usage:</source>
 <target>Инструкция:</target>
@@ -292,6 +268,9 @@
 <source>Remove folder</source>
 <target>Удалить папку</target>
 
+<source>Browse</source>
+<target>Обзор</target>
+
 <source>Select a folder</source>
 <target>Выбрать папку</target>
 
@@ -324,8 +303,8 @@ The command is triggered if:
 <source>Cancel</source>
 <target>Отмена</target>
 
-<source>(Build: %x)</source>
-<target>(сборка %x)</target>
+<source>Build: %x</source>
+<target>сборка %x</target>
 
 <source>All files</source>
 <target>Все файлы</target>
@@ -345,9 +324,6 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>Поле ввода папки пустое.</target>
 
-<source>Logging</source>
-<target>Лог-файлы</target>
-
 <source>File time and size</source>
 <target>Дата и размер файла</target>
 
@@ -466,10 +442,10 @@ The command is triggered if:
 <target>Гибернация</target>
 
 <source>1. &Compare</source>
-<target>1. &Сравнить</target>
+<target>1. С&равнить</target>
 
 <source>2. &Synchronize</source>
-<target>2. &Синхронизировать</target>
+<target>2. С&инхронизировать</target>
 
 <source>&New</source>
 <target>&Новая</target>
@@ -531,11 +507,11 @@ The command is triggered if:
 (нажмите DEL для удаления из списка)
 </target>
 
-<source>Hide excluded items</source>
-<target>Скрыть исключенные элементы</target>
+<source>Show excluded items</source>
+<target>Показать исключенные элементы</target>
 
-<source>Hide filtered or temporarily excluded files</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>
@@ -579,24 +555,76 @@ The command is triggered if:
 <source>Right</source>
 <target>Справа</target>
 
-<source>Status feedback</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>On completion:</source>
+<target>По окончании работы</target>
 
 <source>Show progress dialog</source>
-<target>Показать диалог (окно) прогресса</target>
+<target>Показать окно прогресса</target>
 
-<source>Error handling</source>
-<target>Обработка ошибок</target>
+<source>Generate log file</source>
+<target>Создавать лог-файлы</target>
 
-<source>Maximum number of log files:</source>
-<target>Максимальное количество лог-файлов:</target>
+<source>Select folder to save log files</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>Batch settings</source>
 <target>Настройки пакетного задания</target>
 
+<source>Compare by...</source>
+<target>Критерии сравнения</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Файлы считаются равными, если одинаковые
+ - дата и время последнего изменения
+ - размер файла
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>Файлы считаются равными, если содержание файлов одинаковое</target>
+
+<source>Symbolic Link handling</source>
+<target>Обращение к символьной ссылке</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Варианты синхронизации</target>
 
@@ -615,8 +643,26 @@ The command is triggered if:
 <source>Deletion handling</source>
 <target>Настройки удаления</target>
 
-<source>On completion:</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 when deleting or overwriting files</source>
+<target>Использовать "Корзину" при удалении или перезаписи файлов</target>
+
+<source>Versioning</source>
+<target>Переместить старые версии файлов в заданную папку</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Переместить файлы с отметками времени в указанную папку</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Ограничить максимальное количество версий на файл</target>
 
 <source>Configuration</source>
 <target>Настройки</target>
@@ -639,34 +685,6 @@ The command is triggered if:
 <source>Conflict/item cannot be categorized</source>
 <target>Конфликт/элемент не могут быть отнесены к какой-либо категории</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Критерии сравнения</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Файлы считаются равными, если одинаковые
- - дата и время последнего изменения
- - размер файла
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>Файлы считаются равными, если содержание файлов одинаковое</target>
-
-<source>Symbolic Link handling</source>
-<target>Обращение к символьной ссылке</target>
-
 <source>Synchronizing...</source>
 <target>Синхронизация...</target>
 
@@ -682,8 +700,8 @@ is the same
 <source>Donate with PayPal</source>
 <target>Отправить деньги через PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Большое спасибо за перевод FreeFileSync:</target>
+<source>Many thanks for localization:</source>
+<target>Большое спасибо за перевод:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Замечания и предложения приветствуются</target>
@@ -700,14 +718,11 @@ is the same
 <source>Published under the GNU General Public License</source>
 <target>Издается под лицензией GNU General Public License</target>
 
-<source>Use Recycle Bin</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>
+<target>Удалить с обеих сторон, даже если файл выделен только на одной стороне</target>
 
 <source>
 Only files that match all filter settings will be synchronized.
@@ -772,7 +787,7 @@ Note: File names must be relative to base directories!
 <source>Statistics</source>
 <target>Статистика</target>
 
-<source>Do not show this dialog again</source>
+<source>Don't show this dialog again</source>
 <target>Больше не показывать это окно</target>
 
 <source>Find what:</source>
@@ -856,11 +871,8 @@ Note: File names must be relative to base directories!
 <source>Do you want to save changes to %x?</source>
 <target>Вы хотите сохранить изменения в %x?</target>
 
-<source>Save</source>
-<target>Сохранить</target>
-
-<source>Don't Save</source>
-<target>Не сохранять</target>
+<source>Do&n't save</source>
+<target>&Не сохранять</target>
 
 <source>Configuration loaded!</source>
 <target>Настройки синхронизации загружены!</target>
@@ -952,7 +964,7 @@ Note: File names must be relative to base directories!
 <source>Show files that won't be copied</source>
 <target>Показать файлы, которые не будут скопированы</target>
 
-<source>All directories in sync!</source>
+<source>All folders are in sync!</source>
 <target>Все папки синхронизированы!</target>
 
 <source>Comma separated list</source>
@@ -1046,6 +1058,9 @@ Note: File names must be relative to base directories!
 <source>Pause</source>
 <target>Пауза</target>
 
+<source>Logging</source>
+<target>Лог-файлы</target>
+
 <source>Cannot find %x</source>
 <target>Невозможно найти %x</target>
 
@@ -1132,21 +1147,6 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>Оставить как нерешенный конфликт</target>
 
-<source>Delete permanently</source>
-<target>Удалять, не помещая в "Корзину"</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Удалять или перезаписать файлы, не помещая в "Корзину"</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Использовать "Корзину" при удалении или перезаписи файлов</target>
-
-<source>Versioning</source>
-<target>Перемещать старые версии файлов в заданную папку</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Перемещать файлы в заданную папку (можно создавать архивные версии удаленных файлов)</target>
-
 <source>Files</source>
 <target>Файлы</target>
 
@@ -1240,8 +1240,11 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>Не удается скопировать файл %x в %y.</target>
 
-<source>Cannot read directory %x.</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>
@@ -1270,6 +1273,9 @@ Note: File names must be relative to base directories!
 Старые файлы будут заменены более новыми файлами.
 </target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Для этого пути "Корзина" не доступна! Файлы будут удалены безвозвратно:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Вы можете проигнорировать ошибку, приняв папку за пустую.</target>
 
@@ -1279,6 +1285,9 @@ Note: File names must be relative to base directories!
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Зависимые папки! Будьте внимательны при настройке правил синхронизации:</target>
 
+<source>Start comparison</source>
+<target>Начать сравнение</target>
+
 <source>Preparing synchronization...</source>
 <target>Подготовка к синхронизации...</target>
 
@@ -1291,6 +1300,9 @@ Note: File names must be relative to base directories!
 <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>Symbolic links %x have the same date but a different target.</source>
 <target>Символьная ссылка %x имеет ту же дату, но отличающуюся цель.</target>
 
@@ -1306,9 +1318,6 @@ Note: File names must be relative to base directories!
 <source>Both sides are equal</source>
 <target>Обе стороны равны</target>
 
-<source>Items have different attributes</source>
-<target>Элементы имеют разные атрибуты</target>
-
 <source>Copy new item to left</source>
 <target>Скопировать новый элемент налево</target>
 
@@ -1423,14 +1432,11 @@ Note: File names must be relative to base directories!
 <source>Available:</source>
 <target>Доступно:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Для этого пути "Корзина" не доступна! Файлы будут удалены безвозвратно:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Папка, входящая в несколько пар папок, будет изменена. Пожалуйста, проверьте настройки синхронизации.</target>
 
-<source>Processing folder pair:</source>
-<target>Обработка пары папок:</target>
+<source>Synchronizing folder pair:</source>
+<target>Синхронизация пары папок:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Целевая папка %x уже существует.</target>
diff --git a/BUILD/Languages/scottish_gaelic.lng b/BUILD/Languages/scottish_gaelic.lng
index d5f01eef..24551a41 100644
--- a/BUILD/Languages/scottish_gaelic.lng
+++ b/BUILD/Languages/scottish_gaelic.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>A' lorg a' phasgain %x...</target>
 
-<source>Batch execution</source>
-<target>Cur an gnìomh batch</target>
-
 <source>Items processed:</source>
 <target>Nithean a tha deiseil:</target>
 
@@ -61,12 +58,12 @@
 <source>Create a batch job</source>
 <target>Cruthaich batch job</target>
 
-<source>Synchronization settings</source>
-<target>Roghainnean an t-sioncronachaidh</target>
-
 <source>Comparison settings</source>
 <target>Roghainnean a' choimeasaidh</target>
 
+<source>Synchronization settings</source>
+<target>Roghainnean an t-sioncronachaidh</target>
+
 <source>About</source>
 <target>Mu dheidhinn</target>
 
@@ -88,27 +85,6 @@
 <source>Select time span</source>
 <target>Tagh an raon-ama</target>
 
-<source>Show pop-up</source>
-<target>Seall na priob-uinneagan</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Seall priob-uinneagan a thaobh mhearachdan no rabhaidhean</target>
-
-<source>Ignore errors</source>
-<target>Leig seachad mearachdan</target>
-
-<source>Hide all error and warning messages</source>
-<target>Falaich gach teachdaireachd mu mhearachdan no rabhaidhean</target>
-
-<source>Exit instantly</source>
-<target>Fàg sa bhad</target>
-
-<source>Abort synchronization immediately</source>
-<target>Sguir dhen t-sioncronachadh sa bhad</target>
-
-<source>Browse</source>
-<target>Rùraich</target>
-
 <source>Invalid command line:</source>
 <target>Loidhne-àithne mhì-dhligheach:</target>
 
@@ -253,8 +229,8 @@
 <source>&Open...</source>
 <target>F&osgail...</target>
 
-<source>Save &As...</source>
-<target>&Sàbhail mar...</target>
+<source>Save &as...</source>
+<target>Sàbhail &mar...</target>
 
 <source>&Quit</source>
 <target>&Fàg</target>
@@ -295,6 +271,9 @@
 <source>Remove folder</source>
 <target>Thoir am pasgan air falbh</target>
 
+<source>Browse</source>
+<target>Rùraich</target>
+
 <source>Select a folder</source>
 <target>Tagh pasgan</target>
 
@@ -327,8 +306,8 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Cancel</source>
 <target>Sguir dheth</target>
 
-<source>(Build: %x)</source>
-<target>(Build: %x)</target>
+<source>Build: %x</source>
+<target>Build: %x</target>
 
 <source>All files</source>
 <target>Gach faidhle</target>
@@ -348,9 +327,6 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>A folder input field is empty.</source>
 <target>Tha co-dhiù aon raon pasgain ann a tha falamh.</target>
 
-<source>Logging</source>
-<target>Logadh</target>
-
 <source>File time and size</source>
 <target>Ceann-là is meud</target>
 
@@ -531,11 +507,11 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>An rèiteachadh mu dheireadh a chaidh a chleachdadh (brùth DEL gus rudan a thoirt air falbh on liosta)</target>
 
-<source>Hide excluded items</source>
-<target>Falaich rudan a chaidh an dùnadh às</target>
+<source>Show excluded items</source>
+<target>Seall an fheadhainn a tha 'ga dhùnadh a-mach</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Falaich faidhlichean a chaidh a chriathradh às no a chaidh a dhùnadh às gu sealach</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Seall faidhlichean a tha 'gan dùnadh a-mach no air an criathradh a-mach an-dràsta fhèin</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Àireamh nam faidhle 's nam pasgan a thèid a chruthachadh</target>
@@ -579,24 +555,80 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Right</source>
 <target>Deas</target>
 
-<source>Status feedback</source>
-<target>Fiosrachadh mun staid</target>
+<source>Error handling</source>
+<target>Làimhseachadh mhearachdan</target>
+
+<source>Ignore</source>
+<target>Leig seachad</target>
+
+<source>Hide all error and warning messages</source>
+<target>Falaich gach teachdaireachd mu mhearachdan no rabhaidhean</target>
+
+<source>Pop-up</source>
+<target>Priob-uinneag</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Seall priob-uinneagan a thaobh mhearachdan no rabhaidhean</target>
+
+<source>Exit</source>
+<target>Fàg an-seo</target>
+
+<source>Abort synchronization on first error</source>
+<target>Sguir dhen t-sioncronachadh nuair a thachras a' chiad mhearachd</target>
+
+<source>On completion:</source>
+<target>Nuair a bhios e deiseil:</target>
 
 <source>Show progress dialog</source>
 <target>Seall còmhradh an adhartais</target>
 
-<source>Error handling</source>
-<target>Làimhseachadh mhearachdan</target>
+<source>Generate log file</source>
+<target>Gin faidhle an loga</target>
 
-<source>Maximum number of log files:</source>
-<target>An àireamh as motha de dh'fhaidhlichean loga a tha ceadaichte:</target>
+<source>Select folder to save log files</source>
+<target>Tagh pasgan far an dèid faidhlichean an loga a shàbhaladh</target>
 
-<source>Select folder to save log files:</source>
-<target>Tagh am pasgan far an dèid na logaichean a shàbhaladh:</target>
+<source>Limit</source>
+<target>Cuingich</target>
+
+<source>Limit maximum number of log files</source>
+<target>Cuingich an àireamh as motha de dh'fhaidhlichean an loga</target>
 
 <source>Batch settings</source>
 <target>Roghainnean a' batch</target>
 
+<source>Compare by...</source>
+<target>Dèan coimeas a-rèir...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Bidh dà fhaidhle co-ionnann 'nar beachd-sa
+     - ma tha àm is ceann-là an sgrìobhaidh mu dheireadh
+     - ma tha am meud
+co-ionnann
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Bidh dà fhaidhle co-ionnann 'nar beachd-sa
+     - susbaint an dà fhaidhle co-ionnann
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Làimhseachadh nan symbolic links</target>
+
+<source>OK</source>
+<target>Ceart ma-thà</target>
+
 <source>Select variant:</source>
 <target>Tagh seòrsa:</target>
 
@@ -615,8 +647,26 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Deletion handling</source>
 <target>Mar a dhèiligear ri sguabadh às</target>
 
-<source>On completion:</source>
-<target>Nuair a bhios e deiseil:</target>
+<source>Permanent</source>
+<target>Buan</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Sguab às no sgrìobh thairis air faidhlichean gu buan</target>
+
+<source>Recycle Bin</source>
+<target>Am biona ath-chuairteachaidh</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Cleachd am biona ath-chuairteachaidh nuair a thèid faidhlichean a sguabadh às no ma thèid sgrìobhadh thairis orra</target>
+
+<source>Versioning</source>
+<target>Versioning</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Gluais faidhlichean air a bheil stampa ama do phasgain shònraichte</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Cuingich an àireamh as motha de thionndaidhean airson gach faidhle</target>
 
 <source>Configuration</source>
 <target>Rèiteachadh</target>
@@ -639,38 +689,6 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Conflict/item cannot be categorized</source>
 <target>Tha còmhstri/nì ann nach urrainn dhuinn aithneachadh</target>
 
-<source>OK</source>
-<target>Ceart ma-thà</target>
-
-<source>Compare by...</source>
-<target>Dèan coimeas a-rèir...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Bidh dà fhaidhle co-ionnann 'nar beachd-sa
-     - ma tha àm is ceann-là an sgrìobhaidh mu dheireadh
-     - ma tha am meud
-co-ionnann
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Bidh dà fhaidhle co-ionnann 'nar beachd-sa
-     - susbaint an dà fhaidhle co-ionnann
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Làimhseachadh nan symbolic links</target>
-
 <source>Synchronizing...</source>
 <target>A' sioncronachadh...</target>
 
@@ -686,8 +704,8 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 <source>Donate with PayPal</source>
 <target>Nach doir sibh tabhartas le PayPal?</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Taing mhòr dha na daoine a leanas a rinn eadar-theangachadh air FreeFileSync:</target>
+<source>Many thanks for localization:</source>
+<target>Tha sinn fada an comain nan daoine a leanas airson eadar-theangachadh:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Tha sinn a' cur fàilte mhòr air beachd is moladh sam bith</target>
@@ -704,9 +722,6 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 <source>Published under the GNU General Public License</source>
 <target>Air fhoillseachadh fo GNU General Public License</target>
 
-<source>Use Recycle Bin</source>
-<target>Cleachd am biona ath-chuairteachaidh</target>
-
 <source>Delete on both sides</source>
 <target>Sguab às air an dà thaobh</target>
 
@@ -776,7 +791,7 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Statistics</source>
 <target>Stats</target>
 
-<source>Do not show this dialog again</source>
+<source>Don't show this dialog again</source>
 <target>Na seall an còmhradh seo a-rithist</target>
 
 <source>Find what:</source>
@@ -860,11 +875,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Do you want to save changes to %x?</source>
 <target>An sàbhail sinn dhut na h-atharraichean air %x?</target>
 
-<source>Save</source>
-<target>Sàbhailibh</target>
-
-<source>Don't Save</source>
-<target>Na sàbhailibh</target>
+<source>Do&n't save</source>
+<target>&Na sàbhail</target>
 
 <source>Configuration loaded!</source>
 <target>Chaidh an rèiteachadh a luchdadh!</target>
@@ -956,8 +968,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Show files that won't be copied</source>
 <target>Seall faidhlichean nach dèid lethbhreac a dhèanamh dhiubh</target>
 
-<source>All directories in sync!</source>
-<target>Tha gach eòlaire air sioncronachadh!</target>
+<source>All folders are in sync!</source>
+<target>Tha gach pasgan air a shioncronachadh!</target>
 
 <source>Comma separated list</source>
 <target>Liosta air a sgaradh le cromagan</target>
@@ -1054,6 +1066,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Pause</source>
 <target>Cuir 'na stad</target>
 
+<source>Logging</source>
+<target>Logadh</target>
+
 <source>Cannot find %x</source>
 <target>Chan urrainn dhuinn %x a lorg.</target>
 
@@ -1139,21 +1154,6 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Leave as unresolved conflict</source>
 <target>Fàg mar còmhstri gun rèiteachadh</target>
 
-<source>Delete permanently</source>
-<target>Sguab às gu buan</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Sguab às no sgrìobh thairis air faidhlichean gu buan</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Cleachd am biona ath-chuairteachaidh nuair a thèid faidhlichean a sguabadh às no ma thèid sgrìobhadh thairis orra</target>
-
-<source>Versioning</source>
-<target>Versioning</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Gluais na faidhlichean dha fo-phasgan air a bheil stampa-ama</target>
-
 <source>Files</source>
 <target>Faidhlichean</target>
 
@@ -1250,8 +1250,11 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Cannot copy file %x to %y.</source>
 <target>Cha ghabh lethbhreac an fhaidhle %x a chur gu %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Cha ghabh an t-eòlaire %x a leughadh.</target>
+<source>Cannot open directory %x.</source>
+<target>Cha ghabh an t-eòlaire %x fhosgladh.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Cha ghabh an t-eòlaire %x àireamhachadh.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Mhothaich sinn dha ath-chùrsadh eòlaire gun chrìoch.</target>
@@ -1289,6 +1292,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Tha eòlairean an eisimeil a chèile! Bi faiceallach nuair a shuidhicheas tu na riaghailtean sioncronachaidh:</target>
 
+<source>Start comparison</source>
+<target>Dèan coimeas</target>
+
 <source>Preparing synchronization...</source>
 <target>Ag ullachadh an t-sioncronachaidh...</target>
 
@@ -1301,8 +1307,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Files %x have the same date but a different size!</source>
 <target>Tha an dearbh cheann-là aig na faidhlichean %x ach chan eil am meud co-ionnann!</target>
 
-<source>Items have different attributes</source>
-<target>Tha diofar buadhan aig na nithean</target>
+<source>Items differ in attributes only</source>
+<target>Chan eil diofar eatarra ach a thaobh an cuid bhuadhan</target>
 
 <source>Symbolic links %x have the same date but a different target.</source>
 <target>Tha an dearbh cheann-là aig na symbolic links %x ach targaidean eadar-dhealaichte.</target>
@@ -1436,8 +1442,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <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>Processing folder pair:</source>
-<target>A' pròiseasadh a' phaidhir de phasgain:</target>
+<source>Synchronizing folder pair:</source>
+<target>A' sioncronachadh paidhir nam pasgan:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Tha am pasgan-uidhe %x ann mu thràth.</target>
diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index 9fa57752..e831aeeb 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -10,6 +10,15 @@
 <source>Searching for folder %x...</source>
 <target>Iskanje mape %x...</target>
 
+<source>Items processed:</source>
+<target>Obdelanih elementov:</target>
+
+<source>Items remaining:</source>
+<target>Preostalih elementov:</target>
+
+<source>Total time:</source>
+<target>Celoten čas:</target>
+
 <source>Show in Explorer</source>
 <target>Prikaži v Raziskovalcu</target>
 
@@ -49,12 +58,12 @@
 <source>Create a batch job</source>
 <target>Ustvari paketno opravilo</target>
 
-<source>Synchronization settings</source>
-<target>Nastavitve sinhronizacije</target>
-
 <source>Comparison settings</source>
 <target>Nastavitve primerjanja</target>
 
+<source>Synchronization settings</source>
+<target>Nastavitve sinhronizacije</target>
+
 <source>About</source>
 <target>O programu(1)</target>
 
@@ -76,27 +85,6 @@
 <source>Select time span</source>
 <target>Izberite časovni okvir</target>
 
-<source>Show pop-up</source>
-<target>Prikaži pojavno okno</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Prikaži pojavne napaka ali opozorila</target>
-
-<source>Ignore errors</source>
-<target>Ignoriraj napake</target>
-
-<source>Hide all error and warning messages</source>
-<target>Skrij vsa obvestila o napakah in opozorilih</target>
-
-<source>Exit instantly</source>
-<target>Zapusti v trenutku</target>
-
-<source>Abort synchronization immediately</source>
-<target>Takoj prekini sinhronizacijo</target>
-
-<source>Browse</source>
-<target>Brskaj</target>
-
 <source>Invalid command line:</source>
 <target>Napačna ukazna vrstica:</target>
 
@@ -241,7 +229,7 @@
 <source>&Open...</source>
 <target>&Odpri...</target>
 
-<source>Save &As...</source>
+<source>Save &as...</source>
 <target>Shr&ani kot...</target>
 
 <source>&Quit</source>
@@ -283,6 +271,9 @@
 <source>Remove folder</source>
 <target>Odstrani v mapo</target>
 
+<source>Browse</source>
+<target>Brskaj</target>
+
 <source>Select a folder</source>
 <target>Izberite mapo</target>
 
@@ -315,8 +306,8 @@ Ukaz se sproži če:
 <source>Cancel</source>
 <target>Prekliči</target>
 
-<source>(Build: %x)</source>
-<target>(Izgradnja: %x)</target>
+<source>Build: %x</source>
+<target>Izgradnja: %x</target>
 
 <source>All files</source>
 <target>Vse datoteke</target>
@@ -336,9 +327,6 @@ Ukaz se sproži če:
 <source>A folder input field is empty.</source>
 <target>Vnosno polje za mapo je prazno.</target>
 
-<source>Logging</source>
-<target>Beleženje</target>
-
 <source>File time and size</source>
 <target>Čas in velikost datoteke</target>
 
@@ -360,21 +348,6 @@ Ukaz se sproži če:
 <source>FreeFileSync batch</source>
 <target>FreeFileSync paket</target>
 
-<source>Batch execution</source>
-<target>Paketno izvajanje</target>
-
-<source>Items processed:</source>
-<target>Obdelanih elementov:</target>
-
-<source>Items remaining:</source>
-<target>Preostalih elementov:</target>
-
-<source>Total time:</source>
-<target>Celoten čas:</target>
-
-<source>Stop</source>
-<target>Ustavi</target>
-
 <source>Synchronization aborted!</source>
 <target>Sinhronizacija prekinjena!</target>
 
@@ -534,11 +507,11 @@ Ukaz se sproži če:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Zadnje uporabljene konfiguracije (pritisite DEL za odstranitev s seznama)</target>
 
-<source>Hide excluded items</source>
-<target>Skrij izključene predmete</target>
+<source>Show excluded items</source>
+<target>Pokaži izključene elemente</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Skrij filtrirane ali začasno izključene datoteke</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Pokaži filtrirane ali začasno izključene datoteke</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Število datotek in map, ki bodo ustvarjene</target>
@@ -582,24 +555,81 @@ Ukaz se sproži če:
 <source>Right</source>
 <target>Desno</target>
 
-<source>Status feedback</source>
-<target>Povratne informacije statusa</target>
+<source>Error handling</source>
+<target>Napaka pri obravnavanju</target>
+
+<source>Ignore</source>
+<target>Ignoriraj</target>
+
+<source>Hide all error and warning messages</source>
+<target>Skrij vsa obvestila o napakah in opozorilih</target>
+
+<source>Pop-up</source>
+<target>Pogovorno okno</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Prikaži pojavne napaka ali opozorila</target>
+
+<source>Exit</source>
+<target>Izhod</target>
+
+<source>Abort synchronization on first error</source>
+<target>Prekini sinhronizacijo ob prvi napaki</target>
+
+<source>On completion:</source>
+<target>Ob zaključku:</target>
 
 <source>Show progress dialog</source>
 <target>Prikazuj pogovorno okno z napredkom</target>
 
-<source>Error handling</source>
-<target>Napaka pri obravnavanju</target>
+<source>Generate log file</source>
+<target>Ustvari datoteko beleženja</target>
 
-<source>Maximum number of log files:</source>
-<target>Maksimalno število datotek beleženja:</target>
+<source>Select folder to save log files</source>
+<target>Izberite mapo za shranjevanje datotek beleženja</target>
 
-<source>Select folder to save log files:</source>
-<target>Izberite mapo za shranjevanje datotek beleženja:</target>
+<source>Limit</source>
+<target>Omejitev</target>
+
+<source>Limit maximum number of log files</source>
+<target>Omeji maksimalno število datotek beleženja</target>
 
 <source>Batch settings</source>
 <target>Paketne nastavitve</target>
 
+<source>Compare by...</source>
+<target>Primerjaj po...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Datoteki sta enaki, če sta
+     - zadnji čas zapisa in datum
+     - velikost datoteke
+enaka
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Datoteki sta enaki, če
+     - je vsebina datoteke
+enaka
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Rokovanje s simboličnimi povezavami</target>
+
+<source>OK</source>
+<target>V redu</target>
+
 <source>Select variant:</source>
 <target>Izberite varianto:</target>
 
@@ -618,8 +648,26 @@ Ukaz se sproži če:
 <source>Deletion handling</source>
 <target>Ravnanje pri brisanju</target>
 
-<source>On completion:</source>
-<target>Ob zaključku:</target>
+<source>Permanent</source>
+<target>Trajno</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Trajno izbriši ali prepiši datoteke</target>
+
+<source>Recycle Bin</source>
+<target>Koš</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Uporabi Koš pri brisanju ali prepisovanju datotek</target>
+
+<source>Versioning</source>
+<target>Ustvarjanje različič</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Premakni časovno-označene datoteke v določeno mapo</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Omejitev maksimalnega števila različic na datoteko</target>
 
 <source>Configuration</source>
 <target>Konfiguracija</target>
@@ -642,39 +690,6 @@ Ukaz se sproži če:
 <source>Conflict/item cannot be categorized</source>
 <target>Spor/element ne more biti kategoriziran</target>
 
-<source>OK</source>
-<target>V redu</target>
-
-<source>Compare by...</source>
-<target>Primerjaj po...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Datoteki sta enaki, če sta
-     - zadnji čas zapisa in datum
-     - velikost datoteke
-enaka
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Datoteki sta enaki, če
-     - je vsebina datoteke
-enaka
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Rokovanje s simboličnimi povezavami</target>
-
 <source>Synchronizing...</source>
 <target>Sinhroniziram...</target>
 
@@ -690,8 +705,8 @@ enaka
 <source>Donate with PayPal</source>
 <target>Doniraj s PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Zahvale za prevod FreeFileSync gredo:</target>
+<source>Many thanks for localization:</source>
+<target>Zahvale za lokalizacijo:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Povratne informacije in predlogi so dobrodošli</target>
@@ -708,9 +723,6 @@ enaka
 <source>Published under the GNU General Public License</source>
 <target>Objavljeno pod licenco GNU General Public</target>
 
-<source>Use Recycle Bin</source>
-<target>Uporabi Koš</target>
-
 <source>Delete on both sides</source>
 <target>Izbriši na obeh straneh</target>
 
@@ -780,8 +792,8 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Statistics</source>
 <target>Statistika</target>
 
-<source>Do not show this dialog again</source>
-<target>Ne prikaži več tega pogovornega okna</target>
+<source>Don't show this dialog again</source>
+<target>Ne prikazuj več tega pogovora</target>
 
 <source>Find what:</source>
 <target>Najdi kaj</target>
@@ -864,11 +876,8 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Do you want to save changes to %x?</source>
 <target>Ali želite shraniti spremembe v %x?</target>
 
-<source>Save</source>
-<target>Shrani</target>
-
-<source>Don't Save</source>
-<target>Ne shrani</target>
+<source>Do&n't save</source>
+<target>Ne shra&ni</target>
 
 <source>Configuration loaded!</source>
 <target>Konfiguracija naložena!</target>
@@ -960,8 +969,8 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Show files that won't be copied</source>
 <target>Prikaži datoteke, ki ne bodo kopirane</target>
 
-<source>All directories in sync!</source>
-<target>Vsi imeniki so sinhronizirani!</target>
+<source>All folders are in sync!</source>
+<target>Vse mape so sinhronizirane!</target>
 
 <source>Comma separated list</source>
 <target>Seznam ločen z vejico</target>
@@ -1058,6 +1067,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Pause</source>
 <target>Premor</target>
 
+<source>Logging</source>
+<target>Beleženje</target>
+
 <source>Cannot find %x</source>
 <target>Ne najdem %x</target>
 
@@ -1143,21 +1155,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Leave as unresolved conflict</source>
 <target>Pusti kot nerešeni spor</target>
 
-<source>Delete permanently</source>
-<target>Trajno izbriši</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Trajno izbriši ali prepiši datoteke</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Uporabi Koš pri brisanju ali prepisovanju datotek</target>
-
-<source>Versioning</source>
-<target>Ustvarjanje različič</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Premakni datoteke v časovno-ožigosano podmapo</target>
-
 <source>Files</source>
 <target>Datoteke</target>
 
@@ -1254,8 +1251,11 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Cannot copy file %x to %y.</source>
 <target>Ne morem kopirati datoteke %x v %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Ne morem prebrati imenika %x.</target>
+<source>Cannot open directory %x.</source>
+<target>Ne morem odpreti imenika %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Ne morem oštevilčiti imenika %x.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Zaznana neskončna imeniška rekurzija</target>
@@ -1281,6 +1281,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Nastavljanje privzetih smeri sinhronizacije: Stare datoteke bodo prepisane z novimi datotekami.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Koš ni na voljo za naslednje poti! Namesto tega bodo datoteke trajno izbrisane:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>To napako, da upoštevate mapo kot prazno, lahko ignorirate</target>
 
@@ -1290,6 +1293,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Imeniki so v odvisnosti! Bodite pozorni, ko nastavljate sinhronizacijska pravila:</target>
 
+<source>Start comparison</source>
+<target>Začni primerjavo</target>
+
 <source>Preparing synchronization...</source>
 <target>Pripravljam sinhronizacijo...</target>
 
@@ -1302,6 +1308,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Files %x have the same date but a different size!</source>
 <target>Datoteki %x imata enak datum ampak različno velikost!</target>
 
+<source>Items differ in attributes only</source>
+<target>Elementi se razlikujejo samo v atributih</target>
+
 <source>Symbolic links %x have the same date but a different target.</source>
 <target>Simbolične povezave %x imajo isti datum, vendar različno tarčo.</target>
 
@@ -1317,9 +1326,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Both sides are equal</source>
 <target>Obe strani sta enaki</target>
 
-<source>Items have different attributes</source>
-<target>Elementi imajo različne atribute</target>
-
 <source>Copy new item to left</source>
 <target>Kopiraj nov element na levo</target>
 
@@ -1434,14 +1440,11 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Available:</source>
 <target>Na voljo:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Koš ni na voljo za naslednje poti! Namesto tega bodo datoteke trajno izbrisane:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Spremenjena bo mapa, ki je del večkratnih parov map. Prosim preglejte nastavitve sinhronizacije.</target>
 
-<source>Processing folder pair:</source>
-<target>Obdelujem par map:</target>
+<source>Synchronizing folder pair:</source>
+<target>Sinhroniziram par map:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Ciljna mapa %x že obstaja.</target>
diff --git a/BUILD/Languages/spanish.lng b/BUILD/Languages/spanish.lng
index fa14ba86..7d310860 100644
--- a/BUILD/Languages/spanish.lng
+++ b/BUILD/Languages/spanish.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>Buscando carpeta %x...</target>
 
-<source>Batch execution</source>
-<target>Ejecución por lotes</target>
-
 <source>Items processed:</source>
 <target>Elementos procesados:</target>
 
@@ -34,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Solicitud de aborto: Esperando a que la operación actual finalice...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronización Automática</target>
 
@@ -61,12 +61,12 @@
 <source>Create a batch job</source>
 <target>Crear una tarea por lotes</target>
 
-<source>Synchronization settings</source>
-<target>Opciones de sincronización</target>
-
 <source>Comparison settings</source>
 <target>Opciones de comparación</target>
 
+<source>Synchronization settings</source>
+<target>Opciones de sincronización</target>
+
 <source>About</source>
 <target>Acerca de</target>
 
@@ -88,27 +88,6 @@
 <source>Select time span</source>
 <target>Seleccionar duración</target>
 
-<source>Show pop-up</source>
-<target>Mostrar ventana emergente</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Mostrar ventana emergente de errores o avisos</target>
-
-<source>Ignore errors</source>
-<target>Ignorar errores</target>
-
-<source>Hide all error and warning messages</source>
-<target>Ocultar todos los mensajes de error y aviso</target>
-
-<source>Exit instantly</source>
-<target>Salir inmediatamente</target>
-
-<source>Abort synchronization immediately</source>
-<target>Abortar sincronización inmediatamente</target>
-
-<source>Browse</source>
-<target>Examinar</target>
-
 <source>Invalid command line:</source>
 <target>Línea de comandos errónea:</target>
 
@@ -247,8 +226,8 @@
 <source>&Open...</source>
 <target>&Abrir...</target>
 
-<source>Save &As...</source>
-<target>Guardar &Como...</target>
+<source>Save &as...</source>
+<target>Guardar &como...</target>
 
 <source>&Quit</source>
 <target>&Salir</target>
@@ -289,6 +268,9 @@
 <source>Remove folder</source>
 <target>Eliminar carpeta</target>
 
+<source>Browse</source>
+<target>Examinar</target>
+
 <source>Select a folder</source>
 <target>Seleccione una carpeta</target>
 
@@ -321,8 +303,8 @@ El comando es disparado si::
 <source>Cancel</source>
 <target>Cancelar</target>
 
-<source>(Build: %x)</source>
-<target>(Completado: %x)</target>
+<source>Build: %x</source>
+<target>Completado: %x</target>
 
 <source>All files</source>
 <target>Todos los archivos</target>
@@ -342,9 +324,6 @@ El comando es disparado si::
 <source>A folder input field is empty.</source>
 <target>Un campo de entrada de la carpeta está vacío.</target>
 
-<source>Logging</source>
-<target>Registro</target>
-
 <source>File time and size</source>
 <target>Fecha y tamaño del archivo</target>
 
@@ -525,11 +504,11 @@ El comando es disparado si::
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Últimas configuraciones usadas (Pulsar DEL para quitar de la lista)</target>
 
-<source>Hide excluded items</source>
-<target>Ocultar elementos excluidos</target>
+<source>Show excluded items</source>
+<target>Mostrar elementos excluidos</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Ocultar archivos filtrados o temporalmente excluidos</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Mostrar archivos excluidos temporalmente o filtrados</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Número de archivos y carpetas que serán creados</target>
@@ -573,24 +552,81 @@ El comando es disparado si::
 <source>Right</source>
 <target>Derecha</target>
 
-<source>Status feedback</source>
-<target>Status feedback</target>
+<source>Error handling</source>
+<target>Gestión de errores</target>
+
+<source>Ignore</source>
+<target>Ignorar</target>
+
+<source>Hide all error and warning messages</source>
+<target>Ocultar todos los mensajes de error y aviso</target>
+
+<source>Pop-up</source>
+<target>Automático</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Mostrar ventana emergente de errores o avisos</target>
+
+<source>Exit</source>
+<target>Salir</target>
+
+<source>Abort synchronization on first error</source>
+<target>Abortar sincronización al primer error</target>
+
+<source>On completion:</source>
+<target>Al completarse:</target>
 
 <source>Show progress dialog</source>
 <target>Mostrar diálogo de progreso</target>
 
-<source>Error handling</source>
-<target>Gestión de errores</target>
+<source>Generate log file</source>
+<target>Generar archivo de registro</target>
+
+<source>Select folder to save log files</source>
+<target>Seleccionar una carpeta para salvar archivos de registro</target>
 
-<source>Maximum number of log files:</source>
-<target>Número máximo de archivos de registro:</target>
+<source>Limit</source>
+<target>Límite</target>
 
-<source>Select folder to save log files:</source>
-<target>Seleccionar carpeta para guardar archivos de registro:</target>
+<source>Limit maximum number of log files</source>
+<target>Limitar el número máximo de archivos de registro</target>
 
 <source>Batch settings</source>
 <target>Opciones de lotes</target>
 
+<source>Compare by...</source>
+<target>Comparar por...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Los archivos serán considerados iguales si
+	- última hora y fecha de escritura
+	- tamaño del archivo
+son iguales
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Los archivos serán considerados iguales si
+     - el contenido del archivo
+es el mismo
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Gestión de enlaces simbólicos</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Seleccione un tipo:</target>
 
@@ -609,8 +645,26 @@ El comando es disparado si::
 <source>Deletion handling</source>
 <target>Gestión de borrado</target>
 
-<source>On completion:</source>
-<target>Al completarse:</target>
+<source>Permanent</source>
+<target>Permanente</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Borrar o sobreescribir archivos permanentemente</target>
+
+<source>Recycle Bin</source>
+<target>Papelera de reciclaje</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Utilitzar Papelera de Reciclaje al eliminar o sobreescribir archivos</target>
+
+<source>Versioning</source>
+<target>Control de versiones</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Mover archivos marcados a la carpeta especificada</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Limitar el número máximo de versiones por archivo</target>
 
 <source>Configuration</source>
 <target>Configuración</target>
@@ -633,39 +687,6 @@ El comando es disparado si::
 <source>Conflict/item cannot be categorized</source>
 <target>Conflicto</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Comparar por...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Los archivos serán considerados iguales si
-	- última hora y fecha de escritura
-	- tamaño del archivo
-son iguales
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Los archivos serán considerados iguales si
-     - el contenido del archivo
-es el mismo
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Gestión de enlaces simbólicos</target>
-
 <source>Synchronizing...</source>
 <target>Sincronizando...</target>
 
@@ -681,8 +702,8 @@ es el mismo
 <source>Donate with PayPal</source>
 <target>Donar a través de PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Agradecimientos por la traducción de FreeFileSync a:</target>
+<source>Many thanks for localization:</source>
+<target>Agradecimientos por las traducciones a:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Feedback y sugerencias son bienvenidas</target>
@@ -699,9 +720,6 @@ es el mismo
 <source>Published under the GNU General Public License</source>
 <target>Publicado bajo "GNU General Public License"</target>
 
-<source>Use Recycle Bin</source>
-<target>Utilizar Papelera de Reciclaje</target>
-
 <source>Delete on both sides</source>
 <target>Borrar en ambos lados</target>
 
@@ -771,7 +789,7 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Statistics</source>
 <target>Estadísticas</target>
 
-<source>Do not show this dialog again</source>
+<source>Don't show this dialog again</source>
 <target>No volver a mostrar este diálogo</target>
 
 <source>Find what:</source>
@@ -855,11 +873,8 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Do you want to save changes to %x?</source>
 <target>¿Quiere guardar los cambios de %x?</target>
 
-<source>Save</source>
-<target>Guardar</target>
-
-<source>Don't Save</source>
-<target>No guardar</target>
+<source>Do&n't save</source>
+<target>No salvar</target>
 
 <source>Configuration loaded!</source>
 <target>¡Configuración cargada!</target>
@@ -951,8 +966,8 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Show files that won't be copied</source>
 <target>Mostrar archivos que no serán copiados</target>
 
-<source>All directories in sync!</source>
-<target>¡Todos los directorios en sincronización!</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>
@@ -1041,6 +1056,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Pause</source>
 <target>Pausa</target>
 
+<source>Logging</source>
+<target>Registro</target>
+
 <source>Cannot find %x</source>
 <target>No se puede encontrar %x</target>
 
@@ -1122,21 +1140,6 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Leave as unresolved conflict</source>
 <target>Dejar como conflicto sin resolver</target>
 
-<source>Delete permanently</source>
-<target>Borrar permanentemente</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Borrar o sobreescribir archivos permanentemente</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Utilitzar Papelera de Reciclaje al eliminar o sobreescribir archivos</target>
-
-<source>Versioning</source>
-<target>Control de versiones</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Mover archivo a una subcarpeta con marca de tiempo</target>
-
 <source>Files</source>
 <target>Archivos</target>
 
@@ -1227,8 +1230,11 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Cannot copy file %x to %y.</source>
 <target>No se puede copiar el archivo %x a %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>No se puede leer el directorio %x.</target>
+<source>Cannot open directory %x.</source>
+<target>No se puede abrir el directorio %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>No se puede enumerar el directorio %x.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Detectada recursividad de directorios sin fin.</target>
@@ -1254,6 +1260,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Fijando direcciones de sincronización por defecto: Los archivos viejos serán sobreescritos por los archivos nuevos.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>¡La papelera de reciclaje no está disponible para las siguientes rutas! Los archivos serán eliminados permanentemente:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Puede ignorar este error al considerar vacía la carpeta.</target>
 
@@ -1263,6 +1272,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <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>Preparing synchronization...</source>
 <target>Preparando sincronización...</target>
 
@@ -1275,6 +1287,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Files %x have the same date but a different size!</source>
 <target>¡Los archivos %x tienen la misma fecha pero un tamaño diferente!</target>
 
+<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>
 
@@ -1290,9 +1305,6 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Both sides are equal</source>
 <target>Ambos lados son iguales</target>
 
-<source>Items have different attributes</source>
-<target>Los elementos tienen distintos atributos</target>
-
 <source>Copy new item to left</source>
 <target>Copiar nuevo elemento a la izquierda</target>
 
@@ -1356,6 +1368,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Moving symbolic link %x to %y</source>
 <target>Mover enlace simbólico de %x a %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>Creando archivo %x</target>
 
@@ -1407,14 +1422,11 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Available:</source>
 <target>Disponible:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>¡La papelera de reciclaje no está disponible para las siguientes rutas! Los archivos serán eliminados permanentemente:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Una carpeta, que es parte de múltiple pares de carpetas, será modificada. Por favor, revise las opciones de sincronización.</target>
 
-<source>Processing folder pair:</source>
-<target>Procesar un par de carpetas:</target>
+<source>Synchronizing folder pair:</source>
+<target>Sincronizando par de carpetas:</target>
 
 <source>Target folder %x already existing.</source>
 <target>La carpeta de destino %x ya existe.</target>
diff --git a/BUILD/Languages/swedish.lng b/BUILD/Languages/swedish.lng
index e472d893..37b3edf0 100644
--- a/BUILD/Languages/swedish.lng
+++ b/BUILD/Languages/swedish.lng
@@ -10,6 +10,15 @@
 <source>Searching for folder %x...</source>
 <target>Söker efter mappen %x...</target>
 
+<source>Items processed:</source>
+<target>Processade poster</target>
+
+<source>Items remaining:</source>
+<target>Återstående poster:</target>
+
+<source>Total time:</source>
+<target>Total tid:</target>
+
 <source>Show in Explorer</source>
 <target>Visa i Utforskaren</target>
 
@@ -49,12 +58,12 @@
 <source>Create a batch job</source>
 <target>Skapa ett batch-jobb</target>
 
-<source>Synchronization settings</source>
-<target>Synkroniseringsinställningar</target>
-
 <source>Comparison settings</source>
 <target>Jämförelseinställningar</target>
 
+<source>Synchronization settings</source>
+<target>Synkroniseringsinställningar</target>
+
 <source>About</source>
 <target>Om</target>
 
@@ -76,27 +85,6 @@
 <source>Select time span</source>
 <target>Välj tidsintervall</target>
 
-<source>Show pop-up</source>
-<target>Visa pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Visa pop-up vid fel och varningar</target>
-
-<source>Ignore errors</source>
-<target>Ignorera fel</target>
-
-<source>Hide all error and warning messages</source>
-<target>Visa inte fel- och varningsmeddelanden</target>
-
-<source>Exit instantly</source>
-<target>Avsluta omedelbart</target>
-
-<source>Abort synchronization immediately</source>
-<target>Avbryt synkronisering omedelbart</target>
-
-<source>Browse</source>
-<target>Bläddra</target>
-
 <source>Invalid command line:</source>
 <target>Ogiltig kommandorad:</target>
 
@@ -235,8 +223,8 @@
 <source>&Open...</source>
 <target>&Öppna...</target>
 
-<source>Save &As...</source>
-<target>Spara s&om...</target>
+<source>Save &as...</source>
+<target>S&para som...</target>
 
 <source>&Quit</source>
 <target>&Avsluta</target>
@@ -277,6 +265,9 @@
 <source>Remove folder</source>
 <target>Ta bort mapp</target>
 
+<source>Browse</source>
+<target>Bläddra</target>
+
 <source>Select a folder</source>
 <target>Markera en mapp</target>
 
@@ -309,8 +300,8 @@ Kommandot triggas om:
 <source>Cancel</source>
 <target>Avbryt</target>
 
-<source>(Build: %x)</source>
-<target>(Bygge: %x)</target>
+<source>Build: %x</source>
+<target>Bygge: %x</target>
 
 <source>All files</source>
 <target>Alla filer</target>
@@ -330,9 +321,6 @@ Kommandot triggas om:
 <source>A folder input field is empty.</source>
 <target>Ett inmatningsfält är tomt</target>
 
-<source>Logging</source>
-<target>Loggar</target>
-
 <source>File time and size</source>
 <target>Tidsstämpling och storlek</target>
 
@@ -354,21 +342,6 @@ Kommandot triggas om:
 <source>FreeFileSync batch</source>
 <target>FreeFileSync batch</target>
 
-<source>Batch execution</source>
-<target>Batch-körning</target>
-
-<source>Items processed:</source>
-<target>Processade poster</target>
-
-<source>Items remaining:</source>
-<target>Återstående poster:</target>
-
-<source>Total time:</source>
-<target>Total tid:</target>
-
-<source>Stop</source>
-<target>Stopp</target>
-
 <source>Synchronization aborted!</source>
 <target>Synkronisering avbruten!</target>
 
@@ -528,11 +501,11 @@ Kommandot triggas om:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Senast använda konfigurationer (Tryck DEL för att ta bort)</target>
 
-<source>Hide excluded items</source>
-<target>Visa inte undantagna objekt</target>
+<source>Show excluded items</source>
+<target>Visa undantagna poster</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Visa inte filtrerade eller temporärt undantagna filer</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Visa filtrerade eller temporärt undantagna filer</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Antal filer och mappar som kommer att skapas</target>
@@ -576,24 +549,81 @@ Kommandot triggas om:
 <source>Right</source>
 <target>Höger</target>
 
-<source>Status feedback</source>
-<target>Status</target>
+<source>Error handling</source>
+<target>Felhantering</target>
+
+<source>Ignore</source>
+<target>Ignorera</target>
+
+<source>Hide all error and warning messages</source>
+<target>Visa inte fel- och varningsmeddelanden</target>
+
+<source>Pop-up</source>
+<target>Popup</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Visa popup vid fel och varningar</target>
+
+<source>Exit</source>
+<target>Avsluta</target>
+
+<source>Abort synchronization on first error</source>
+<target>Avbryt synkronisering vid första felet</target>
+
+<source>On completion:</source>
+<target>Vid slutfört:</target>
 
 <source>Show progress dialog</source>
 <target>Visa förloppsindikator</target>
 
-<source>Error handling</source>
-<target>Felhantering</target>
+<source>Generate log file</source>
+<target>Skapa loggfil</target>
+
+<source>Select folder to save log files</source>
+<target>Väl en mapp att spara loggfiler i</target>
 
-<source>Maximum number of log files:</source>
-<target>Max antal loggfiler:</target>
+<source>Limit</source>
+<target>Begränsa</target>
 
-<source>Select folder to save log files:</source>
-<target>Välj mapp, att spara loggfiler i</target>
+<source>Limit maximum number of log files</source>
+<target>Begränsa antalet loggfiler</target>
 
 <source>Batch settings</source>
 <target>Batch-inställningar</target>
 
+<source>Compare by...</source>
+<target>Jämför...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Filer betraktas som likvärdiga om
+     - tidsstämpel för 'Senast ändrad'
+     - filstorlek
+är samma.
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Filerna betecknas som lika om, 
+     - filinnehållet
+är lika
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Hantering av Symboliska länkar</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Välj variant:</target>
 
@@ -612,8 +642,26 @@ Kommandot triggas om:
 <source>Deletion handling</source>
 <target>Borttagning</target>
 
-<source>On completion:</source>
-<target>Vid slutfört:</target>
+<source>Permanent</source>
+<target>Permanent</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Ta bort eller skriv över permanent</target>
+
+<source>Recycle Bin</source>
+<target>Papperskorgen</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Använd papperskorgen vid borttagning och överskrivning av filer</target>
+
+<source>Versioning</source>
+<target>Versionshantering</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Flytta tidsstämplade filer till specificerad mapp</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Begränsa antalet versioner per fil</target>
 
 <source>Configuration</source>
 <target>Inställningar</target>
@@ -636,39 +684,6 @@ Kommandot triggas om:
 <source>Conflict/item cannot be categorized</source>
 <target>Konflikten/Objektet kan inte kategoriseras</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Jämför...</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Filer betraktas som likvärdiga om
-     - tidsstämpel för 'Senast ändrad'
-     - filstorlek
-är samma.
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Filerna betecknas som lika om, 
-     - filinnehållet
-är lika
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Hantering av Symboliska länkar</target>
-
 <source>Synchronizing...</source>
 <target>Synkroniserar...</target>
 
@@ -684,8 +699,8 @@ Filerna betecknas som lika om,
 <source>Donate with PayPal</source>
 <target>Donera via PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Stort tack för översättningen av FreeFileSync går till:</target>
+<source>Many thanks for localization:</source>
+<target>Tack för översättning:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Återkoppling och förslag är välkommna</target>
@@ -702,9 +717,6 @@ Filerna betecknas som lika om,
 <source>Published under the GNU General Public License</source>
 <target>Publiserad under GNU General Public License</target>
 
-<source>Use Recycle Bin</source>
-<target>Använd papperskorgen</target>
-
 <source>Delete on both sides</source>
 <target>Ta bort på båda sidor</target>
 
@@ -774,8 +786,8 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Statistics</source>
 <target>Statistik</target>
 
-<source>Do not show this dialog again</source>
-<target>Visa inte den här dialogrutan igen</target>
+<source>Don't show this dialog again</source>
+<target>Visa inte det här igen</target>
 
 <source>Find what:</source>
 <target>Sök efter:</target>
@@ -858,11 +870,8 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Do you want to save changes to %x?</source>
 <target>Vill du spara ändringar till %x?</target>
 
-<source>Save</source>
-<target>Spara</target>
-
-<source>Don't Save</source>
-<target>Spara inte</target>
+<source>Do&n't save</source>
+<target>Spara &inte</target>
 
 <source>Configuration loaded!</source>
 <target>Inställningar inlästa!</target>
@@ -954,8 +963,8 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Show files that won't be copied</source>
 <target>Visa filer som inte kommer att kopieras</target>
 
-<source>All directories in sync!</source>
-<target>Alla mappar synkroniserade!</target>
+<source>All folders are in sync!</source>
+<target>Alla mappar är synkroniserade!</target>
 
 <source>Comma separated list</source>
 <target>Komma-separerad lista</target>
@@ -1044,6 +1053,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Pause</source>
 <target>Paus</target>
 
+<source>Logging</source>
+<target>Loggar</target>
+
 <source>Cannot find %x</source>
 <target>Kan inte hitta %x</target>
 
@@ -1125,21 +1137,6 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Leave as unresolved conflict</source>
 <target>Ignorera konflikt</target>
 
-<source>Delete permanently</source>
-<target>Ta bort permanent</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Ta bort eller skriv över permanent</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Använd papperskorgen vid borttagning och överskrivning av filer</target>
-
-<source>Versioning</source>
-<target>Versionshantering</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Flytta filer till en tidsstämplad undermapp</target>
-
 <source>Files</source>
 <target>Filer</target>
 
@@ -1230,8 +1227,11 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Cannot copy file %x to %y.</source>
 <target>Kan inte kopiera filen %x till %y.</target>
 
-<source>Cannot read directory %x.</source>
-<target>Kan inte läsa in mappen %x.</target>
+<source>Cannot open directory %x.</source>
+<target>Kan inte öppna %x.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>Kan inte räkna upp %x.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Upptäckte ändlös mapprekursion</target>
@@ -1257,6 +1257,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Standardsynkronisering: Gamla filer kommer att skrivas över av nyare versioner.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Papperskorgen är inte tillgänglig för följande sökvägar! Filerna tas i stället bort permanent.</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Du kan ignorera detta fel och betrakta mappen som tom</target>
 
@@ -1266,6 +1269,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <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>
 
+<source>Start comparison</source>
+<target>Starta jämförelse</target>
+
 <source>Preparing synchronization...</source>
 <target>Förbereder synkronisering...</target>
 
@@ -1278,6 +1284,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Files %x have the same date but a different size!</source>
 <target>Filerna %x har samma datum men olika storlek!</target>
 
+<source>Items differ in attributes only</source>
+<target>Endast attribut skiljer objekten åt</target>
+
 <source>Symbolic links %x have the same date but a different target.</source>
 <target>De symboliska länkarna %x har samma datumstämpel men olika mål.</target>
 
@@ -1293,9 +1302,6 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Both sides are equal</source>
 <target>Bägge sidor är lika</target>
 
-<source>Items have different attributes</source>
-<target>Objekten har olika attribut</target>
-
 <source>Copy new item to left</source>
 <target>Kopiera nytt objekt åt vänster</target>
 
@@ -1410,14 +1416,11 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Available:</source>
 <target>Tillgängligt:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Papperskorgen är inte tillgänglig för följande sökvägar! Filerna tas i stället bort permanent.</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>En mapp som tillhör flera mapp-par är på väg att ändras. Kontrollera synkroniseringsinställningarna</target>
 
-<source>Processing folder pair:</source>
-<target>Bearbetar mapp-paret:</target>
+<source>Synchronizing folder pair:</source>
+<target>Synkroniserar mapp-par:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Målmappen %x finns redan.</target>
diff --git a/BUILD/Languages/turkish.lng b/BUILD/Languages/turkish.lng
index c58532a3..0cf8d9ef 100644
--- a/BUILD/Languages/turkish.lng
+++ b/BUILD/Languages/turkish.lng
@@ -10,6 +10,15 @@
 <source>Searching for folder %x...</source>
 <target>%s klasörü aranıyor...</target>
 
+<source>Items processed:</source>
+<target>İşlenen bileşenler:</target>
+
+<source>Items remaining:</source>
+<target>Kalan bileşenler:</target>
+
+<source>Total time:</source>
+<target>Toplam zaman:</target>
+
 <source>Show in Explorer</source>
 <target>Tarayıcıda Göster</target>
 
@@ -49,12 +58,12 @@
 <source>Create a batch job</source>
 <target>Toplu iş oluştur</target>
 
-<source>Synchronization settings</source>
-<target>Eşleştirme ayarları</target>
-
 <source>Comparison settings</source>
 <target>Karşılaştırma ayarları</target>
 
+<source>Synchronization settings</source>
+<target>Eşleştirme ayarları</target>
+
 <source>About</source>
 <target>Hakkında</target>
 
@@ -76,27 +85,6 @@
 <source>Select time span</source>
 <target>Zaman aralığı</target>
 
-<source>Show pop-up</source>
-<target>Açılır pencerede göster</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Hata ya da uyarıları açılır pencerede gösterir</target>
-
-<source>Ignore errors</source>
-<target>Hataları yoksay</target>
-
-<source>Hide all error and warning messages</source>
-<target>Tüm hata ve uyarı iletilerini gizler</target>
-
-<source>Exit instantly</source>
-<target>İşlemi sonlandır</target>
-
-<source>Abort synchronization immediately</source>
-<target>Eşleştirmeyi hemen bırakır</target>
-
-<source>Browse</source>
-<target>Gözat</target>
-
 <source>Invalid command line:</source>
 <target>Geçersiz komut satırı:</target>
 
@@ -235,8 +223,8 @@
 <source>&Open...</source>
 <target>&Aç...</target>
 
-<source>Save &As...</source>
-<target>F&arklı Kaydet...</target>
+<source>Save &as...</source>
+<target>F&arklı kaydet...</target>
 
 <source>&Quit</source>
 <target>Çı&k</target>
@@ -277,6 +265,9 @@
 <source>Remove folder</source>
 <target>Klasörü sil</target>
 
+<source>Browse</source>
+<target>Gözat</target>
+
 <source>Select a folder</source>
 <target>Bir klasör seçin</target>
 
@@ -309,8 +300,8 @@ Komut şu durumlarda yürütülür:
 <source>Cancel</source>
 <target>İptal</target>
 
-<source>(Build: %x)</source>
-<target>(Yapım: %x)</target>
+<source>Build: %x</source>
+<target>Yapım: %x</target>
 
 <source>All files</source>
 <target>Tüm dosyalar</target>
@@ -330,9 +321,6 @@ Komut şu durumlarda yürütülür:
 <source>A folder input field is empty.</source>
 <target>Bir klasör giriş alanı boş.</target>
 
-<source>Logging</source>
-<target>Günlükleme</target>
-
 <source>File time and size</source>
 <target>Dosya tarih ve saati</target>
 
@@ -354,21 +342,6 @@ Komut şu durumlarda yürütülür:
 <source>FreeFileSync batch</source>
 <target>FreeFileSync toplu işi</target>
 
-<source>Batch execution</source>
-<target>Toplu komut yürütme</target>
-
-<source>Items processed:</source>
-<target>İşlenen bileşenler:</target>
-
-<source>Items remaining:</source>
-<target>Kalan bileşenler:</target>
-
-<source>Total time:</source>
-<target>Toplam zaman:</target>
-
-<source>Stop</source>
-<target>Durdur</target>
-
 <source>Synchronization aborted!</source>
 <target>Eşleştirme durduruldu!</target>
 
@@ -528,11 +501,11 @@ Komut şu durumlarda yürütülür:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Son kullanılan yapılandırmalar (listeden silmek için DEL tuşuna basın)</target>
 
-<source>Hide excluded items</source>
-<target>Dışlanan ögeleri gizle</target>
+<source>Show excluded items</source>
+<target>Katılmayan ögeleri göster</target>
 
-<source>Hide filtered or temporarily excluded files</source>
-<target>Süzülmüş ya da geçici olarak dışlanmış dosyaları gizler</target>
+<source>Show filtered or temporarily excluded files</source>
+<target>Süzülmüş ya da geçici olarak katılmayan dosyaları göster</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Oluşturulacak dosya ve klasör sayısı</target>
@@ -576,24 +549,81 @@ Komut şu durumlarda yürütülür:
 <source>Right</source>
 <target>Sağ</target>
 
-<source>Status feedback</source>
-<target>Durum geri bildirimi</target>
+<source>Error handling</source>
+<target>Hata olursa:</target>
+
+<source>Ignore</source>
+<target>Yoksay</target>
+
+<source>Hide all error and warning messages</source>
+<target>Tüm hata ve uyarı iletilerini gizler</target>
+
+<source>Pop-up</source>
+<target>Açılan pencere</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Hata ya da uyarıları açılır pencerede gösterir</target>
+
+<source>Exit</source>
+<target>Çık</target>
+
+<source>Abort synchronization on first error</source>
+<target>>Oluşacak ilk hatada eşleştirmeyi durdur</target>
+
+<source>On completion:</source>
+<target>İşlem tamamlandığında:</target>
 
 <source>Show progress dialog</source>
 <target>İşlem penceresini göster</target>
 
-<source>Error handling</source>
-<target>Hata olursa:</target>
+<source>Generate log file</source>
+<target>Günlük dosyası oluştur</target>
 
-<source>Maximum number of log files:</source>
-<target>Tutulacak en fazla günlük dosyası sayısı:</target>
+<source>Select folder to save log files</source>
+<target>Günlük dosyalarının kaydedileceği klasörü seçin</target>
 
-<source>Select folder to save log files:</source>
-<target>Günlük dosyalarının kaydedileceği klasörü seçin:</target>
+<source>Limit</source>
+<target>Sınır</target>
+
+<source>Limit maximum number of log files</source>
+<target>Günlük dosyası sayısının üst sınırını belirle</target>
 
 <source>Batch settings</source>
 <target>İş ayarları</target>
 
+<source>Compare by...</source>
+<target>Karşılaştırma ölçütünü seçin:</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Dosyaların eşit sayılması için
+	 - son yazma tarih ve saati
+	 - dosya boyutu
+aynı olmalıdır
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Dosyaların eşit sayılması için
+     - dosya içeriği
+aynı olmalıdır
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Sembolik bağlantı işleme</target>
+
+<source>OK</source>
+<target>Tamam</target>
+
 <source>Select variant:</source>
 <target>Davranışı seçin:</target>
 
@@ -612,8 +642,26 @@ Komut şu durumlarda yürütülür:
 <source>Deletion handling</source>
 <target>Silme eyleminde:</target>
 
-<source>On completion:</source>
-<target>İşlem tamamlandığında:</target>
+<source>Permanent</source>
+<target>Kalıcı</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Dosyaları kalıcı olarak siler ya da üzerine yazar</target>
+
+<source>Recycle Bin</source>
+<target>Geri Dönüşüm Kutusu</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Dosya silme ve üzerine yazma sırasında Geri Dönüşüm Kutusu'nu kullanır</target>
+
+<source>Versioning</source>
+<target>Eski sürüm olarak sakla</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Zaman damgalanmış dosyaları belirtilen klasöre taşı</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Her dosya için en fazla sürüm sayısını sınırla</target>
 
 <source>Configuration</source>
 <target>Yapılandırma</target>
@@ -636,39 +684,6 @@ Komut şu durumlarda yürütülür:
 <source>Conflict/item cannot be categorized</source>
 <target>Uyuşmazlık/öge kategorize edilemiyor</target>
 
-<source>OK</source>
-<target>Tamam</target>
-
-<source>Compare by...</source>
-<target>Karşılaştırma ölçütünü seçin:</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Dosyaların eşit sayılması için
-	 - son yazma tarih ve saati
-	 - dosya boyutu
-aynı olmalıdır
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>
-Dosyaların eşit sayılması için
-     - dosya içeriği
-aynı olmalıdır
-</target>
-
-<source>Symbolic Link handling</source>
-<target>Sembolik bağlantı işleme</target>
-
 <source>Synchronizing...</source>
 <target>Eşleştiriliyor...</target>
 
@@ -684,8 +699,8 @@ aynı olmalıdır
 <source>Donate with PayPal</source>
 <target>PayPal ile bağış yapın</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>FreeFileSync çevirmenlerine çok teşekkürler:</target>
+<source>Many thanks for localization:</source>
+<target>Çeviriler için çok teşekkürler:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Öneri ve geri bildirimlerinizi bekleriz</target>
@@ -702,9 +717,6 @@ aynı olmalıdır
 <source>Published under the GNU General Public License</source>
 <target>GNU Genel Kamu Lisansı şartları altında yayınlanmıştır</target>
 
-<source>Use Recycle Bin</source>
-<target>Geri Dönüşüm Kutusu'nu kullan</target>
-
 <source>Delete on both sides</source>
 <target>Her iki yandakini de sil</target>
 
@@ -774,8 +786,8 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Statistics</source>
 <target>İstatistikler</target>
 
-<source>Do not show this dialog again</source>
-<target>Bu iletiyi yeniden gösterme</target>
+<source>Don't show this dialog again</source>
+<target>Bu iletiyi artık gösterme</target>
 
 <source>Find what:</source>
 <target>Aranacak:</target>
@@ -858,10 +870,7 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Do you want to save changes to %x?</source>
 <target>Değişiklikleri %x dosyasına kaydetmek istiyor musunuz?</target>
 
-<source>Save</source>
-<target>Kaydet</target>
-
-<source>Don't Save</source>
+<source>Do&n't save</source>
 <target>Kaydetme</target>
 
 <source>Configuration loaded!</source>
@@ -954,8 +963,8 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Show files that won't be copied</source>
 <target>Kopyalanmayacak dosyaları göster</target>
 
-<source>All directories in sync!</source>
-<target>Tüm klasörler eş!</target>
+<source>All folders are in sync!</source>
+<target>Tüm klasörler eşleştirildi.</target>
 
 <source>Comma separated list</source>
 <target>Virgül ile ayrılmış liste</target>
@@ -1044,6 +1053,9 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Pause</source>
 <target>Duraklat</target>
 
+<source>Logging</source>
+<target>Günlükleme</target>
+
 <source>Cannot find %x</source>
 <target>%x bulunamadı</target>
 
@@ -1125,21 +1137,6 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Leave as unresolved conflict</source>
 <target>Çözülmemiş tutarsızlık olarak bırak</target>
 
-<source>Delete permanently</source>
-<target>Kalıcı olarak sil</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Dosyaları kalıcı olarak siler ya da üzerine yazar</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Dosya silme ve üzerine yazma sırasında Geri Dönüşüm Kutusu'nu kullanır</target>
-
-<source>Versioning</source>
-<target>Eski sürüm olarak sakla</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Dosyaları zaman damgalı bir alt klasöre taşı</target>
-
 <source>Files</source>
 <target>Dosyalar</target>
 
@@ -1230,8 +1227,11 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Cannot copy file %x to %y.</source>
 <target>%x dosyası %y olarak kopyalanamadı.</target>
 
-<source>Cannot read directory %x.</source>
-<target>%x klasörü okunamadı.</target>
+<source>Cannot open directory %x.</source>
+<target>%x klasörü açılamadı.</target>
+
+<source>Cannot enumerate directory %x.</source>
+<target>%x klasörü sayılamadı.</target>
 
 <source>Detected endless directory recursion.</source>
 <target>Sonsuz klasör kısayol döngüsü algılandı.</target>
@@ -1257,6 +1257,9 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Varsayılan eşleştirme yönleri ayarlanıyor: Yeni dosyalar eski dosyaların üzerine yazılacak.</target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Şu yollar için geri dönüşüm kutusu kullanılamaz! Dosyalar anında ve tamamen silinir:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Klasörün boş olarak kabul edilmesi için bu hatayı yok sayanbilirsiniz.</target>
 
@@ -1266,6 +1269,9 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Klasörler bağımlı! Eşleştirme kurallarını koyarken dikkatli olun:</target>
 
+<source>Start comparison</source>
+<target>Karşılaştırmaya başla</target>
+
 <source>Preparing synchronization...</source>
 <target>Eşleştirmeye hazırlanıyor...</target>
 
@@ -1278,6 +1284,9 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Files %x have the same date but a different size!</source>
 <target>%x dosyalarının tarihleri aynı fakat boyutları farklı!</target>
 
+<source>Items differ in attributes only</source>
+<target>Yalnız öznitelikleri farklı ögeler</target>
+
 <source>Symbolic links %x have the same date but a different target.</source>
 <target>%x simgesel bağlantıları aynı tarihe sahip ancak hedef yolları farklı.</target>
 
@@ -1293,9 +1302,6 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Both sides are equal</source>
 <target>İki tarafta aynı</target>
 
-<source>Items have different attributes</source>
-<target>Ögeler farklı özniteliklere sahip</target>
-
 <source>Copy new item to left</source>
 <target>Yeni ögeyi sola kopyala</target>
 
@@ -1410,14 +1416,11 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Available:</source>
 <target>Kullanılabilir:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Şu yollar için geri dönüşüm kutusu kullanılamaz! Dosyalar anında ve tamamen silinir:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Çoklu klasör çiftlerinin parçası olan bir klasör değiştirilecek. Lütfen eşleştirme ayarlarını gözden geçirin.</target>
 
-<source>Processing folder pair:</source>
-<target>İşlenen klasör çifti:</target>
+<source>Synchronizing folder pair:</source>
+<target>Eşleştirilen klasör çifti:</target>
 
 <source>Target folder %x already existing.</source>
 <target>%x hedef klasörü zaten var.</target>
diff --git a/BUILD/Languages/ukrainian.lng b/BUILD/Languages/ukrainian.lng
index bdfd7db7..594fd28f 100644
--- a/BUILD/Languages/ukrainian.lng
+++ b/BUILD/Languages/ukrainian.lng
@@ -10,9 +10,6 @@
 <source>Searching for folder %x...</source>
 <target>Пошук каталогу  %x...</target>
 
-<source>Batch execution</source>
-<target>Виконання пакетного завдання</target>
-
 <source>Items processed:</source>
 <target>Елементів оброблено:</target>
 
@@ -61,12 +58,12 @@
 <source>Create a batch job</source>
 <target>Створити пакетне завдання</target>
 
-<source>Synchronization settings</source>
-<target>Налаштування синхронізації</target>
-
 <source>Comparison settings</source>
 <target>Налаштування порівнювання</target>
 
+<source>Synchronization settings</source>
+<target>Налаштування синхронізації</target>
+
 <source>About</source>
 <target>Про</target>
 
@@ -88,27 +85,6 @@
 <source>Select time span</source>
 <target>Виберіть часовий інтервал</target>
 
-<source>Show pop-up</source>
-<target>Показувати виринаючі вікна</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Показувати виринаючі вікна при помилках та попередженнях</target>
-
-<source>Ignore errors</source>
-<target>Ігнорувати помилки</target>
-
-<source>Hide all error and warning messages</source>
-<target>Приховати всі помилки і повідомлення з попередженнями</target>
-
-<source>Exit instantly</source>
-<target>Вийти негайно</target>
-
-<source>Abort synchronization immediately</source>
-<target>Перервати синхронізацію негайно</target>
-
-<source>Browse</source>
-<target>Переглянути</target>
-
 <source>Invalid command line:</source>
 <target>Неправильний командний рядок:</target>
 
@@ -250,7 +226,7 @@
 <source>&Open...</source>
 <target>Відкрити...</target>
 
-<source>Save &As...</source>
+<source>Save &as...</source>
 <target>Зберегти як...</target>
 
 <source>&Quit</source>
@@ -292,6 +268,9 @@
 <source>Remove folder</source>
 <target>Вилучити папку</target>
 
+<source>Browse</source>
+<target>Переглянути</target>
+
 <source>Select a folder</source>
 <target>Вибрати папку</target>
 
@@ -324,8 +303,8 @@ The command is triggered if:
 <source>Cancel</source>
 <target>Відмінити</target>
 
-<source>(Build: %x)</source>
-<target>(компіляція %x)</target>
+<source>Build: %x</source>
+<target>компіляція %x</target>
 
 <source>All files</source>
 <target>Всі файли</target>
@@ -345,9 +324,6 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>Порожнє поле папки.</target>
 
-<source>Logging</source>
-<target>Лог-файли</target>
-
 <source>File time and size</source>
 <target>Дата та розмір файлу</target>
 
@@ -531,11 +507,11 @@ The command is triggered if:
 (тисніть DEL для вилучення зі списку)
 </target>
 
-<source>Hide excluded items</source>
-<target>Приховати виключені пункти</target>
+<source>Show excluded items</source>
+<target>Показати виключені елементи</target>
 
-<source>Hide filtered or temporarily excluded files</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>
@@ -579,24 +555,77 @@ The command is triggered if:
 <source>Right</source>
 <target>Праворуч</target>
 
-<source>Status feedback</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>On completion:</source>
+<target>Закінчивши:</target>
 
 <source>Show progress dialog</source>
 <target>Показувати вікно прогресу</target>
 
-<source>Error handling</source>
-<target>Обробка помилок</target>
+<source>Generate log file</source>
+<target>Створити файл журналу</target>
+
+<source>Select folder to save log files</source>
+<target>Виберіть папку для файлів журналу</target>
 
-<source>Maximum number of log files:</source>
-<target>Максимальна кількість лог-файлів:</target>
+<source>Limit</source>
+<target>Межа</target>
 
-<source>Select folder to save log files:</source>
-<target>Вибрати папку для лог-файлу</target>
+<source>Limit maximum number of log files</source>
+<target>Обмежити максимальну кількість файлів журналу</target>
 
 <source>Batch settings</source>
 <target>Налаштування пакетного завдання</target>
 
+<source>Compare by...</source>
+<target>Критерії порівнювання</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Файли вважаються однаковими якщо
+     - дата і час останнього запису
+     - розмір файлів
+співпадають
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>Файли вважаються рівними, якщо вміст файлів однаковий</target>
+
+<source>Symbolic Link handling</source>
+<target>Обробка символьного посилання</target>
+
+<source>OK</source>
+<target>OK</target>
+
 <source>Select variant:</source>
 <target>Виберіть варіант:</target>
 
@@ -615,8 +644,26 @@ The command is triggered if:
 <source>Deletion handling</source>
 <target>Налаштування вилучення</target>
 
-<source>On completion:</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 when deleting or overwriting files</source>
+<target>Використовувати "Корзину" при вилученні чи перезаписі файлів</target>
+
+<source>Versioning</source>
+<target>Запис версій</target>
+
+<source>Move time-stamped files into specified folder</source>
+<target>Перемістити файли з часовою міткою у вказану папку</target>
+
+<source>Limit maximum number of versions per file</source>
+<target>Обмежити кількість версій файлу</target>
 
 <source>Configuration</source>
 <target>Налаштування</target>
@@ -639,35 +686,6 @@ The command is triggered if:
 <source>Conflict/item cannot be categorized</source>
 <target>Не вдається категоризувати конфлікт/елемент</target>
 
-<source>OK</source>
-<target>OK</target>
-
-<source>Compare by...</source>
-<target>Критерії порівнювання</target>
-
-<source>
-Files are found equal if
-     - last write time and date
-     - file size
-are the same
-</source>
-<target>
-Файли вважаються однаковими якщо
-     - дата і час останнього запису
-     - розмір файлів
-співпадають
-</target>
-
-<source>
-Files are found equal if
-     - file content
-is the same
-</source>
-<target>Файли вважаються рівними, якщо вміст файлів однаковий</target>
-
-<source>Symbolic Link handling</source>
-<target>Обробка символьного посилання</target>
-
 <source>Synchronizing...</source>
 <target>Синхронізація...</target>
 
@@ -683,8 +701,8 @@ is the same
 <source>Donate with PayPal</source>
 <target>Пожертвувати через PayPal</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Щира подяка за переклад FreeFileSync:</target>
+<source>Many thanks for localization:</source>
+<target>Подяка за локалізацію:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Відгуки та пропозиції вітаються</target>
@@ -701,9 +719,6 @@ is the same
 <source>Published under the GNU General Public License</source>
 <target>Видано за ліцензією GNU General Public License</target>
 
-<source>Use Recycle Bin</source>
-<target>Використовувати "Корзину"</target>
-
 <source>Delete on both sides</source>
 <target>Вилучити з обох сторін</target>
 
@@ -773,8 +788,8 @@ Note: File names must be relative to base directories!
 <source>Statistics</source>
 <target>Статистика</target>
 
-<source>Do not show this dialog again</source>
-<target>Надалі не показувати це вікно</target>
+<source>Don't show this dialog again</source>
+<target>Не показувати надалі цього діалогу</target>
 
 <source>Find what:</source>
 <target>Знайти:</target>
@@ -857,10 +872,7 @@ Note: File names must be relative to base directories!
 <source>Do you want to save changes to %x?</source>
 <target>Зберегти зміни в %x?</target>
 
-<source>Save</source>
-<target>Зберегти</target>
-
-<source>Don't Save</source>
+<source>Do&n't save</source>
 <target>Не зберігати</target>
 
 <source>Configuration loaded!</source>
@@ -953,8 +965,8 @@ Note: File names must be relative to base directories!
 <source>Show files that won't be copied</source>
 <target>Показати файли, які не будуть зкопійовані</target>
 
-<source>All directories in sync!</source>
-<target>Всі каталоги синхронізовані!</target>
+<source>All folders are in sync!</source>
+<target>Всі папки синхронізовано!</target>
 
 <source>Comma separated list</source>
 <target>Розділений комами список</target>
@@ -1047,6 +1059,9 @@ Note: File names must be relative to base directories!
 <source>Pause</source>
 <target>Пауза</target>
 
+<source>Logging</source>
+<target>Лог-файли</target>
+
 <source>Cannot find %x</source>
 <target>Не можна знайти %x</target>
 
@@ -1130,21 +1145,6 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>Залишити як невирішений конфлікт</target>
 
-<source>Delete permanently</source>
-<target>Вилучати назавжди</target>
-
-<source>Delete or overwrite files permanently</source>
-<target>Вилучати чи перезаписати файли назавжди</target>
-
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Використовувати "Корзину" при вилученні чи перезаписі файлів</target>
-
-<source>Versioning</source>
-<target>Запис версій</target>
-
-<source>Move files into a time-stamped subfolder</source>
-<target>Перемістити файли в означену датою підпапку</target>
-
 <source>Files</source>
 <target>Файли</target>
 
@@ -1238,8 +1238,11 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>Не вдається зкопіювати файл %х до %y.</target>
 
-<source>Cannot read directory %x.</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>
@@ -1268,6 +1271,9 @@ Note: File names must be relative to base directories!
 Старі файли будуть замінені новішими файлами.
 </target>
 
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Корзина для цього шляху недоступна. Файли будуть вилучені назавжди:</target>
+
 <source>You can ignore this error to consider the folder as empty.</source>
 <target>Ви можете ігнорувати цю помилку вважаючи папку порожньою.</target>
 
@@ -1277,6 +1283,9 @@ Note: File names must be relative to base directories!
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Залежні каталоги! Будьте уважні при налаштуванні правил синхронізації:</target>
 
+<source>Start comparison</source>
+<target>Розпочати порівняння</target>
+
 <source>Preparing synchronization...</source>
 <target>Підготовка до синхронізації...</target>
 
@@ -1289,6 +1298,9 @@ Note: File names must be relative to base directories!
 <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>Symbolic links %x have the same date but a different target.</source>
 <target>Символьні посилання %х мають таку ж дату, але різні цілі.</target>
 
@@ -1304,9 +1316,6 @@ Note: File names must be relative to base directories!
 <source>Both sides are equal</source>
 <target>Сторони ідентичні</target>
 
-<source>Items have different attributes</source>
-<target>Елементи мають різні атрибути</target>
-
 <source>Copy new item to left</source>
 <target>Копіювати нові елементи ліворуч</target>
 
@@ -1421,14 +1430,11 @@ Note: File names must be relative to base directories!
 <source>Available:</source>
 <target>Доступно:</target>
 
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Корзина для цього шляху недоступна. Файли будуть вилучені назавжди:</target>
-
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Буде змінена папка, яка є частиною кількох пар папок. Будь ласка, перегляньте налаштування синхронізації.</target>
 
-<source>Processing folder pair:</source>
-<target>Обробка пари папок:</target>
+<source>Synchronizing folder pair:</source>
+<target>Синхронізація пари папок:</target>
 
 <source>Target folder %x already existing.</source>
 <target>Цільова папка %x вже існує.</target>