5.5

author: Daniel Wilhelm <daniel@wili.li> 2014-04-18 17:20:29 +0200
committer: Daniel Wilhelm <daniel@wili.li> 2014-04-18 17:20:29 +0200
commit: b8f13e45be884dc12884ebe8f3dcd9eecb23a106 (patch)
tree: 22a6d8b96815d626061ff3e2d432c13078fca5c4 /BUILD/Languages
parent: 5.4 (diff)
download: FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.tar.gz
FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.tar.bz2
FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.zip
28 files changed, 2867 insertions, 2702 deletions
diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index acd8a931..dbf75eac 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -10,6 +10,18 @@
 <source>Searching for folder %x...</source>
 <target>正在搜索文件夹 %x...</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>Show in Explorer</source>
 <target>在Explorer中显示</target>
 
@@ -58,12 +70,6 @@
 <source>About</source>
 <target>关于</target>
 
-<source>Warning</source>
-<target>警告</target>
-
-<source>Question</source>
-<target>问题</target>
-
 <source>Confirm</source>
 <target>确认</target>
 
@@ -109,6 +115,9 @@
 <source>Info</source>
 <target>信息</target>
 
+<source>Warning</source>
+<target>警告</target>
+
 <source>Fatal Error</source>
 <target>致命错误</target>
 
@@ -138,12 +147,6 @@
 <pluralform>%x 字节</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>无法读取文件 %x .</target>
-
-<source>Cannot write file %x.</source>
-<target>无法写入文件 %x .</target>
-
 <source>Database file %x is incompatible.</source>
 <target>数据库文件 %x 不兼容.</target>
 
@@ -153,9 +156,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>数据库文件 %x 还未存在.</target>
 
+<source>Database file is corrupt:</source>
+<target>数据库文件已损坏:</target>
+
 <source>Out of memory!</source>
 <target>内存不足!</target>
 
+<source>Cannot write file %x.</source>
+<target>无法写入文件 %x .</target>
+
+<source>Cannot read file %x.</source>
+<target>无法读取文件 %x .</target>
+
 <source>Database files do not share a common session.</source>
 <target>数据库文件并未共享一个公共会话.</target>
 
@@ -202,6 +214,9 @@
 <source>/sec</source>
 <target>/秒</target>
 
+<source>Cannot find file %x.</source>
+<target>无法找到文件 %x .</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>文件 %x 并未包含合法的配置.</target>
 
@@ -226,14 +241,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>无法读取如下XML元素:</target>
 
-<source>Cannot find file %x.</source>
-<target>无法找到文件 %x .</target>
-
 <source>&Open...</source>
 <target>打开(&O)...</target>
 
-<source>&Save...</source>
-<target>保存(&S)...</target>
+<source>Save &As...</source>
+<target>另存为(&A)...</target>
 
 <source>&Quit</source>
 <target>退出(&Q)</target>
@@ -309,8 +321,8 @@ The command is triggered if:
 <source>(Build: %x)</source>
 <target>(Build: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>实时同步配置</target>
+<source>All files</source>
+<target>所有文件</target>
 
 <source>&Restore</source>
 <target>恢复(&R)</target>
@@ -324,8 +336,8 @@ The command is triggered if:
 <source>Waiting for missing directories...</source>
 <target>正在等待丢失的目录...</target>
 
-<source>An input folder name is empty.</source>
-<target>有一个输入的文件夹名为空.</target>
+<source>A folder input field is empty.</source>
+<target>有一个文件夹输入框为空.</target>
 
 <source>Logging</source>
 <target>记录</target>
@@ -348,26 +360,8 @@ The command is triggered if:
 <source>Custom</source>
 <target>自定义</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync 批处理文件</target>
-
-<source>FreeFileSync configuration</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>FreeFileSync batch</source>
+<target>FreeFileSync批处理文件</target>
 
 <source>Synchronization aborted!</source>
 <target>同步已被中止!</target>
@@ -390,8 +384,8 @@ The command is triggered if:
 <source>Unable to connect to sourceforge.net!</source>
 <target>无法链接到 Sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>FreeFileSync 有新版可用:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>已经有新版本的FreeFileSync可用:</target>
 
 <source>Download now?</source>
 <target>立即下载?</target>
@@ -435,6 +429,12 @@ The command is triggered if:
 <source>Extension</source>
 <target>扩展名</target>
 
+<source>Size:</source>
+<target>大小:</target>
+
+<source>Date:</source>
+<target>日期:</target>
+
 <source>Action</source>
 <target>动作</target>
 
@@ -468,6 +468,9 @@ The command is triggered if:
 <source>&New</source>
 <target>新建(&N)</target>
 
+<source>&Save</source>
+<target>保存(&S)</target>
+
 <source>&Language</source>
 <target>切换语言(&L)</target>
 
@@ -534,11 +537,8 @@ The command is triggered if:
 <source>Number of files and folders that will be deleted</source>
 <target>将被删除的文件和文件夹数</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>将被传输的数据总量</target>
-
-<source>Operation:</source>
-<target>操作:</target>
+<source>Total bytes to copy</source>
+<target>要复制的总字节数</target>
 
 <source>Items found:</source>
 <target>已找到的项目:</target>
@@ -546,10 +546,10 @@ The command is triggered if:
 <source>Speed:</source>
 <target>速度:</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>剩余时间:</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>已用时间:</target>
 
 <source>Batch job</source>
@@ -672,6 +672,15 @@ is the same
 <source>Source code written in C++ utilizing:</source>
 <target>源代码用如下C++工具写成:</target>
 
+<source>If you like FreeFileSync</source>
+<target>如果你喜欢 FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>通过PayPal捐赠</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>非常感谢以下本地化 FreeFileSync 的工作人员:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>欢迎反馈意见和提出建议</target>
 
@@ -684,39 +693,9 @@ is the same
 <source>Email</source>
 <target>邮箱</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>非常感谢以下本地化 FreeFileSync 的工作人员:</target>
-
-<source>If you like FreeFileSync</source>
-<target>如果你喜欢 FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>通过PayPal捐赠</target>
-
 <source>Published under the GNU General Public License</source>
 <target>在GNU通用公共许可下发布</target>
 
-<source>Ignore further errors</source>
-<target>忽略之后出现的错误</target>
-
-<source>Hide further error messages during the current process</source>
-<target>在当前进程中隐藏进一步的错误信息</target>
-
-<source>&Ignore</source>
-<target>忽略(&I)</target>
-
-<source>Do not show this dialog again</source>
-<target>不要再显示此对话框</target>
-
-<source>&Switch</source>
-<target>切换(&S)</target>
-
-<source>&Yes</source>
-<target>是(&Y)</target>
-
-<source>&No</source>
-<target>否(&N)</target>
-
 <source>Use Recycle Bin</source>
 <target>使用回收站</target>
 
@@ -789,6 +768,9 @@ 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>Find what:</source>
 <target>要查找什么:</target>
 
@@ -867,8 +849,14 @@ Note: File names must be relative to base directories!
 <source>Never save changes</source>
 <target>永不保存更改</target>
 
-<source>Save changes to current configuration?</source>
-<target>保存更改到当前配置?</target>
+<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>Configuration loaded!</source>
 <target>配置已加载!</target>
@@ -963,9 +951,6 @@ Note: File names must be relative to base directories!
 <source>All directories in sync!</source>
 <target>所有目录已同步!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>同步之前请先进行对比</target>
-
 <source>Comma separated list</source>
 <target>逗号分隔的列表</target>
 
@@ -1007,6 +992,24 @@ Note: File names must be relative to base directories!
 <pluralform>%y 中的 %x 行可见</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>忽略之后出现的错误</target>
+
+<source>&Ignore</source>
+<target>忽略(&I)</target>
+
+<source>&Switch</source>
+<target>切换(&S)</target>
+
+<source>Question</source>
+<target>问题</target>
+
+<source>&Yes</source>
+<target>是(&Y)</target>
+
+<source>&No</source>
+<target>否(&N)</target>
+
 <source>Scanning...</source>
 <target>正扫描...</target>
 
@@ -1182,6 +1185,9 @@ Note: File names must be relative to base directories!
 <source>Cannot delete directory %x.</source>
 <target>无法删除目录 %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>无法写入 %x 的文件属性.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>无法写入 %x 的最后修改时间.</target>
 
@@ -1206,9 +1212,6 @@ Note: File names must be relative to base directories!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>无法复制符号连接 %x 到 %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>无法写入 %x 的文件属性.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>无法复制文件 %x 到 %y.</target>
 
@@ -1233,11 +1236,8 @@ Note: File names must be relative to base directories!
 <source>No change since last synchronization!</source>
 <target>自从最后一次同步以来没有变动!</target>
 
-<source>Filter settings have changed!</source>
-<target>过滤设置已改变!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>此文件在最后一次同步中未被处理!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>根据当前设置相关的数据库入口并未同步.</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>设置默认的同步方向:旧文件会被新文件覆盖.</target>
@@ -1365,14 +1365,14 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>更新 %x 的属性</target>
 
-<source>Target folder name must not be empty.</source>
-<target>目标文件夹名必须不是空的.</target>
+<source>Target folder input field must not be empty.</source>
+<target>目标文件夹输入框必须不为空.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>存放历史版本的文件夹名必须不是空的.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>用于存放历史版本的文件夹输入框必须不为空.</target>
 
-<source>Source directory %x not found.</source>
-<target>来源目录 %x 无法找到.</target>
+<source>Source folder %x not found.</source>
+<target>无法找到源文件夹 %x.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>存在不可解决的冲突!</target>
@@ -1389,11 +1389,11 @@ Note: File names must be relative to base directories!
 <source>Not enough free disk space available in:</source>
 <target>没有足够的可用磁盘空间用于:</target>
 
-<source>Free disk space required:</source>
-<target>需要可用的磁盘空间:</target>
+<source>Required:</source>
+<target>必需:</target>
 
-<source>Free disk space available:</source>
-<target>可用磁盘空间:</target>
+<source>Available:</source>
+<target>可用:</target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>如下路径的回收站不可用! 文件会被永久删除:</target>
@@ -1404,6 +1404,9 @@ Note: File names must be relative to base directories!
 <source>Processing folder pair:</source>
 <target>正在处理成对文件夹:</target>
 
+<source>Target folder %x already existing.</source>
+<target>目标文件夹 %x 已经存在.</target>
+
 <source>Generating database...</source>
 <target>正在生成数据库...</target>
 
diff --git a/BUILD/Languages/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng
index 72e3cfe2..ab6f6be8 100644
--- a/BUILD/Languages/chinese_traditional.lng
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -10,6 +10,18 @@
 <source>Searching for folder %x...</source>
 <target>正在搜尋資料夾 %x...</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>Show in Explorer</source>
 <target>在資源管理器中顯示</target>
 
@@ -58,12 +70,6 @@
 <source>About</source>
 <target>關於</target>
 
-<source>Warning</source>
-<target>警告</target>
-
-<source>Question</source>
-<target>問題</target>
-
 <source>Confirm</source>
 <target>確認</target>
 
@@ -109,6 +115,9 @@
 <source>Info</source>
 <target>訊息</target>
 
+<source>Warning</source>
+<target>警告</target>
+
 <source>Fatal Error</source>
 <target>嚴重錯誤</target>
 
@@ -138,12 +147,6 @@
 <pluralform>%x 位元組</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>無法讀取檔案 %X。</target>
-
-<source>Cannot write file %x.</source>
-<target>無法寫入檔案 %X。</target>
-
 <source>Database file %x is incompatible.</source>
 <target>資料庫檔案 %x 是不相容的。</target>
 
@@ -153,9 +156,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>資料庫檔案 %x 並不存在。</target>
 
+<source>Database file is corrupt:</source>
+<target>資料庫檔案已損毀：</target>
+
 <source>Out of memory!</source>
 <target>記憶體不足！</target>
 
+<source>Cannot write file %x.</source>
+<target>無法寫入檔案 %X。</target>
+
+<source>Cannot read file %x.</source>
+<target>無法讀取檔案 %X。</target>
+
 <source>Database files do not share a common session.</source>
 <target>資料庫檔案不會共享一個共同的連線。</target>
 
@@ -202,6 +214,9 @@
 <source>/sec</source>
 <target>/秒</target>
 
+<source>Cannot find file %x.</source>
+<target>找不到檔案 %x。</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>檔案 %x 不包含一個有效的配置。</target>
 
@@ -226,14 +241,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>無法讀取下列XML元素：</target>
 
-<source>Cannot find file %x.</source>
-<target>找不到檔案 %x。</target>
-
 <source>&Open...</source>
 <target>開啟(&O)...</target>
 
-<source>&Save...</source>
-<target>儲存(&S)...</target>
+<source>Save &As...</source>
+<target>另存新檔(&A)...</target>
 
 <source>&Quit</source>
 <target>離開(&Q)</target>
@@ -309,8 +321,8 @@ The command is triggered if:
 <source>(Build: %x)</source>
 <target>(建立：%x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>即時同步配置</target>
+<source>All files</source>
+<target>所有檔案</target>
 
 <source>&Restore</source>
 <target>還原(&R)</target>
@@ -324,8 +336,8 @@ The command is triggered if:
 <source>Waiting for missing directories...</source>
 <target>等待缺少的目錄...</target>
 
-<source>An input folder name is empty.</source>
-<target>輸入的資料夾名稱為空。</target>
+<source>A folder input field is empty.</source>
+<target>資料夾輸入欄位是空的。</target>
 
 <source>Logging</source>
 <target>日誌記錄</target>
@@ -348,26 +360,8 @@ The command is triggered if:
 <source>Custom</source>
 <target>自訂</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync批次檔</target>
-
-<source>FreeFileSync configuration</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>FreeFileSync batch</source>
+<target>FreeFileSync批次處理</target>
 
 <source>Synchronization aborted!</source>
 <target>同步已中止！</target>
@@ -390,18 +384,18 @@ The command is triggered if:
 <source>Unable to connect to sourceforge.net!</source>
 <target>無法連接到sourceforge.net！</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>有較新版本的FreeFileSync可用：</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>FreeFileSync有新版本可用：</target>
 
 <source>Download now?</source>
 <target>要立即下載嗎？</target>
 
-<source>Information</source>
-<target>訊息</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync已經是最新版本！</target>
 
+<source>Information</source>
+<target>訊息</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>要每週自動檢查更新FreeFileSync嗎？</target>
 
@@ -435,6 +429,12 @@ The command is triggered if:
 <source>Extension</source>
 <target>擴展</target>
 
+<source>Size:</source>
+<target>大小：</target>
+
+<source>Date:</source>
+<target>資料：</target>
+
 <source>Action</source>
 <target>動作</target>
 
@@ -468,6 +468,9 @@ The command is triggered if:
 <source>&New</source>
 <target>新增專案(&N)</target>
 
+<source>&Save</source>
+<target>儲存(&S)</target>
+
 <source>&Language</source>
 <target>語言(&L)</target>
 
@@ -534,11 +537,8 @@ The command is triggered if:
 <source>Number of files and folders that will be deleted</source>
 <target>將被刪除的檔案和資料夾數量</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>將被傳輸的總資料量</target>
-
-<source>Operation:</source>
-<target>操作：</target>
+<source>Total bytes to copy</source>
+<target>要複製的位元組總數</target>
 
 <source>Items found:</source>
 <target>尋找項目：</target>
@@ -546,10 +546,10 @@ The command is triggered if:
 <source>Speed:</source>
 <target>速度：</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>剩餘時間：</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>經過時間：</target>
 
 <source>Batch job</source>
@@ -663,6 +663,15 @@ is the same
 <source>Source code written in C++ utilizing:</source>
 <target>使用C++編寫的原始碼</target>
 
+<source>If you like FreeFileSync</source>
+<target>如果你喜歡FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>使用PayPal捐款</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>非常感謝FreeFileSync當地語系化的工作人員：</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>歡迎反饋意見和建議</target>
 
@@ -675,39 +684,9 @@ is the same
 <source>Email</source>
 <target>信箱</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>非常感謝FreeFileSync當地語系化的工作人員：</target>
-
-<source>If you like FreeFileSync</source>
-<target>如果你喜歡FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>使用PayPal捐款</target>
-
 <source>Published under the GNU General Public License</source>
 <target>在GNU通用公共許可證下發佈</target>
 
-<source>Ignore further errors</source>
-<target>忽略進一步錯誤</target>
-
-<source>Hide further error messages during the current process</source>
-<target>在目前進程中隱藏進一步的錯誤訊息</target>
-
-<source>&Ignore</source>
-<target>忽略(&I)</target>
-
-<source>Do not show this dialog again</source>
-<target>不要再顯示此對話框</target>
-
-<source>&Switch</source>
-<target>切換(&S)</target>
-
-<source>&Yes</source>
-<target>是(&Y)</target>
-
-<source>&No</source>
-<target>否(&N)</target>
-
 <source>Use Recycle Bin</source>
 <target>使用資源回收筒</target>
 
@@ -780,6 +759,9 @@ 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>Find what:</source>
 <target>尋找內容：</target>
 
@@ -856,10 +838,16 @@ Note: File names must be relative to base directories!
 <target>配置已儲存！</target>
 
 <source>Never save changes</source>
-<target>從不儲存更改</target>
+<target>從不更改儲存</target>
+
+<source>Do you want to save changes to %x?</source>
+<target>是否要更改儲存到 %x？</target>
 
-<source>Save changes to current configuration?</source>
-<target>要儲存目前配置的更改嗎？</target>
+<source>Save</source>
+<target>儲存</target>
+
+<source>Don't Save</source>
+<target>不要儲存</target>
 
 <source>Configuration loaded!</source>
 <target>配置已載入！</target>
@@ -954,9 +942,6 @@ Note: File names must be relative to base directories!
 <source>All directories in sync!</source>
 <target>同步所有目錄！</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>執行同步前請先比對！</target>
-
 <source>Comma separated list</source>
 <target>逗號分隔清單</target>
 
@@ -998,6 +983,24 @@ Note: File names must be relative to base directories!
 <pluralform>顯示 %y 之 %x 行</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>忽略進一步錯誤</target>
+
+<source>&Ignore</source>
+<target>忽略(&I)</target>
+
+<source>&Switch</source>
+<target>切換(&S)</target>
+
+<source>Question</source>
+<target>問題</target>
+
+<source>&Yes</source>
+<target>是(&Y)</target>
+
+<source>&No</source>
+<target>否(&N)</target>
+
 <source>Scanning...</source>
 <target>正在掃瞄...</target>
 
@@ -1173,6 +1176,9 @@ Note: File names must be relative to base directories!
 <source>Cannot delete directory %x.</source>
 <target>無法刪除目錄 %x。</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>無法寫入 %x 的檔案屬性。</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>無法寫入 %x 的修改時間。</target>
 
@@ -1197,9 +1203,6 @@ Note: File names must be relative to base directories!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>無法複製符號連結 %x 到 %y。</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>無法寫入 %x 的檔案屬性。</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>無法複製檔案 %x 到 %y。</target>
 
@@ -1224,11 +1227,8 @@ Note: File names must be relative to base directories!
 <source>No change since last synchronization!</source>
 <target>自上次同步以來都沒有更改！</target>
 
-<source>Filter settings have changed!</source>
-<target>篩選器設定已更改！</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>上次同步時該檔案未被處理！</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>相應的資料庫條目在同步時，不考慮到目前的設定。</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>設定預設同步方向：舊檔案會被較新的檔案覆蓋。</target>
@@ -1356,14 +1356,14 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>正在更新 %x 個屬性</target>
 
-<source>Target folder name must not be empty.</source>
-<target>目的資料夾名稱不能為空。</target>
+<source>Target folder input field must not be empty.</source>
+<target>目標資料夾輸入欄位不能為空。</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>檔案版本控制資料夾的名稱不能為空。</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>版本控制資料夾輸入欄位不能為空。</target>
 
-<source>Source directory %x not found.</source>
-<target>來源目錄 %x 找不到。</target>
+<source>Source folder %x not found.</source>
+<target>來源資料夾 %x 找不到。</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>存在未解決的衝突！</target>
@@ -1380,11 +1380,11 @@ Note: File names must be relative to base directories!
 <source>Not enough free disk space available in:</source>
 <target>沒有足夠的可用空間：</target>
 
-<source>Free disk space required:</source>
-<target>所需要的可用磁碟空間：</target>
+<source>Required:</source>
+<target>必要：</target>
 
-<source>Free disk space available:</source>
-<target>可用磁碟空間：</target>
+<source>Available:</source>
+<target>可用：</target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>資源回收筒不可用於以下路徑！相反的，檔案將永遠被刪除：</target>
@@ -1395,6 +1395,9 @@ Note: File names must be relative to base directories!
 <source>Processing folder pair:</source>
 <target>處理一對資料夾：</target>
 
+<source>Target folder %x already existing.</source>
+<target>目標資料夾 %x 已存在。</target>
+
 <source>Generating database...</source>
 <target>正在產生資料庫...</target>
 
diff --git a/BUILD/Languages/croatian.lng b/BUILD/Languages/croatian.lng
index bad3c10d..6a07aff7 100644
--- a/BUILD/Languages/croatian.lng
+++ b/BUILD/Languages/croatian.lng
@@ -10,6 +10,18 @@
 <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>
+
+<source>Items remaining:</source>
+<target>Preostale stavke:</target>
+
+<source>Total time:</source>
+<target>Ukupno vrijeme:</target>
+
 <source>Show in Explorer</source>
 <target>Prikaži u Exploreru</target>
 
@@ -58,12 +70,6 @@
 <source>About</source>
 <target>O programu</target>
 
-<source>Warning</source>
-<target>Oprez</target>
-
-<source>Question</source>
-<target>Pitanje</target>
-
 <source>Confirm</source>
 <target>Potvrdi</target>
 
@@ -109,6 +115,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Oprez</target>
+
 <source>Fatal Error</source>
 <target>Kritična greška</target>
 
@@ -140,12 +149,6 @@
 <pluralform>%x Bajtova</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Ne mogu čitati datoteku</target>
-
-<source>Cannot write file %x.</source>
-<target>Ne mogu zapisati datoteku</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Datoteka baze %x je nekompatibilna</target>
 
@@ -155,9 +158,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Datoteka baze %x još ne postoji</target>
 
+<source>Database file is corrupt:</source>
+<target>Baza je oštećena:</target>
+
 <source>Out of memory!</source>
 <target>Nedostatak memorije</target>
 
+<source>Cannot write file %x.</source>
+<target>Ne mogu zapisati datoteku</target>
+
+<source>Cannot read file %x.</source>
+<target>Ne mogu čitati datoteku</target>
+
 <source>Database files do not share a common session.</source>
 <target>Datoteke baze ne dijele zajednički protokol</target>
 
@@ -208,6 +220,9 @@
 <source>/sec</source>
 <target>/sek</target>
 
+<source>Cannot find file %x.</source>
+<target>Ne mogu pronaći datoteku %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Datoteka %x ne sadrži valjanu konfiguraciju</target>
 
@@ -232,14 +247,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>Ne mogu čitati slijedeće XML elemente</target>
 
-<source>Cannot find file %x.</source>
-<target>Ne mogu pronaći datoteku %x.</target>
-
 <source>&Open...</source>
 <target>&Otvori...</target>
 
-<source>&Save...</source>
-<target>&Spremi...</target>
+<source>Save &As...</source>
+<target>Spremi kao...</target>
 
 <source>&Quit</source>
 <target>&Izlaz</target>
@@ -315,8 +327,8 @@ Naredba će biti pokrenuta ako se:
 <source>(Build: %x)</source>
 <target>(Inačnica: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>RealtimeSync postavke</target>
+<source>All files</source>
+<target>Sve datoteke</target>
 
 <source>&Restore</source>
 <target>&Vrati</target>
@@ -330,8 +342,8 @@ Naredba će biti pokrenuta ako se:
 <source>Waiting for missing directories...</source>
 <target>Čekam nedostajuće direktorije...</target>
 
-<source>An input folder name is empty.</source>
-<target>Ime ulazne mape je prazno.</target>
+<source>A folder input field is empty.</source>
+<target>Polje za odabir foldera je prazno.</target>
 
 <source>Logging</source>
 <target>Zapisivanje</target>
@@ -354,26 +366,8 @@ Naredba će biti pokrenuta ako se:
 <source>Custom</source>
 <target>Uobičajeno</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync slijedna datoteka</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync postavke</target>
-
-<source>Batch execution</source>
-<target>Slijedno izvršavanje</target>
-
-<source>Items processed:</source>
-<target>Obrađeni elementi:</target>
-
-<source>Items remaining:</source>
-<target>Preostale stavke:</target>
-
-<source>Total time:</source>
-<target>Ukupno vrijeme:</target>
-
-<source>Stop</source>
-<target>Zaustavi</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync slijedni zadatak</target>
 
 <source>Synchronization aborted!</source>
 <target>Sinkronizacija prekinuta!</target>
@@ -396,8 +390,8 @@ Naredba će biti pokrenuta ako se:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Ne mogu se povezati na sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>Dostupna je nova verzija FreeFileSync:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>Nova verzija FreeFileSync je dostupna:</target>
 
 <source>Download now?</source>
 <target>Preuzeti sada?</target>
@@ -441,6 +435,12 @@ Naredba će biti pokrenuta ako se:
 <source>Extension</source>
 <target>Ekstenzija</target>
 
+<source>Size:</source>
+<target>Veličina:</target>
+
+<source>Date:</source>
+<target>Datum:</target>
+
 <source>Action</source>
 <target>Radnja</target>
 
@@ -474,6 +474,9 @@ Naredba će biti pokrenuta ako se:
 <source>&New</source>
 <target>&Novo</target>
 
+<source>&Save</source>
+<target>&Spremi</target>
+
 <source>&Language</source>
 <target>&Jezik</target>
 
@@ -540,11 +543,8 @@ Naredba će biti pokrenuta ako se:
 <source>Number of files and folders that will be deleted</source>
 <target>Broj datoteka i mapa koje će se izbrisati</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Ukupna količina podataka koja će biti prebečana</target>
-
-<source>Operation:</source>
-<target>Operacija:</target>
+<source>Total bytes to copy</source>
+<target>Ukupno bajta za kopirati</target>
 
 <source>Items found:</source>
 <target>Pronađene stavke:</target>
@@ -552,11 +552,11 @@ Naredba će biti pokrenuta ako se:
 <source>Speed:</source>
 <target>Brzina:</target>
 
-<source>Remaining time:</source>
-<target>Vremena preostalo:</target>
+<source>Time remaining:</source>
+<target>Preostalo vremena:</target>
 
-<source>Elapsed time:</source>
-<target>Vremena prošlo:</target>
+<source>Time elapsed:</source>
+<target>Proteklo vremena:</target>
 
 <source>Batch job</source>
 <target>Slijedni zadatak</target>
@@ -678,6 +678,15 @@ jednak
 <source>Source code written in C++ utilizing:</source>
 <target>Izvorni kod napisan u C++ uz korištenje:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Ako volite FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>Doniraj s PayPal</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Zahvale za prijevod FreeFileSync idu:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>Povratne informacije i prijedlozi su dobrodošli</target>
 
@@ -690,39 +699,9 @@ jednak
 <source>Email</source>
 <target>Email</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Zahvale za prijevod FreeFileSync idu:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Ako volite FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Doniraj s PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Objavljeno pod licencom GNU General Public</target>
 
-<source>Ignore further errors</source>
-<target>Zanemari buduće greške</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Sakrij iduće poruke grešaka tokom slijedećeg procesa</target>
-
-<source>&Ignore</source>
-<target>&Ignoriraj</target>
-
-<source>Do not show this dialog again</source>
-<target>Ne prikazuj ovaj prozor ponovno</target>
-
-<source>&Switch</source>
-<target>&Zamjeni</target>
-
-<source>&Yes</source>
-<target>&Da</target>
-
-<source>&No</source>
-<target>&Ne</target>
-
 <source>Use Recycle Bin</source>
 <target>Uporabi Koš za smeće</target>
 
@@ -795,6 +774,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Statistics</source>
 <target>Statistika</target>
 
+<source>Do not show this dialog again</source>
+<target>Ne prikazuj ovaj prozor ponovno</target>
+
 <source>Find what:</source>
 <target>Nađi što</target>
 
@@ -873,8 +855,14 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Never save changes</source>
 <target>Nikad ne spremaj promjene</target>
 
-<source>Save changes to current configuration?</source>
-<target>Spremiti promjene na trenutne postavke?</target>
+<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>Configuration loaded!</source>
 <target>Postavke učitane!</target>
@@ -969,9 +957,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>All directories in sync!</source>
 <target>Svi direktoriji su sinkronizirani!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Molmo pokrenite Usporedbu prije sinkronizacije!</target>
-
 <source>Comma separated list</source>
 <target>Zarezom odvojene liste</target>
 
@@ -1021,6 +1006,24 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <pluralform>%x od %y redova u prikazu</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Zanemari buduće greške</target>
+
+<source>&Ignore</source>
+<target>&Ignoriraj</target>
+
+<source>&Switch</source>
+<target>&Zamjeni</target>
+
+<source>Question</source>
+<target>Pitanje</target>
+
+<source>&Yes</source>
+<target>&Da</target>
+
+<source>&No</source>
+<target>&Ne</target>
+
 <source>Scanning...</source>
 <target>Pregledajem...</target>
 
@@ -1206,6 +1209,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Cannot delete directory %x.</source>
 <target>Ne mogu izbrisati mapu %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Ne mogu zapisati svojstva od %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Ne mogu zapisati vrijeme izmjene %x.</target>
 
@@ -1230,9 +1236,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Ne mogu kopirati simboličnu poveznicu %x na %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Ne mogu zapisati svojstva od %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Ne mogu kopirati datoteku %x na %y.</target>
 
@@ -1257,11 +1260,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>No change since last synchronization!</source>
 <target>Nema promjena od zadnje sinkronizacije!</target>
 
-<source>Filter settings have changed!</source>
-<target>Filterske postavke su promjenjene!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Datoteka nije procesirana tokom prošle sinkronizacije !</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Spomenuti unosi baze nisu u sinkronizaciji gledajući trenutne postavke.</target>
 
 <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>
@@ -1389,13 +1389,13 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Updating attributes of %x</source>
 <target>Obnavljam atribute od %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Naziv odredišne mape ne može biti prazan.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Odredišna mapa ne može biti prazna</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Naziv mape za datotečni raspored ne može biti prazan</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>Mapa unosa ne smije biti prazan</target>
 
-<source>Source directory %x not found.</source>
+<source>Source folder %x not found.</source>
 <target>Izvorna mapa %x nije pronađena</target>
 
 <source>Unresolved conflicts existing!</source>
@@ -1413,11 +1413,11 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Not enough free disk space available in:</source>
 <target>Nedovoljno prostora na disku:</target>
 
-<source>Free disk space required:</source>
-<target>Potreban prostor na disku:</target>
+<source>Required:</source>
+<target>Potrebno:</target>
 
-<source>Free disk space available:</source>
-<target>Prostor na disku dostupan:</target>
+<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>
@@ -1428,6 +1428,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Processing folder pair:</source>
 <target>Obrađujem parove mapa:</target>
 
+<source>Target folder %x already existing.</source>
+<target>Odredišna mapa %x već postoji.</target>
+
 <source>Generating database...</source>
 <target>Izrađujem bazu podataka...</target>
 
diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng
index bfc42fc0..a294e21c 100644
--- a/BUILD/Languages/czech.lng
+++ b/BUILD/Languages/czech.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>O Programu</target>
 
-<source>Warning</source>
-<target>Varování</target>
-
-<source>Question</source>
-<target>Dotaz</target>
-
 <source>Confirm</source>
 <target>Potvrdit</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Varování</target>
+
 <source>Fatal Error</source>
 <target>Závažná chyba</target>
 
@@ -140,12 +137,6 @@
 <pluralform>%x B</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Nelze číst soubor %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Nelze zapsat soubor %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Chybný formát databáze %x.</target>
 
@@ -155,9 +146,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Databázový soubor %x neexistuje.</target>
 
+<source>Database file is corrupt:</source>
+<target>Databáze je poškozená:</target>
+
 <source>Out of memory!</source>
 <target>Nedostatek pracovní paměti!</target>
 
+<source>Cannot write file %x.</source>
+<target>Nelze zapsat soubor %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Nelze číst soubor %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Databázové soubory nejsou navzájem komplementární.</target>
 
@@ -208,6 +208,9 @@
 <source>/sec</source>
 <target>/s</target>
 
+<source>Cannot find file %x.</source>
+<target>Nelze najít soubor %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Soubor %x neobsahuje platnou konfiguraci.</target>
 
@@ -229,17 +232,14 @@
 <source>Volume name %x not part of file name %y!</source>
 <target>Disk %x není součástí jména souboru %y!</target>
 
-<source>Cannot find file %x.</source>
-<target>Nalze najít soubor %x.</target>
-
 <source>Cannot read the following XML elements:</source>
 <target>Nelze načíst následující XML elementy:</target>
 
 <source>&Open...</source>
 <target>&Otevřít...</target>
 
-<source>&Save...</source>
-<target>&Uložit</target>
+<source>Save &As...</source>
+<target>Uložit &jako...</target>
 
 <source>&Quit</source>
 <target>U&končit</target>
@@ -315,8 +315,8 @@ Příkaz je spuštěn když:
 <source>(Build: %x)</source>
 <target>(Build: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>Konfigurace RealtimeSync</target>
+<source>All files</source>
+<target>Všechny soubory</target>
 
 <source>&Restore</source>
 <target>&Obnovit</target>
@@ -330,7 +330,7 @@ Příkaz je spuštěn když:
 <source>Waiting for missing directories...</source>
 <target>Čekání na nedostupné adresáře...</target>
 
-<source>An input folder name is empty.</source>
+<source>A folder input field is empty.</source>
 <target>Není zadána vstupní složka.</target>
 
 <source>Logging</source>
@@ -354,11 +354,8 @@ Příkaz je spuštěn když:
 <source>Custom</source>
 <target>Vlastní</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync dávkový soubor</target>
-
-<source>FreeFileSync configuration</source>
-<target>Konfigurace FreeFileSync</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync dávka</target>
 
 <source>Batch execution</source>
 <target>Spuštění dávky</target>
@@ -396,18 +393,18 @@ Příkaz je spuštěn když:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Není možné se připojit k sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
+<source>A new version of FreeFileSync is available:</source>
 <target>Je dostupná novější verze FreeFileSync:</target>
 
 <source>Download now?</source>
 <target>Stáhnout nyní?</target>
 
-<source>Information</source>
-<target>Informace</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync je aktuální!</target>
 
+<source>Information</source>
+<target>Informace</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Chcete aby FreeFileSync automaticky zjišťoval aktualizace každý týden?</target>
 
@@ -441,6 +438,12 @@ Příkaz je spuštěn když:
 <source>Extension</source>
 <target>Přípona</target>
 
+<source>Size:</source>
+<target>Velikost:</target>
+
+<source>Date:</source>
+<target>Čas:</target>
+
 <source>Action</source>
 <target>Akce</target>
 
@@ -474,6 +477,9 @@ Příkaz je spuštěn když:
 <source>&New</source>
 <target>&Nový</target>
 
+<source>&Save</source>
+<target>&Uložit</target>
+
 <source>&Language</source>
 <target>&Jazyk</target>
 
@@ -540,11 +546,8 @@ Příkaz je spuštěn když:
 <source>Number of files and folders that will be deleted</source>
 <target>Počet souborů a složek ke smazání</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Celkový objem dat, který bude přenesen</target>
-
-<source>Operation:</source>
-<target>Operace:</target>
+<source>Total bytes to copy</source>
+<target>Celkový objem dat</target>
 
 <source>Items found:</source>
 <target>Nalezeno položek:</target>
@@ -552,10 +555,10 @@ Příkaz je spuštěn když:
 <source>Speed:</source>
 <target>Rychlost:</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>Zbývající čas:</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>Uplynulý čas:</target>
 
 <source>Batch job</source>
@@ -678,6 +681,15 @@ je stejný
 <source>Source code written in C++ utilizing:</source>
 <target>Zdrojový kód byl napsán kompletně v C++ s pomocí:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Pokud se Vám FreeFileSync líbí</target>
+
+<source>Donate with PayPal</source>
+<target>Přispět pomocí PayPal</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Poděkování za překlad FreeFileSync:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>Komentáře a náměty jsou vždy vítány</target>
 
@@ -690,39 +702,9 @@ je stejný
 <source>Email</source>
 <target>Napište</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Poděkování za překlad FreeFileSync:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Pokud se Vám FreeFileSync líbí</target>
-
-<source>Donate with PayPal</source>
-<target>Přispět pomocí PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Vydáno pod GNU General Public License (GPL)</target>
 
-<source>Ignore further errors</source>
-<target>Přeskočit další chyby</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Nezobrazovat další chybová hlášení během zpracování</target>
-
-<source>&Ignore</source>
-<target>&Pokračovat</target>
-
-<source>Do not show this dialog again</source>
-<target>Tento dialog již nezobrazovat</target>
-
-<source>&Switch</source>
-<target>&Přepnout</target>
-
-<source>&Yes</source>
-<target>&Ano</target>
-
-<source>&No</source>
-<target>&Ne</target>
-
 <source>Use Recycle Bin</source>
 <target>Použít Koš</target>
 
@@ -795,6 +777,9 @@ 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>
+<target>Tento dialog již nezobrazovat</target>
+
 <source>Find what:</source>
 <target>Najít:</target>
 
@@ -873,8 +858,14 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Never save changes</source>
 <target>Nikdy neukládat změny</target>
 
-<source>Save changes to current configuration?</source>
-<target>Uložit změny do aktuální konfigurace?</target>
+<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>
+<target>Neukládat</target>
 
 <source>Configuration loaded!</source>
 <target>Konfigurace načtena.</target>
@@ -969,9 +960,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>All directories in sync!</source>
 <target>Všechny adresáře jsou synchronizovány!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Prosím proveďte nejdřív porovnání před synchronizací!</target>
-
 <source>Comma separated list</source>
 <target>Text oddělený čárkami</target>
 
@@ -1021,6 +1009,24 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <pluralform>%x z %y řádků</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Přeskočit další chyby</target>
+
+<source>&Ignore</source>
+<target>&Pokračovat</target>
+
+<source>&Switch</source>
+<target>&Přepnout</target>
+
+<source>Question</source>
+<target>Dotaz</target>
+
+<source>&Yes</source>
+<target>&Ano</target>
+
+<source>&No</source>
+<target>&Ne</target>
+
 <source>Scanning...</source>
 <target>Zpracovávání...</target>
 
@@ -1206,6 +1212,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Cannot delete directory %x.</source>
 <target>Nelze smazat adresář %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Nelze zapsat atributy souboru %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Nelze nastavit atribut času změny pro %x.</target>
 
@@ -1230,9 +1239,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Nelze kopítovat zástupce %x do %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Nelze zapsat atributy souboru %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Nelze kopírovat soubor %x do %y.</target>
 
@@ -1257,11 +1263,8 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>No change since last synchronization!</source>
 <target>Žádné změny od poslední synchronizace!</target>
 
-<source>Filter settings have changed!</source>
-<target>Nastavení filtru bylo změněno!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Soubor nebyl poslední synchronizací zpracován!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Databázové položky nejsou podle aktuální konfigurace synchronní.</target>
 
 <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>
@@ -1389,14 +1392,14 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Updating attributes of %x</source>
 <target>Aktualizace atributů souboru %x</target>
 
-<source>Target folder name must not be empty.</source>
+<source>Target folder input field must not be empty.</source>
 <target>Cílová složka nesmí být prázdná.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
+<source>Folder input field for versioning must not be empty.</source>
 <target>Složka pro verzování souborů nesmí být prázdná.</target>
 
-<source>Source directory %x not found.</source>
-<target>Zdrojový adresář %x nelze najít.</target>
+<source>Source folder %x not found.</source>
+<target>Zdrojovou složku %x nelze najít.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Nevyřešené konflikty!</target>
@@ -1413,11 +1416,11 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Not enough free disk space available in:</source>
 <target>Nedostatek místa na disku:</target>
 
-<source>Free disk space required:</source>
-<target>Požadované volné místo na disku:</target>
+<source>Required:</source>
+<target>Požadováno</target>
 
-<source>Free disk space available:</source>
-<target>Volné místo k dispozici:</target>
+<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>
@@ -1428,6 +1431,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Processing folder pair:</source>
 <target>Zpracovávání adresářové páru:</target>
 
+<source>Target folder %x already existing.</source>
+<target>Cílova složka %x již existuje.</target>
+
 <source>Generating database...</source>
 <target>Vytváření databáze...</target>
 
diff --git a/BUILD/Languages/danish.lng b/BUILD/Languages/danish.lng
index 4c9c2cac..4ebecf69 100644
--- a/BUILD/Languages/danish.lng
+++ b/BUILD/Languages/danish.lng
@@ -10,6 +10,18 @@
 <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>
+
+<source>Items remaining:</source>
+<target>Enheder tilbage:</target>
+
+<source>Total time:</source>
+<target>Samlet tid:</target>
+
 <source>Show in Explorer</source>
 <target>Vis i Explorer</target>
 
@@ -58,12 +70,6 @@
 <source>About</source>
 <target>Om</target>
 
-<source>Warning</source>
-<target>Advarsel</target>
-
-<source>Question</source>
-<target>Spørgsmål</target>
-
 <source>Confirm</source>
 <target>Bekræft</target>
 
@@ -109,6 +115,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Advarsel</target>
+
 <source>Fatal Error</source>
 <target>Uoprettelig Fejl</target>
 
@@ -139,12 +148,6 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Kan ikke læse filen %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Kan ikke skrive filen %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Database filen %x er ikke kompatibel.</target>
 
@@ -154,9 +157,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Database filen %x findes ikke.</target>
 
+<source>Database file is corrupt:</source>
+<target>Database filen er ødelagt:</target>
+
 <source>Out of memory!</source>
 <target>Ude af hukommelse!</target>
 
+<source>Cannot write file %x.</source>
+<target>Kan ikke skrive filen %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Kan ikke læse filen %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Database filen kan ikke deles.</target>
 
@@ -205,6 +217,9 @@
 <source>/sec</source>
 <target>/sek</target>
 
+<source>Cannot find file %x.</source>
+<target>Kan ikke finde filen %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>%x indeholder ikke en gyldig konfiguration.</target>
 
@@ -229,14 +244,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>Kan ikke læse følgende XML emner:</target>
 
-<source>Cannot find file %x.</source>
-<target>Kan ikke finde filen %x.</target>
-
 <source>&Open...</source>
 <target>&Åben...</target>
 
-<source>&Save...</source>
-<target>&Gem...</target>
+<source>Save &As...</source>
+<target>Gem &Som...</target>
 
 <source>&Quit</source>
 <target>&Afslut</target>
@@ -312,8 +324,8 @@ Kommandoen udføres hvis:
 <source>(Build: %x)</source>
 <target>(Build: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>RealtimeSynk konfiguration</target>
+<source>All files</source>
+<target>Alle filer</target>
 
 <source>&Restore</source>
 <target>&Gendan</target>
@@ -327,8 +339,8 @@ Kommandoen udføres hvis:
 <source>Waiting for missing directories...</source>
 <target>Venter på manglende biblioteker...</target>
 
-<source>An input folder name is empty.</source>
-<target>Et mappe navn er blankt.</target>
+<source>A folder input field is empty.</source>
+<target>Et mappe felt er tomt.</target>
 
 <source>Logging</source>
 <target>Logger</target>
@@ -351,26 +363,8 @@ Kommandoen udføres hvis:
 <source>Custom</source>
 <target>Brugerdefineret</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync batch fil</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync konfiguration</target>
-
-<source>Batch execution</source>
-<target>Batch afvikling</target>
-
-<source>Items processed:</source>
-<target>Enheder behandlet:</target>
-
-<source>Items remaining:</source>
-<target>Enheder tilbage:</target>
-
-<source>Total time:</source>
-<target>Samlet tid:</target>
-
-<source>Stop</source>
-<target>Stop</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
 
 <source>Synchronization aborted!</source>
 <target>Synkronisering afbrudt!</target>
@@ -393,18 +387,18 @@ Kommandoen udføres hvis:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Kan ikke forbinde til sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>En nyere version af FreeFileSync er tilgængelig:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>En ny version af FreeFilesyns er tilgængelig:</target>
 
 <source>Download now?</source>
 <target>Download nu?</target>
 
-<source>Information</source>
-<target>Information</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync er opdateret!</target>
 
+<source>Information</source>
+<target>Information</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Skal FreeFileSync automatisk checke efter opdateringer hver uge?</target>
 
@@ -438,6 +432,12 @@ Kommandoen udføres hvis:
 <source>Extension</source>
 <target>Udvidelse</target>
 
+<source>Size:</source>
+<target>Størelse:</target>
+
+<source>Date:</source>
+<target>Dato:</target>
+
 <source>Action</source>
 <target>Handling</target>
 
@@ -471,6 +471,9 @@ Kommandoen udføres hvis:
 <source>&New</source>
 <target>&Ny</target>
 
+<source>&Save</source>
+<target>&Gem</target>
+
 <source>&Language</source>
 <target>&Sprog</target>
 
@@ -537,11 +540,8 @@ Kommandoen udføres hvis:
 <source>Number of files and folders that will be deleted</source>
 <target>Antal filer og mapper der vil blive slettet</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Samlet antal data der vil blive overført</target>
-
-<source>Operation:</source>
-<target>Igang:</target>
+<source>Total bytes to copy</source>
+<target>Samlet antal bytes der skal kopieres</target>
 
 <source>Items found:</source>
 <target>Enheder fundet:</target>
@@ -549,11 +549,11 @@ Kommandoen udføres hvis:
 <source>Speed:</source>
 <target>Hastighed:</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>Tid tilbage:</target>
 
-<source>Elapsed time:</source>
-<target>Tid gået:</target>
+<source>Time elapsed:</source>
+<target>Tid forbrugt:</target>
 
 <source>Batch job</source>
 <target>Batch job</target>
@@ -675,6 +675,15 @@ er det samme
 <source>Source code written in C++ utilizing:</source>
 <target>Source code skrevet i C++:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Hvis du kan lide FreeFileSync</target>
+
+<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>Feedback and suggestions are welcome</source>
 <target>Feedback og forslag er velkomne</target>
 
@@ -687,39 +696,9 @@ er det samme
 <source>Email</source>
 <target>E-mail</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Stor tak for lokalisering af FreeFileSync går til:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Hvis du kan lide FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Doner med PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Udgivet under GNU General Public Licence</target>
 
-<source>Ignore further errors</source>
-<target>Ignorer fremtidige fejl</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Skjul yderligere fejl beskeder under nuværende opgave</target>
-
-<source>&Ignore</source>
-<target>&Ignorer</target>
-
-<source>Do not show this dialog again</source>
-<target>Vis ikke denne dialog igen</target>
-
-<source>&Switch</source>
-<target>&Skift</target>
-
-<source>&Yes</source>
-<target>&Ja</target>
-
-<source>&No</source>
-<target>&Nej</target>
-
 <source>Use Recycle Bin</source>
 <target>Brug skraldespanden</target>
 
@@ -792,6 +771,9 @@ 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>Find what:</source>
 <target>Find:</target>
 
@@ -870,8 +852,14 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Never save changes</source>
 <target>Gem aldrig ændringer</target>
 
-<source>Save changes to current configuration?</source>
-<target>Gem ændringer til nuværende konfiguration?</target>
+<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>Configuration loaded!</source>
 <target>Konfiguration hentet!</target>
@@ -966,9 +954,6 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>All directories in sync!</source>
 <target>Alle biblioteker er synkroniseret!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Kør venligst en sammenligning inden synkronisering!</target>
-
 <source>Comma separated list</source>
 <target>Komma separeret list</target>
 
@@ -1014,6 +999,24 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <pluralform>%x af %y rækker</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ignorer fremtidige fejl</target>
+
+<source>&Ignore</source>
+<target>&Ignorer</target>
+
+<source>&Switch</source>
+<target>&Skift</target>
+
+<source>Question</source>
+<target>Spørgsmål</target>
+
+<source>&Yes</source>
+<target>&Ja</target>
+
+<source>&No</source>
+<target>&Nej</target>
+
 <source>Scanning...</source>
 <target>Skanner...</target>
 
@@ -1194,6 +1197,9 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Cannot delete directory %x.</source>
 <target>Kan ikke slette biblioteket %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Kan ikke skrive fil attributter til %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Kan ikke opdatere ændringstiden på %x.</target>
 
@@ -1218,9 +1224,6 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Kan ikke kopiere linket %x til %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Kan ikke skrive fil attributter til %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Kan ikke kopiere filen %x til %y.</target>
 
@@ -1245,11 +1248,8 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>No change since last synchronization!</source>
 <target>Ingen ændringer siden sidste synkronisering!</target>
 
-<source>Filter settings have changed!</source>
-<target>Filter indstillinger er ændret!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>filen blev ikke behandlet ved sidste synkronisering!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Databasen er ikke synkroniseret i forhold til nuværende indstillinger.</target>
 
 <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>
@@ -1377,14 +1377,14 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Updating attributes of %x</source>
 <target>Opdaterer attributter af %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Destinations makken må ikke være tom.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Destinations mappe feltet må ikke være tomt.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Mappe navnet for fil versionering må ikke være tomt.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>Mappe input feltet for versionering må ikke være tomt.</target>
 
-<source>Source directory %x not found.</source>
-<target>Kildebiblioteket %x blev ikke fundet.</target>
+<source>Source folder %x not found.</source>
+<target>Kilde mappen %x blev ikke fundet.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Er er uløste konflikter!</target>
@@ -1401,11 +1401,11 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Not enough free disk space available in:</source>
 <target>Ikke nok ledig diskplads på:</target>
 
-<source>Free disk space required:</source>
-<target>Krævet ledig diskplads:</target>
+<source>Required:</source>
+<target>Krævet:</target>
 
-<source>Free disk space available:</source>
-<target>Ledig diskplads tilgængelig:</target>
+<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>
@@ -1416,6 +1416,9 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Processing folder pair:</source>
 <target>Behandler mappe par:</target>
 
+<source>Target folder %x already existing.</source>
+<target>Destinations mappen %x eksisterer allerede.</target>
+
 <source>Generating database...</source>
 <target>Opretter database...</target>
 
diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng
index 08f738aa..7c79112d 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>Informatie</target>
 
-<source>Warning</source>
-<target>Waarschuwing</target>
-
-<source>Question</source>
-<target>Vraag</target>
-
 <source>Confirm</source>
 <target>Bevestig</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Waarschuwing</target>
+
 <source>Fatal Error</source>
 <target>Fatale fout</target>
 
@@ -139,12 +136,6 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Kan bestand %x niet vinden.</target>
-
-<source>Cannot write file %x.</source>
-<target>Kan bestand %x niet schrijven.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Database bestand %x is niet compatibel.</target>
 
@@ -154,9 +145,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Database bestand %x bestaat nog niet.</target>
 
+<source>Database file is corrupt:</source>
+<target></target>
+
 <source>Out of memory!</source>
 <target>Onvoldoende geheugen!</target>
 
+<source>Cannot write file %x.</source>
+<target>Kan bestand %x niet schrijven.</target>
+
+<source>Cannot read file %x.</source>
+<target>Kan bestand %x niet vinden.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Database bestanden delen geen gezamelijke sessie.</target>
 
@@ -205,6 +205,9 @@
 <source>/sec</source>
 <target>/sec</target>
 
+<source>Cannot find file %x.</source>
+<target>Kan bestand %x niet vinden.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Bestand %x bevat geen valide configuratie.</target>
 
@@ -229,14 +232,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>Kan de volgende XML elementen niet lezen:</target>
 
-<source>Cannot find file %x.</source>
-<target>Kan bestand %x niet vinden.</target>
-
 <source>&Open...</source>
 <target>&Open...</target>
 
-<source>&Save...</source>
-<target>&Opslaan...</target>
+<source>Save &As...</source>
+<target></target>
 
 <source>&Quit</source>
 <target>&Afsluiten</target>
@@ -327,8 +327,8 @@ De opdracht word geactiveerd als>:
 <source>Waiting for missing directories...</source>
 <target>Wacht op missende mappen...</target>
 
-<source>An input folder name is empty.</source>
-<target>Een input map naam is leeg.</target>
+<source>A folder input field is empty.</source>
+<target></target>
 
 <source>Logging</source>
 <target>Loggen</target>
@@ -351,8 +351,8 @@ De opdracht word geactiveerd als>:
 <source>Custom</source>
 <target>Aangepast</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync taakbestand</target>
+<source>FreeFileSync batch</source>
+<target></target>
 
 <source>Batch execution</source>
 <target>Taak uitvoeren</target>
@@ -390,8 +390,8 @@ De opdracht word geactiveerd als>:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Niet in staat verbinding te maken met sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>Een nieuwe versie van FreeFileSync is beschikbaar:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target></target>
 
 <source>Download now?</source>
 <target>Nu downloaden?</target>
@@ -435,6 +435,12 @@ De opdracht word geactiveerd als>:
 <source>Extension</source>
 <target>Extensie</target>
 
+<source>Size:</source>
+<target></target>
+
+<source>Date:</source>
+<target></target>
+
 <source>Action</source>
 <target>Actie</target>
 
@@ -468,6 +474,9 @@ De opdracht word geactiveerd als>:
 <source>&New</source>
 <target>&Nieuw</target>
 
+<source>&Save</source>
+<target></target>
+
 <source>&Language</source>
 <target>&Taal</target>
 
@@ -534,8 +543,8 @@ De opdracht word geactiveerd als>:
 <source>Number of files and folders that will be deleted</source>
 <target>Aantal bestanden en mappen die verwijderd zullen worden</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Totale hoeveelheid data die verplaatst wordt</target>
+<source>Total bytes to copy</source>
+<target></target>
 
 <source>Items found:</source>
 <target>Onderdelen gevonden:</target>
@@ -543,11 +552,11 @@ De opdracht word geactiveerd als>:
 <source>Speed:</source>
 <target>Snelheid:</target>
 
-<source>Remaining time:</source>
-<target>Benodigde tijd:</target>
+<source>Time remaining:</source>
+<target></target>
 
-<source>Elapsed time:</source>
-<target>Verstreken tijd:</target>
+<source>Time elapsed:</source>
+<target></target>
 
 <source>Batch job</source>
 <target>Taaklijst</target>
@@ -669,6 +678,15 @@ overeenkomt
 <source>Source code written in C++ utilizing:</source>
 <target>Broncode geschreven in C++ met behulp van:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Indien FreeFileSync u bevalt</target>
+
+<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>Feedback and suggestions are welcome</source>
 <target>Feedback en suggesties zijn welkom</target>
 
@@ -681,39 +699,9 @@ overeenkomt
 <source>Email</source>
 <target>E-mail</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Extra dank voor het vertalen van FreeFileSync gaat naar:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Indien FreeFileSync u bevalt</target>
-
-<source>Donate with PayPal</source>
-<target>Doneer met PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Gepubliceerd onder de GNU General Public License</target>
 
-<source>Ignore further errors</source>
-<target>Negeer verdere foutmeldingen</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Verberg eventuele foutmeldingen gedurende de huidige bewerking</target>
-
-<source>&Ignore</source>
-<target>&Negeren</target>
-
-<source>Do not show this dialog again</source>
-<target>Toon deze melding niet meer</target>
-
-<source>&Switch</source>
-<target>&Omschakelen</target>
-
-<source>&Yes</source>
-<target>&Ja</target>
-
-<source>&No</source>
-<target>&Nee</target>
-
 <source>Use Recycle Bin</source>
 <target>Gebruik de prullenbak</target>
 
@@ -786,6 +774,9 @@ 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>Find what:</source>
 <target>Vind wat:</target>
 
@@ -864,8 +855,14 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Never save changes</source>
 <target>Veranderingen nooit opslaan</target>
 
-<source>Save changes to current configuration?</source>
-<target>Veranderingen opslaan in de huidige configuratie?</target>
+<source>Do you want to save changes to %x?</source>
+<target></target>
+
+<source>Save</source>
+<target></target>
+
+<source>Don't Save</source>
+<target></target>
 
 <source>Configuration loaded!</source>
 <target>Configuratie geladen!</target>
@@ -960,9 +957,6 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>All directories in sync!</source>
 <target>Alle mappen zijn gesynchroniseerd!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Voer alstublieft eerst een Vergelijking uit voordat u synchroniseert.</target>
-
 <source>Comma separated list</source>
 <target>Komma gescheiden lijst</target>
 
@@ -1008,6 +1002,24 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <pluralform>%x van %y rijen in het overzicht</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Negeer verdere foutmeldingen</target>
+
+<source>&Ignore</source>
+<target>&Negeren</target>
+
+<source>&Switch</source>
+<target>&Omschakelen</target>
+
+<source>Question</source>
+<target>Vraag</target>
+
+<source>&Yes</source>
+<target>&Ja</target>
+
+<source>&No</source>
+<target>&Nee</target>
+
 <source>Scanning...</source>
 <target>Doorzoekt...</target>
 
@@ -1188,12 +1200,12 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Cannot delete directory %x.</source>
 <target>Kan bestand %x niet verwijderen.</target>
 
-<source>Cannot write modification time of %x.</source>
-<target>Kan wijzigings tijd van %x niet toevoegen.</target>
-
 <source>Cannot write file attributes of %x.</source>
 <target>Kan bestandskenmerken van %x niet schrijven.</target>
 
+<source>Cannot write modification time of %x.</source>
+<target>Kan wijzigings tijd van %x niet toevoegen.</target>
+
 <source>Cannot find system function %x.</source>
 <target>Kan systeemfunctie %x niet vinden.</target>
 
@@ -1239,11 +1251,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>No change since last synchronization!</source>
 <target>Geen veranderingen sinds de laatste synchronisatie!</target>
 
-<source>Filter settings have changed!</source>
-<target>Filter instellingen zijn veranderd!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Het bestand werd niet verwerkt tijdens de laatste synchronisatie!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target></target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Stel standaard synchronisatie richtingen in: Oude bestanden worden door nieuwere bestanden overschreven.</target>
@@ -1371,14 +1380,14 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Updating attributes of %x</source>
 <target>Attributen bijwerken van %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Doelmap mag geen lege naam hebben.</target>
+<source>Target folder input field must not be empty.</source>
+<target></target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Mapnaam voor bestandsversies mag niet leeg zijn.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target></target>
 
-<source>Source directory %x not found.</source>
-<target>Bronmap %x niet gevonden.</target>
+<source>Source folder %x not found.</source>
+<target></target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Er bestaan onopgeloste conflicten!</target>
@@ -1395,11 +1404,11 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Not enough free disk space available in:</source>
 <target>Niet genoeg vrije schijfruimte beschikbaar op:</target>
 
-<source>Free disk space required:</source>
-<target>Vrije ruimte op harde schrijf nodig:</target>
+<source>Required:</source>
+<target></target>
 
-<source>Free disk space available:</source>
-<target>Beschikbare vrije schijfruimte :</target>
+<source>Available:</source>
+<target></target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Prullenbak is niet beschikbaar voor de volgende locaties! De bestanden worden permanent verwijderd:</target>
@@ -1410,6 +1419,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Processing folder pair:</source>
 <target>Verwerking van gekoppelde mappen:</target>
 
+<source>Target folder %x already existing.</source>
+<target></target>
+
 <source>Generating database...</source>
 <target>Genereren van database...</target>
 
diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index 751cf0be..bd0cd650 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>About</target>
 
-<source>Warning</source>
-<target>Warning</target>
-
-<source>Question</source>
-<target>Question</target>
-
 <source>Confirm</source>
 <target>Confirm</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Warning</target>
+
 <source>Fatal Error</source>
 <target>Fatal Error</target>
 
@@ -139,12 +136,6 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Cannot read file %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Cannot write file %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Database file %x is incompatible.</target>
 
@@ -154,9 +145,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Database file %x does not yet exist.</target>
 
+<source>Database file is corrupt:</source>
+<target>Database file is corrupt:</target>
+
 <source>Out of memory!</source>
 <target>Out of memory!</target>
 
+<source>Cannot write file %x.</source>
+<target>Cannot write file %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Cannot read file %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Database files do not share a common session.</target>
 
@@ -205,6 +205,9 @@
 <source>/sec</source>
 <target>/sec</target>
 
+<source>Cannot find file %x.</source>
+<target>Cannot find file %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>File %x does not contain a valid configuration.</target>
 
@@ -226,17 +229,14 @@
 <source>Volume name %x not part of file name %y!</source>
 <target>Volume name %x not part of file name %y!</target>
 
-<source>Cannot find file %x.</source>
-<target>Cannot find file %x.</target>
-
 <source>Cannot read the following XML elements:</source>
 <target>Cannot read the following XML elements:</target>
 
 <source>&Open...</source>
 <target>&Open...</target>
 
-<source>&Save...</source>
-<target>&Save...</target>
+<source>Save &As...</source>
+<target>Save &As...</target>
 
 <source>&Quit</source>
 <target>&Quit</target>
@@ -312,8 +312,8 @@ The command is triggered if:
 <source>(Build: %x)</source>
 <target>(Build: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>RealtimeSync configuration</target>
+<source>All files</source>
+<target>All files</target>
 
 <source>&Restore</source>
 <target>&Restore</target>
@@ -327,8 +327,8 @@ The command is triggered if:
 <source>Waiting for missing directories...</source>
 <target>Waiting for missing directories...</target>
 
-<source>An input folder name is empty.</source>
-<target>An input folder name is empty.</target>
+<source>A folder input field is empty.</source>
+<target>A folder input field is empty.</target>
 
 <source>Logging</source>
 <target>Logging</target>
@@ -351,11 +351,8 @@ The command is triggered if:
 <source>Custom</source>
 <target>Custom</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync batch file</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync configuration</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
 
 <source>Batch execution</source>
 <target>Batch execution</target>
@@ -393,18 +390,18 @@ The command is triggered if:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Unable to connect to sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>A newer version of FreeFileSync is available:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>A new version of FreeFileSync is available:</target>
 
 <source>Download now?</source>
 <target>Download now?</target>
 
-<source>Information</source>
-<target>Information</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync is up to date!</target>
 
+<source>Information</source>
+<target>Information</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Do you want FreeFileSync to automatically check for updates every week?</target>
 
@@ -438,6 +435,12 @@ The command is triggered if:
 <source>Extension</source>
 <target>Extension</target>
 
+<source>Size:</source>
+<target>Size:</target>
+
+<source>Date:</source>
+<target>Date:</target>
+
 <source>Action</source>
 <target>Action</target>
 
@@ -471,6 +474,9 @@ The command is triggered if:
 <source>&New</source>
 <target>&New</target>
 
+<source>&Save</source>
+<target>&Save</target>
+
 <source>&Language</source>
 <target>&Language</target>
 
@@ -537,11 +543,8 @@ The command is triggered if:
 <source>Number of files and folders that will be deleted</source>
 <target>Number of files and folders that will be deleted</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Total amount of data that will be transferred</target>
-
-<source>Operation:</source>
-<target>Operation:</target>
+<source>Total bytes to copy</source>
+<target>Total bytes to copy</target>
 
 <source>Items found:</source>
 <target>Elements found:</target>
@@ -549,11 +552,11 @@ The command is triggered if:
 <source>Speed:</source>
 <target>Speed:</target>
 
-<source>Remaining time:</source>
-<target>Remaining time:</target>
+<source>Time remaining:</source>
+<target>Time remaining:</target>
 
-<source>Elapsed time:</source>
-<target>Elapsed time:</target>
+<source>Time elapsed:</source>
+<target>Time elapsed:</target>
 
 <source>Batch job</source>
 <target>Batch job</target>
@@ -675,6 +678,15 @@ is the same
 <source>Source code written in C++ utilizing:</source>
 <target>Source code written in C++ utilising:</target>
 
+<source>If you like FreeFileSync</source>
+<target>If you like FreeFileSync</target>
+
+<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>Feedback and suggestions are welcome</source>
 <target>Feedback and suggestions are welcome</target>
 
@@ -687,39 +699,9 @@ is the same
 <source>Email</source>
 <target>E-mail</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Big thanks for localising FreeFileSync goes out to:</target>
-
-<source>If you like FreeFileSync</source>
-<target>If you like FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Donate with PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Published under the GNU General Public Licence</target>
 
-<source>Ignore further errors</source>
-<target>Ignore further errors</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Hide further error messages during the current process</target>
-
-<source>&Ignore</source>
-<target>&Ignore</target>
-
-<source>Do not show this dialog again</source>
-<target>Do not show this dialogue again</target>
-
-<source>&Switch</source>
-<target>&Switch</target>
-
-<source>&Yes</source>
-<target>&Yes</target>
-
-<source>&No</source>
-<target>&No</target>
-
 <source>Use Recycle Bin</source>
 <target>Use Recycle Bin</target>
 
@@ -792,6 +774,9 @@ 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>Find what:</source>
 <target>Find what:</target>
 
@@ -870,8 +855,14 @@ Note: File names must be relative to base directories!
 <source>Never save changes</source>
 <target>Never save changes</target>
 
-<source>Save changes to current configuration?</source>
-<target>Save changes to current configuration?</target>
+<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>Configuration loaded!</source>
 <target>Configuration loaded!</target>
@@ -966,9 +957,6 @@ Note: File names must be relative to base directories!
 <source>All directories in sync!</source>
 <target>All directories in sync!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Please run a Compare first before synchronising!</target>
-
 <source>Comma separated list</source>
 <target>Comma separated list</target>
 
@@ -1014,6 +1002,24 @@ Note: File names must be relative to base directories!
 <pluralform>%x of %y rows in view</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ignore further errors</target>
+
+<source>&Ignore</source>
+<target>&Ignore</target>
+
+<source>&Switch</source>
+<target>&Switch</target>
+
+<source>Question</source>
+<target>Question</target>
+
+<source>&Yes</source>
+<target>&Yes</target>
+
+<source>&No</source>
+<target>&No</target>
+
 <source>Scanning...</source>
 <target>Scanning...</target>
 
@@ -1194,6 +1200,9 @@ Note: File names must be relative to base directories!
 <source>Cannot delete directory %x.</source>
 <target>Cannot delete directory %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Cannot write file attributes of %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Cannot write modification time of %x.</target>
 
@@ -1218,9 +1227,6 @@ Note: File names must be relative to base directories!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Cannot copy symbolic link %x to %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Cannot write file attributes of %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Cannot copy file %x to %y.</target>
 
@@ -1245,11 +1251,8 @@ Note: File names must be relative to base directories!
 <source>No change since last synchronization!</source>
 <target>No change since last synchronisation!</target>
 
-<source>Filter settings have changed!</source>
-<target>Filter settings have changed!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>The file was not processed by last synchronisation!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>The corresponding database entries are not in sync considering current settings.</target>
 
 <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>
@@ -1377,14 +1380,14 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>Updating attributes of %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Target folder name must not be empty.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Target folder input field must not be empty.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Folder name for file versioning must not be empty.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>Folder input field for versioning must not be empty.</target>
 
-<source>Source directory %x not found.</source>
-<target>Source directory %x not found.</target>
+<source>Source folder %x not found.</source>
+<target>Source folder %x not found.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Unresolved conflicts existing!</target>
@@ -1401,11 +1404,11 @@ Note: File names must be relative to base directories!
 <source>Not enough free disk space available in:</source>
 <target>Not enough free disk space available in:</target>
 
-<source>Free disk space required:</source>
-<target>Free disk space required:</target>
+<source>Required:</source>
+<target>Required:</target>
 
-<source>Free disk space available:</source>
-<target>Free disk space available:</target>
+<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>
@@ -1416,6 +1419,9 @@ Note: File names must be relative to base directories!
 <source>Processing folder pair:</source>
 <target>Processing folder pair:</target>
 
+<source>Target folder %x already existing.</source>
+<target>Target folder %x already existing.</target>
+
 <source>Generating database...</source>
 <target>Generating database...</target>
 
diff --git a/BUILD/Languages/finnish.lng b/BUILD/Languages/finnish.lng
index 8ccf5448..f67326e5 100644
--- a/BUILD/Languages/finnish.lng
+++ b/BUILD/Languages/finnish.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>Ohje</target>
 
-<source>Warning</source>
-<target>Varoitus</target>
-
-<source>Question</source>
-<target>Kysymys</target>
-
 <source>Confirm</source>
 <target>Vahvista</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Varoitus</target>
+
 <source>Fatal Error</source>
 <target>Kohtalokas virhe</target>
 
@@ -139,12 +136,6 @@
 <pluralform>%x tavua</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Lukeminen ei onnistu %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Kirjoittaminen ei onnistu %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Tietokanta %x vierasta muotoa.</target>
 
@@ -154,9 +145,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Tietokanta %x on vielä luomatta.</target>
 
+<source>Database file is corrupt:</source>
+<target>Tietokanta viottunut:</target>
+
 <source>Out of memory!</source>
 <target>Muisti loppui!</target>
 
+<source>Cannot write file %x.</source>
+<target>Kirjoittaminen ei onnistu %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Lukeminen ei onnistu %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Tietokannan tiedostot eri sessioista.</target>
 
@@ -205,6 +205,9 @@
 <source>/sec</source>
 <target>/s</target>
 
+<source>Cannot find file %x.</source>
+<target>Tiedosto %x ei löydy.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Tiedosto %x ei sisällä kelvollista kokoonpanoa.</target>
 
@@ -229,14 +232,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>XML elementit lukukelvottimia:</target>
 
-<source>Cannot find file %x.</source>
-<target>Tiedosto %x ei löydy.</target>
-
 <source>&Open...</source>
 <target>&Avaa...</target>
 
-<source>&Save...</source>
-<target>&Avaa...</target>
+<source>Save &As...</source>
+<target>Tallenna n&imellä...</target>
 
 <source>&Quit</source>
 <target>&Lopeta</target>
@@ -312,8 +312,8 @@ Käsky suoritetaan jos:
 <source>(Build: %x)</source>
 <target>(Versio: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>RealtimeSync Asetukset</target>
+<source>All files</source>
+<target>Kaikki tiedostot</target>
 
 <source>&Restore</source>
 <target>&Palauta</target>
@@ -327,8 +327,8 @@ Käsky suoritetaan jos:
 <source>Waiting for missing directories...</source>
 <target>Odottaa puuttuvia hakemistoja...</target>
 
-<source>An input folder name is empty.</source>
-<target>Tulohakemiston nimi on tyhjä.</target>
+<source>A folder input field is empty.</source>
+<target>Hakemiston syöte on tyhjä.</target>
 
 <source>Logging</source>
 <target>Kirjaa</target>
@@ -351,11 +351,8 @@ Käsky suoritetaan jos:
 <source>Custom</source>
 <target>Oma määritelmä</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync eräajotiedosto</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync asetukset</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync eräajo</target>
 
 <source>Batch execution</source>
 <target>Eräajon suoritus</target>
@@ -369,9 +366,6 @@ Käsky suoritetaan jos:
 <source>Total time:</source>
 <target>Kokonaisaika:</target>
 
-<source>Stop</source>
-<target>Seis</target>
-
 <source>Synchronization aborted!</source>
 <target>Täsmäytys lopetettiin!</target>
 
@@ -393,18 +387,18 @@ Käsky suoritetaan jos:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Yhteys sourceforge.net:n ei onnistu!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>FreeFileSync:n uusi versio on saatavilla:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>FreeFileSync:n uusi verio on saatavilla:</target>
 
 <source>Download now?</source>
 <target>Lataa nyt?</target>
 
-<source>Information</source>
-<target>Tietoja</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync on ajan tasalla!</target>
 
+<source>Information</source>
+<target>Tietoja</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Haluatko että FreeFileSync hakee päivityksiä automaattisesti viikoittain?</target>
 
@@ -438,6 +432,12 @@ Käsky suoritetaan jos:
 <source>Extension</source>
 <target>Laajennus</target>
 
+<source>Size:</source>
+<target>Koko:</target>
+
+<source>Date:</source>
+<target>Pvm:</target>
+
 <source>Action</source>
 <target>Suorita</target>
 
@@ -471,6 +471,9 @@ Käsky suoritetaan jos:
 <source>&New</source>
 <target>&Uusi</target>
 
+<source>&Save</source>
+<target>Tallenna</target>
+
 <source>&Language</source>
 <target>&Kieli</target>
 
@@ -537,11 +540,8 @@ Käsky suoritetaan jos:
 <source>Number of files and folders that will be deleted</source>
 <target>Poistettavien tiedostojen ja hakemistojen määrä</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Siirrettävän datan määrä</target>
-
-<source>Operation:</source>
-<target>Toiminto:</target>
+<source>Total bytes to copy</source>
+<target>Kopioitava määrä tavuja</target>
 
 <source>Items found:</source>
 <target>Osia löytyi:</target>
@@ -549,11 +549,11 @@ Käsky suoritetaan jos:
 <source>Speed:</source>
 <target>Nopeus:</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>Aikaa jäljellä:</target>
 
-<source>Elapsed time:</source>
-<target>Kulunut aika:</target>
+<source>Time elapsed:</source>
+<target>Aikaa kulunut:</target>
 
 <source>Batch job</source>
 <target>Eräajo</target>
@@ -675,6 +675,15 @@ on sama
 <source>Source code written in C++ utilizing:</source>
 <target>Koodikieli on C++ käyttäen:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Jos pidät FreeFileSync:tä</target>
+
+<source>Donate with PayPal</source>
+<target>Lahjoita PayPal:lla</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Suuret kiitokset FreeFileSync:n paikallistamisesta:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>Palaute ja uudet ideat ovat tervetulleita</target>
 
@@ -687,39 +696,9 @@ on sama
 <source>Email</source>
 <target>S-posti</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Suuret kiitokset FreeFileSync:n paikallistamisesta:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Jos pidät FreeFileSync:tä</target>
-
-<source>Donate with PayPal</source>
-<target>Lahjoita PayPal:lla</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Julkaistu lisenssillä GNU General Public License</target>
 
-<source>Ignore further errors</source>
-<target>Hylkää toistuvat virheviestit</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Piilota toistuvat virheet tässä suorituksessa</target>
-
-<source>&Ignore</source>
-<target>&Unohda</target>
-
-<source>Do not show this dialog again</source>
-<target>Älä enää näytä valintaikkunaa</target>
-
-<source>&Switch</source>
-<target>&Vaihda</target>
-
-<source>&Yes</source>
-<target>&Kyllä</target>
-
-<source>&No</source>
-<target>&Ei</target>
-
 <source>Use Recycle Bin</source>
 <target>Käytä Roskakoria</target>
 
@@ -792,6 +771,9 @@ 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>Find what:</source>
 <target>Etsi:</target>
 
@@ -870,8 +852,14 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Never save changes</source>
 <target>Älä tallenna muutoksia</target>
 
-<source>Save changes to current configuration?</source>
-<target>Tallenna asetuksiin tehdyt muutokset?</target>
+<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>
+<target>Älä tallenna</target>
 
 <source>Configuration loaded!</source>
 <target>Asetukset ladattu!</target>
@@ -966,9 +954,6 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>All directories in sync!</source>
 <target>Kaikki hakemistot täsmäävät!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Suorita Vertaile ennen täsmäystä.</target>
-
 <source>Comma separated list</source>
 <target>CSV-muotoinen lista</target>
 
@@ -1014,6 +999,24 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <pluralform>%x / %y:tä rivistä näytössä</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Hylkää toistuvat virheviestit</target>
+
+<source>&Ignore</source>
+<target>&Unohda</target>
+
+<source>&Switch</source>
+<target>&Vaihda</target>
+
+<source>Question</source>
+<target>Kysymys</target>
+
+<source>&Yes</source>
+<target>&Kyllä</target>
+
+<source>&No</source>
+<target>&Ei</target>
+
 <source>Scanning...</source>
 <target>Tiedostoja haetaan...</target>
 
@@ -1194,6 +1197,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Cannot delete directory %x.</source>
 <target>Hakemistoa %x ei voida poistaa.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Tiedoston %x ominaisuuksia ei voitu tallentaa.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Tiedoston %x muutosaikaa ei voida kirjoittaa.</target>
 
@@ -1218,9 +1224,6 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Pikakuviketta %x ei voida kopioida kohtaan %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Tiedoston %x ominaisuuksia ei voitu tallentaa.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Tiedostoa %x ei voida kopioida kohtaan %y.</target>
 
@@ -1245,11 +1248,8 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>No change since last synchronization!</source>
 <target>Ei muutoksia edellisen täsmäyksen jälkeen!</target>
 
-<source>Filter settings have changed!</source>
-<target>Suodinasetukset muutettu!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Tiedostoa ei käsitelty viime täsmäyksessä!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Käytetyn tietokannan tiedot eivät täsmää nykyisiin asetuksiin.</target>
 
 <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>
@@ -1377,13 +1377,13 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Updating attributes of %x</source>
 <target>Päivitän %x:n ominaisuudet</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Kohdehakemistolla on oltava nimi.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Kohde hakemiston kenttä on annettava.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Versioinnin kohdehakemistolla on oltava nimi.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>Kohde hakemiston version syötettävä.</target>
 
-<source>Source directory %x not found.</source>
+<source>Source folder %x not found.</source>
 <target>Lähdehakemisto %x ei löydy.</target>
 
 <source>Unresolved conflicts existing!</source>
@@ -1401,11 +1401,11 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Not enough free disk space available in:</source>
 <target>Vapaa levytila ei riitä:</target>
 
-<source>Free disk space required:</source>
-<target>Tarvittava vapaa levytila:</target>
+<source>Required:</source>
+<target>Vaadittu:</target>
 
-<source>Free disk space available:</source>
-<target>Levytilaa jäljellä:</target>
+<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>
@@ -1416,6 +1416,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Processing folder pair:</source>
 <target>Käsitellään hakemistoparia:</target>
 
+<source>Target folder %x already existing.</source>
+<target>Kohdehakemisto %x on olemassa.</target>
+
 <source>Generating database...</source>
 <target>
 Tietokanta luodaan.
diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng
index 65759025..6db32565 100644
--- a/BUILD/Languages/french.lng
+++ b/BUILD/Languages/french.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>A propos de</target>
 
-<source>Warning</source>
-<target>Attention</target>
-
-<source>Question</source>
-<target>Question</target>
-
 <source>Confirm</source>
 <target>Confirmation</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Attention</target>
+
 <source>Fatal Error</source>
 <target>Erreur Fatale</target>
 
@@ -139,12 +136,6 @@
 <pluralform>%x octets</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Impossible de lire le fichier %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Impossible d'écrire le fichier %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>La base de données %x n'est pas compatible.</target>
 
@@ -154,9 +145,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>La base de données %x n'existe plus.</target>
 
+<source>Database file is corrupt:</source>
+<target>Le fichier Base de données est endommagé :</target>
+
 <source>Out of memory!</source>
 <target>Mémoire insuffisante !</target>
 
+<source>Cannot write file %x.</source>
+<target>Impossible d'écrire le fichier %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Impossible de lire le fichier %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Les fichiers de la base de données ne font pas partie de la même session.</target>
 
@@ -205,6 +205,9 @@
 <source>/sec</source>
 <target>/sec</target>
 
+<source>Cannot find file %x.</source>
+<target>Impossible de trouver le fichier %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Le fichier %x ne contient pas une configuration valide.</target>
 
@@ -229,26 +232,23 @@
 <source>Cannot read the following XML elements:</source>
 <target>Impossible de lire les données XML suivantes :</target>
 
-<source>Cannot find file %x.</source>
-<target>Impossible de trouver le fichier %x.</target>
-
 <source>&Open...</source>
 <target>&Ouvrir...</target>
 
-<source>&Save...</source>
-<target>&Sauvegarder...</target>
+<source>Save &As...</source>
+<target>&Enregistrer sous ...</target>
 
 <source>&Quit</source>
 <target>&Quitter</target>
 
 <source>&Program</source>
-<target>&Actions</target>
+<target>&Tâche</target>
 
 <source>&Content</source>
 <target>&Contenu</target>
 
 <source>&About</source>
-<target>&A propos de</target>
+<target>A &Propos de</target>
 
 <source>&Help</source>
 <target>&Aide</target>
@@ -312,8 +312,8 @@ La commande est déclenchée si :
 <source>(Build: %x)</source>
 <target>(Généré : %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>Configuration RealtimeSync</target>
+<source>All files</source>
+<target>Tous les fichiers</target>
 
 <source>&Restore</source>
 <target>&Restaurer</target>
@@ -327,8 +327,8 @@ La commande est déclenchée si :
 <source>Waiting for missing directories...</source>
 <target>En attente des répertoires absents ...</target>
 
-<source>An input folder name is empty.</source>
-<target>Le nom d'un dossier entré est vide.</target>
+<source>A folder input field is empty.</source>
+<target>Une entrée dossier est vide.</target>
 
 <source>Logging</source>
 <target>Connexion</target>
@@ -351,11 +351,8 @@ La commande est déclenchée si :
 <source>Custom</source>
 <target>Personnaliser</target>
 
-<source>FreeFileSync batch file</source>
-<target>fichier batch FreeFileSync</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync configuration</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
 
 <source>Batch execution</source>
 <target>Exécution du traitement batch</target>
@@ -393,18 +390,18 @@ La commande est déclenchée si :
 <source>Unable to connect to sourceforge.net!</source>
 <target>Impossible de se connecter à sourceforge.net !</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>Une version plus récente de FreeFileSync est disponible :</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>Une nouvelle version de FreeFileSync est disponible</target>
 
 <source>Download now?</source>
 <target>Télécharger maintenant ?</target>
 
-<source>Information</source>
-<target>Information</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync est à jour !</target>
 
+<source>Information</source>
+<target>Information</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Voulez-vous que FreeFileSync recherche automatiquement une nouvelle version chaque semaine ?</target>
 
@@ -438,6 +435,12 @@ La commande est déclenchée si :
 <source>Extension</source>
 <target>Extension</target>
 
+<source>Size:</source>
+<target>Taille :</target>
+
+<source>Date:</source>
+<target>Date :</target>
+
 <source>Action</source>
 <target>Action</target>
 
@@ -471,6 +474,9 @@ La commande est déclenchée si :
 <source>&New</source>
 <target>&Nouveau</target>
 
+<source>&Save</source>
+<target>&Sauvegarder</target>
+
 <source>&Language</source>
 <target>&Langue</target>
 
@@ -537,11 +543,8 @@ La commande est déclenchée si :
 <source>Number of files and folders that will be deleted</source>
 <target>Nombre de fichiers et de dossiers qui seront supprimés</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Volume de données à transférer</target>
-
-<source>Operation:</source>
-<target>Opération :</target>
+<source>Total bytes to copy</source>
+<target>Nombre total d'octets à copier</target>
 
 <source>Items found:</source>
 <target>Elements trouvés :</target>
@@ -549,10 +552,10 @@ La commande est déclenchée si :
 <source>Speed:</source>
 <target>Vitesse :</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>Temps restant :</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>Temps écoulé :</target>
 
 <source>Batch job</source>
@@ -675,6 +678,15 @@ est identique
 <source>Source code written in C++ utilizing:</source>
 <target>Code source écrit en C++ utilisant :</target>
 
+<source>If you like FreeFileSync</source>
+<target>Si vous aimez FreeFileSync</target>
+
+<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>Feedback and suggestions are welcome</source>
 <target>Vos commentaires et vos suggestions sont les bienvenus</target>
 
@@ -687,39 +699,9 @@ est identique
 <source>Email</source>
 <target>Email</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Pour les traductions de FreeFileSync, un grand merci à :</target>
-
-<source>If you like FreeFileSync</source>
-<target>Si vous aimez FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Faites un don avec PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Publié sous licence GNU General Public License</target>
 
-<source>Ignore further errors</source>
-<target>Ignorer les erreurs suivantes</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Masquer les messages d'erreur suivants pendant le traitement</target>
-
-<source>&Ignore</source>
-<target>&Ignorer</target>
-
-<source>Do not show this dialog again</source>
-<target>Ne plus afficher ce message la prochaine fois</target>
-
-<source>&Switch</source>
-<target>&Changer</target>
-
-<source>&Yes</source>
-<target>&Oui</target>
-
-<source>&No</source>
-<target>&Non</target>
-
 <source>Use Recycle Bin</source>
 <target>Utiliser la Corbeille</target>
 
@@ -792,6 +774,9 @@ 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>Find what:</source>
 <target>Chercher cela :</target>
 
@@ -870,8 +855,14 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Never save changes</source>
 <target>Ne jamais enregistrer les modifications</target>
 
-<source>Save changes to current configuration?</source>
-<target>Voulez-vous enregistrer les modifications dans la configuration actuelle ?</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>
+
+<source>Don't Save</source>
+<target>Ne pas sauvegarder</target>
 
 <source>Configuration loaded!</source>
 <target>Configuration chargée !</target>
@@ -966,9 +957,6 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>All directories in sync!</source>
 <target>Tous les répertoires sont synchronisés !</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Veuillez lancer une Comparaison avant de lancer la synchronisation !</target>
-
 <source>Comma separated list</source>
 <target>Liste d'éléments séparés par une virgule</target>
 
@@ -1014,6 +1002,24 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <pluralform>%x of %y lignes affichées</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ignorer les erreurs suivantes</target>
+
+<source>&Ignore</source>
+<target>&Ignorer</target>
+
+<source>&Switch</source>
+<target>&Changer</target>
+
+<source>Question</source>
+<target>Question</target>
+
+<source>&Yes</source>
+<target>&Oui</target>
+
+<source>&No</source>
+<target>&Non</target>
+
 <source>Scanning...</source>
 <target>Lecture en cours...</target>
 
@@ -1129,7 +1135,7 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <target>Utiliser la Corbeille lors de la suppression ou du remplacement d'un fichier</target>
 
 <source>Versioning</source>
-<target>Choisir un dossier</target>
+<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>
@@ -1194,6 +1200,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Cannot delete directory %x.</source>
 <target>Impossible de supprimer le répertoire %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Impossible d'écrire les attributs de fichier de %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Impossible d'écrire la date de modification de %x.</target>
 
@@ -1218,9 +1227,6 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Impossible de copier le lien symbolique %x vers %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Impossible d'écrire les attributs de fichier de %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Impossible de copier le fichier %X vers %y.</target>
 
@@ -1245,11 +1251,8 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>No change since last synchronization!</source>
 <target>Aucun changement depuis la dernière synchronisation !</target>
 
-<source>Filter settings have changed!</source>
-<target>La configuration du filtre a changé !</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Le fichier n'a pas été traité par la dernière synchronisation !</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Les entrées de la Base de données ne sont pas synchronisées vu les paramètres actuels.</target>
 
 <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>
@@ -1377,14 +1380,14 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Updating attributes of %x</source>
 <target>Mise à jour des attributs de %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Le nom du dossier Destination ne doit pas etre vide.</target>
+<source>Target folder input field must not be empty.</source>
+<target>L'entrée dossier de destination ne doit pas être vide.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Le nom du dossier Version ne doit pas être vide.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>L'entrée dossier de gestion des versions ne doit pas être vide.</target>
 
-<source>Source directory %x not found.</source>
-<target>Impossible de trouver le répertoire source %x.</target>
+<source>Source folder %x not found.</source>
+<target>Dossier source %x non trouvé.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Il y a des conflits non résolus !</target>
@@ -1401,11 +1404,11 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Not enough free disk space available in:</source>
 <target>Espace disque insuffisant sur :</target>
 
-<source>Free disk space required:</source>
-<target>Espace disque nécessaire :</target>
+<source>Required:</source>
+<target>Requis :</target>
 
-<source>Free disk space available:</source>
-<target>Espace disque disponible :</target>
+<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>
@@ -1416,6 +1419,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Processing folder pair:</source>
 <target>Traitement de la paire de dossiers :</target>
 
+<source>Target folder %x already existing.</source>
+<target>Le dossier destination %x existe déjà.</target>
+
 <source>Generating database...</source>
 <target>Génération de la base de données...</target>
 
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index 78f2c847..9e8c9a8d 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>Über</target>
 
-<source>Warning</source>
-<target>Warnung</target>
-
-<source>Question</source>
-<target>Frage</target>
-
 <source>Confirm</source>
 <target>Bestätigen</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Warnung</target>
+
 <source>Fatal Error</source>
 <target>Schwerer Fehler</target>
 
@@ -139,12 +136,6 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Die Datei %x kann nicht gelesen werden.</target>
-
-<source>Cannot write file %x.</source>
-<target>Die Datei %x kann nicht geschrieben werden.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Die Datenbankdatei %x ist nicht kompatibel.</target>
 
@@ -154,9 +145,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Die Datenbankdatei %x existiert noch nicht.</target>
 
+<source>Database file is corrupt:</source>
+<target>Die Datenbankdatei ist beschädigt:</target>
+
 <source>Out of memory!</source>
 <target>Nicht genügend Arbeitsspeicher!</target>
 
+<source>Cannot write file %x.</source>
+<target>Die Datei %x kann nicht geschrieben werden.</target>
+
+<source>Cannot read file %x.</source>
+<target>Die Datei %x kann nicht gelesen werden.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Die Datenbankdateien teilen keine gemeinsame Sitzung.</target>
 
@@ -205,6 +205,9 @@
 <source>/sec</source>
 <target>/s</target>
 
+<source>Cannot find file %x.</source>
+<target>Die Datei %x wurde nicht gefunden.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Die Datei %x enthält keine gültige Konfiguration.</target>
 
@@ -229,14 +232,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>Die folgenden XML-Elemente können nicht gelesen werden:</target>
 
-<source>Cannot find file %x.</source>
-<target>Die Datei %x wurde nicht gefunden.</target>
-
 <source>&Open...</source>
 <target>Ö&ffnen...</target>
 
-<source>&Save...</source>
-<target>&Speichern...</target>
+<source>Save &As...</source>
+<target>Speichern &unter...</target>
 
 <source>&Quit</source>
 <target>&Beenden</target>
@@ -327,8 +327,8 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Waiting for missing directories...</source>
 <target>Warte auf fehlende Verzeichnisse...</target>
 
-<source>An input folder name is empty.</source>
-<target>Der Name eines Eingabeordners ist leer.</target>
+<source>A folder input field is empty.</source>
+<target>Ein Ordnereingabefeld ist leer.</target>
 
 <source>Logging</source>
 <target>Protokoll</target>
@@ -351,8 +351,8 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Custom</source>
 <target>Eigene</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync Batchdatei</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync Batch</target>
 
 <source>Batch execution</source>
 <target>Batchlauf</target>
@@ -376,7 +376,7 @@ Die Befehlszeile wird ausgelöst wenn:
 <target>Synchronisation mit Fehlern abgeschlossen!</target>
 
 <source>Nothing to synchronize!</source>
-<target>Nichts zu synchronisieren!</target>
+<target>Es gibt nichts zu synchronisieren!</target>
 
 <source>Synchronization completed successfully!</source>
 <target>Synchronisation erfolgreich abgeschlossen!</target>
@@ -390,8 +390,8 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Es konnte keine Verbindung zu Sourceforge.net aufgebaut werden!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>Eine neuere Version von FreeFileSync ist verfügbar:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>Eine neue Version von FreeFileSync ist verfügbar:</target>
 
 <source>Download now?</source>
 <target>Jetzt herunterladen?</target>
@@ -435,6 +435,12 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Extension</source>
 <target>Dateiendung</target>
 
+<source>Size:</source>
+<target>Größe:</target>
+
+<source>Date:</source>
+<target>Datum:</target>
+
 <source>Action</source>
 <target>Aktion</target>
 
@@ -468,6 +474,9 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>&New</source>
 <target>&Neu</target>
 
+<source>&Save</source>
+<target>&Speichern</target>
+
 <source>&Language</source>
 <target>&Sprache</target>
 
@@ -534,8 +543,8 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Number of files and folders that will be deleted</source>
 <target>Anzahl der zu löschenden Dateien und Ordner</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Gesamtmenge der zu übertragenden Daten</target>
+<source>Total bytes to copy</source>
+<target>Gesamtmenge der zu kopierenden Daten</target>
 
 <source>Items found:</source>
 <target>Gefundene Elemente:</target>
@@ -543,10 +552,10 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Speed:</source>
 <target>Geschwindigkeit:</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>Verbleibende Zeit:</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>Vergangene Zeit:</target>
 
 <source>Batch job</source>
@@ -669,6 +678,15 @@ gleich ist
 <source>Source code written in C++ utilizing:</source>
 <target>Sourcecode in C++ geschrieben mit Hilfe von:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Wenn Sie FreeFileSync mögen</target>
+
+<source>Donate with PayPal</source>
+<target>Mit PayPal spenden</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Vielen Dank für die Lokalisation von FreeFileSync an:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>Feedback und Vorschläge sind willkommen</target>
 
@@ -681,39 +699,9 @@ gleich ist
 <source>Email</source>
 <target>Email</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Vielen Dank für die Lokalisation von FreeFileSync an:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Wenn Sie FreeFileSync mögen</target>
-
-<source>Donate with PayPal</source>
-<target>Mit PayPal spenden</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Veröffentlicht unter der Allgemeinen Öffentlichen GNU-Lizenz</target>
 
-<source>Ignore further errors</source>
-<target>Weitere Fehler ignorieren</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Weitere Fehlermeldungen während des laufenden Prozesses ausblenden</target>
-
-<source>&Ignore</source>
-<target>&Ignorieren</target>
-
-<source>Do not show this dialog again</source>
-<target>Diesen Dialog nicht mehr anzeigen</target>
-
-<source>&Switch</source>
-<target>&Wechseln</target>
-
-<source>&Yes</source>
-<target>&Ja</target>
-
-<source>&No</source>
-<target>&Nein</target>
-
 <source>Use Recycle Bin</source>
 <target>Papierkorb verwenden</target>
 
@@ -786,6 +774,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Statistics</source>
 <target>Statistiken</target>
 
+<source>Do not show this dialog again</source>
+<target>Diesen Dialog nicht mehr anzeigen</target>
+
 <source>Find what:</source>
 <target>Suchen nach:</target>
 
@@ -864,8 +855,14 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Never save changes</source>
 <target>Änderungen niemals speichern</target>
 
-<source>Save changes to current configuration?</source>
-<target>Änderungen der aktuellen Konfiguration sichern?</target>
+<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>Configuration loaded!</source>
 <target>Konfiguration geladen!</target>
@@ -960,11 +957,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>All directories in sync!</source>
 <target>Alle Verzeichnisse sind synchron!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Vor der Synchronisation bitte zuerst einen Vergleich ausführen!</target>
-
 <source>Comma separated list</source>
-<target>Durch Komma getrennte Liste</target>
+<target>Kommagetrennte Liste</target>
 
 <source>Legend</source>
 <target>Legende</target>
@@ -1008,6 +1002,24 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <pluralform>Zeige %x von %y Zeilen</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Weitere Fehler ignorieren</target>
+
+<source>&Ignore</source>
+<target>&Ignorieren</target>
+
+<source>&Switch</source>
+<target>&Wechseln</target>
+
+<source>Question</source>
+<target>Frage</target>
+
+<source>&Yes</source>
+<target>&Ja</target>
+
+<source>&No</source>
+<target>&Nein</target>
+
 <source>Scanning...</source>
 <target>Suche Dateien...</target>
 
@@ -1188,12 +1200,12 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Cannot delete directory %x.</source>
 <target>Das Verzeichnis %x kann nicht gelöscht werden.</target>
 
-<source>Cannot write modification time of %x.</source>
-<target>Die Änderungszeit von %x kann nicht geschrieben werden.</target>
-
 <source>Cannot write file attributes of %x.</source>
 <target>Die Dateiattribute von %x können nicht geschrieben werden.</target>
 
+<source>Cannot write modification time of %x.</source>
+<target>Die Änderungszeit von %x kann nicht geschrieben werden.</target>
+
 <source>Cannot find system function %x.</source>
 <target>Die Systemfunktion %x wurde nicht gefunden.</target>
 
@@ -1239,11 +1251,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>No change since last synchronization!</source>
 <target>Keine Änderungen seit der letzten Synchronisation!</target>
 
-<source>Filter settings have changed!</source>
-<target>Die Filtereinstellungen wurden geändert!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Die Datei wurde in der letzten Synchronisation nicht verarbeitet!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Die entsprechenden Datenbankeinträge sind nicht synchron gemäß den aktuellen Einstellungen</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Setze Standardwerte für Synchronisationsrichtungen: Alte Dateien werden durch neuere überschrieben.</target>
@@ -1371,14 +1380,14 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Updating attributes of %x</source>
 <target>Aktualisiere Attribute von %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Der Name des Zielordners darf nicht leer sein.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Das Eingabefeld für den Zielordner darf nicht leer sein.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Der Ordnername für die Versionierung darf nicht leer sein.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>Das Eingabefeld für den Ordner für die Versionierung darf nicht leer sein.</target>
 
-<source>Source directory %x not found.</source>
-<target>Das Quellverzeichnis %x wurde nicht gefunden.</target>
+<source>Source folder %x not found.</source>
+<target>Der Quellordner %x wurde nicht gefunden.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Es existieren ungelöste Konflikte!</target>
@@ -1395,11 +1404,11 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Not enough free disk space available in:</source>
 <target>Nicht genügend freier Speicher verfügbar unter:</target>
 
-<source>Free disk space required:</source>
-<target>Benötigter freier Speicherplatz:</target>
+<source>Required:</source>
+<target>Benötigt:</target>
 
-<source>Free disk space available:</source>
-<target>Verfügbarer freier Speicherplatz:</target>
+<source>Available:</source>
+<target>Verfügbar:</target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Der Papierkorb ist auf nachfolgenden Verzeichnissen nicht verfügbar! Die Dateien werden stattdessen permanent gelöscht:</target>
@@ -1410,6 +1419,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Processing folder pair:</source>
 <target>Bearbeite Ordnerpaar:</target>
 
+<source>Target folder %x already existing.</source>
+<target>Der Zielordner %x existiert bereits.</target>
+
 <source>Generating database...</source>
 <target>Erzeuge Synchronisationsdatenbank...</target>
 
diff --git a/BUILD/Languages/greek.lng b/BUILD/Languages/greek.lng
index 0d750585..f75accaf 100644
--- a/BUILD/Languages/greek.lng
+++ b/BUILD/Languages/greek.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>Σχετικά με το...</target>
 
-<source>Warning</source>
-<target>Προειδοποίηση</target>
-
-<source>Question</source>
-<target>Ερώτηση</target>
-
 <source>Confirm</source>
 <target>Επιβεβαίωση</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Πληροφορία</target>
 
+<source>Warning</source>
+<target>Προειδοποίηση</target>
+
 <source>Fatal Error</source>
 <target>Σημαντικό Σφάλμα</target>
 
@@ -139,12 +136,6 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Δεν μπορεί να γίνει ανάγνωση του αρχείου %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Δεν μπορεί να γίνει εγγραφή του αρχείου %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Το αρχείο βάσης δεδομένων %x δεν είναι συμβατό</target>
 
@@ -154,9 +145,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Το αρχείο βάσης δεδομένων %x δεν υπάρχει ακόμα.</target>
 
+<source>Database file is corrupt:</source>
+<target>Το αρχείο βάσης δεδομένων είναι αλλοιωμένο:</target>
+
 <source>Out of memory!</source>
 <target>Ανεπαρκής μνήμη!</target>
 
+<source>Cannot write file %x.</source>
+<target>Δεν μπορεί να γίνει εγγραφή του αρχείου %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Δεν μπορεί να γίνει ανάγνωση του αρχείου %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Τα αρχεία βάσης δεδομένων δεν έχουν χρησιμοποιηθεί από κοινού σε συγχρονισμό.</target>
 
@@ -205,6 +205,9 @@
 <source>/sec</source>
 <target>/δευτερόλεπτο</target>
 
+<source>Cannot find file %x.</source>
+<target>Το αρχείο %x δε βρέθηκε.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Το αρχείο %x δεν περιέχει μια έγκυρη διάταξη.</target>
 
@@ -226,17 +229,14 @@
 <source>Volume name %x not part of file name %y!</source>
 <target>Το όνομα τόμου %x δεν είναι μέρος του ονόματος του αρχείου %y!</target>
 
-<source>Cannot find file %x.</source>
-<target>Το αρχείο %x δε βρέθηκε.</target>
-
 <source>Cannot read the following XML elements:</source>
 <target>Δεν ήταν δυνατό να αναγνωσθούν τα ακόλουθα στοιχεία XML:</target>
 
 <source>&Open...</source>
 <target>Ά&νοιγμα...</target>
 
-<source>&Save...</source>
-<target>Α&ποθήκευση...</target>
+<source>Save &As...</source>
+<target>Αποθή&κευση ως...</target>
 
 <source>&Quit</source>
 <target>Έ&ξοδος</target>
@@ -312,8 +312,8 @@ The command is triggered if:
 <source>(Build: %x)</source>
 <target>(Δημιουργήθηκε : %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>Διαμόρφωση του RealtimeSync</target>
+<source>All files</source>
+<target>Όλα τα αρχεία</target>
 
 <source>&Restore</source>
 <target>&Επαναφορά</target>
@@ -327,8 +327,8 @@ The command is triggered if:
 <source>Waiting for missing directories...</source>
 <target>Αναμονή για τους υποκαταλόγους που απουσιάζουν...</target>
 
-<source>An input folder name is empty.</source>
-<target>Το όνομα ενός υποκαταλόγου είναι κενό.</target>
+<source>A folder input field is empty.</source>
+<target>Ένα πεδίο εισαγωγής υποκαταλόγων είναι άδειο.</target>
 
 <source>Logging</source>
 <target>Καταγραφή μηνυμάτων</target>
@@ -351,11 +351,8 @@ The command is triggered if:
 <source>Custom</source>
 <target>Εξατομίκευση</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync αρχείο δέσμης</target>
-
-<source>FreeFileSync configuration</source>
-<target>Αρχείο διάταξης FreeFileSync</target>
+<source>FreeFileSync batch</source>
+<target>Δέσμη ενεργειών του FreeFileSync</target>
 
 <source>Batch execution</source>
 <target>Εκτέλεση δέσμης ενεργειών</target>
@@ -393,18 +390,18 @@ The command is triggered if:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Δεν είναι δυνατή η σύνδεση με το sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>Μια νεότερη έκδοση του FreeFileSync είναι διαθέσιμη:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>Μια νέα έκδοση του FreeFileSync είναι διαθέσιμη:</target>
 
 <source>Download now?</source>
 <target>Λήψη τώρα;</target>
 
-<source>Information</source>
-<target>Πληροφορία</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>Το FreeFileSync είναι ενημερωμένο!</target>
 
+<source>Information</source>
+<target>Πληροφορία</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Θέλετε το FreeFileSync να ελέγχει αυτόματα για ενημερώσεις κάθε εβδομάδα;</target>
 
@@ -438,6 +435,12 @@ The command is triggered if:
 <source>Extension</source>
 <target>Επέκταση</target>
 
+<source>Size:</source>
+<target>Μέγεθος:</target>
+
+<source>Date:</source>
+<target>Ημερομηνία:</target>
+
 <source>Action</source>
 <target>Ενέργεια</target>
 
@@ -471,6 +474,9 @@ The command is triggered if:
 <source>&New</source>
 <target>&Δημιουργία</target>
 
+<source>&Save</source>
+<target>Απο&θήκευση</target>
+
 <source>&Language</source>
 <target>&Γλώσσα</target>
 
@@ -537,11 +543,8 @@ The command is triggered if:
 <source>Number of files and folders that will be deleted</source>
 <target>Αριθμός αρχείων και υποκαταλόγων που θα διαγραφούν</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Συνολικός όγκος δεδομένων που θα μεταφερθούν</target>
-
-<source>Operation:</source>
-<target>Λειτουργία:</target>
+<source>Total bytes to copy</source>
+<target>Συνολικός αριθμός bytes προς αντιγραφή</target>
 
 <source>Items found:</source>
 <target>Βρέθηκαν στοιχεία:</target>
@@ -549,10 +552,10 @@ The command is triggered if:
 <source>Speed:</source>
 <target>Ταχύτητα:</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>Απομένει χρόνος:</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>Πέρασε χρόνος:</target>
 
 <source>Batch job</source>
@@ -675,6 +678,15 @@ is the same
 <source>Source code written in C++ utilizing:</source>
 <target>Ο πηγαίος κώδικας γράφτηκε σε C++ χρησιμοποιώντας τα:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Αν σας αρέσει το FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>Κάντε μια δωρεά μέσω PayPal</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Για τις μεταφράσεις του FreeFileSync, ευχαριστούμε τους:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>Τα σχόλια και οι προτάσεις σας είναι ευπρόσδεκτα</target>
 
@@ -687,39 +699,9 @@ is the same
 <source>Email</source>
 <target>Email</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Για τις μεταφράσεις του FreeFileSync, ευχαριστούμε τους:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Αν σας αρέσει το FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Κάντε μια δωρεά μέσω PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Διανέμεται υπό την Γενική Άδεια Δημόσιας Χρήσης GNU</target>
 
-<source>Ignore further errors</source>
-<target>Αγνόηση επόμενων σφαλμάτων</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Απόκρυψη επόμενων μηνυμάτων σφάλματος στην τρέχουσα διαδικασία</target>
-
-<source>&Ignore</source>
-<target>&Παράβλεψη</target>
-
-<source>Do not show this dialog again</source>
-<target>Να μην εμφανιστεί ξανά αυτό το μήνυμα</target>
-
-<source>&Switch</source>
-<target>&Εναλλαγή</target>
-
-<source>&Yes</source>
-<target>&Ναι</target>
-
-<source>&No</source>
-<target>&Όχι</target>
-
 <source>Use Recycle Bin</source>
 <target>Χρήση του Κάδου Ανακύκλωσης</target>
 
@@ -792,6 +774,9 @@ 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>Find what:</source>
 <target>Αναζήτηση του:</target>
 
@@ -870,8 +855,14 @@ Note: File names must be relative to base directories!
 <source>Never save changes</source>
 <target>Να μην αποθηκεύονται οι αλλαγές</target>
 
-<source>Save changes to current configuration?</source>
-<target>Να αποθηκευτούν οι αλλαγές στην τρέχουσα διάταξη;</target>
+<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>Configuration loaded!</source>
 <target>Η διάταξη έχει ανοιχθεί!</target>
@@ -966,9 +957,6 @@ Note: File names must be relative to base directories!
 <source>All directories in sync!</source>
 <target>Όλοι οι υποκατάλογοι είναι συγχρονισμένοι!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Παρακαλώ εκτελέστε πρώτα Σύγκριση πριν το Συγχρονισμό!</target>
-
 <source>Comma separated list</source>
 <target>Κατάλογος οριοθετημένος με κόμματα</target>
 
@@ -1014,6 +1002,24 @@ Note: File names must be relative to base directories!
 <pluralform>%x από τις %y φανερές γραμμές</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Αγνόηση επόμενων σφαλμάτων</target>
+
+<source>&Ignore</source>
+<target>&Παράβλεψη</target>
+
+<source>&Switch</source>
+<target>&Εναλλαγή</target>
+
+<source>Question</source>
+<target>Ερώτηση</target>
+
+<source>&Yes</source>
+<target>&Ναι</target>
+
+<source>&No</source>
+<target>&Όχι</target>
+
 <source>Scanning...</source>
 <target>Ανίχνευση...</target>
 
@@ -1194,6 +1200,9 @@ Note: File names must be relative to base directories!
 <source>Cannot delete directory %x.</source>
 <target>Δεν μπορεί να διαγραφεί ο υποκατάλογος %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Δεν μπορεί να γίνει εγγραφή των χαρακτηριστικών αρχείου του %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Δεν μπορεί να γίνει εγγραφή της ώρας τροποποίησης του %x.</target>
 
@@ -1218,9 +1227,6 @@ Note: File names must be relative to base directories!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Δεν μπορεί να αντιγραφεί ο συμβολικός δεσμός %x στο %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Δεν μπορεί να γίνει εγγραφή των χαρακτηριστικών αρχείου του %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Δεν μπορεί να αντιγραφεί το αρχείο %x στο %y.</target>
 
@@ -1245,11 +1251,8 @@ Note: File names must be relative to base directories!
 <source>No change since last synchronization!</source>
 <target>Καμία αλλαγή από τον προηγούμενο συγχρονισμό!</target>
 
-<source>Filter settings have changed!</source>
-<target>Οι ρυθμίσεις φίλτρου έχουν αλλάξει!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Το αρχείο δεν συμμετείχε στον τελευταίο συγχρονισμό!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Οι αντίστοιχες καταχωρήσεις του αρχείου δεδομένων δεν είναι συγχρονισμένες, λαμβάνοντας υπόψη τις τρέχουσες ρυθμίσεις.</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Ρύθμιση προεπιλεγμένης κατεύθυνσης συγχρονισμού: Τα νεότερα αρχεία θα αντικαταστήσουν τα παλιότερα.</target>
@@ -1377,14 +1380,14 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>Ενημέρωση των χαρακτηριστικών αρχείου του %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Ο υποκατάλογος στόχος πρέπει να μην είναι κενός</target>
+<source>Target folder input field must not be empty.</source>
+<target>Το πεδίο εισαγωγής του υποκαταλόγου-στόχου πρέπει να μην είναι κενό.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Το όνομα του υποκαταλόγου για τη διατήρηση παλιών εκδόσεων δεν μπορεί να είναι κενό.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>Το πεδίο εισαγωγής του υποκαταλόγου για διατήρηση παλιών εκδόσεων πρέπει να μην είναι κενό.</target>
 
-<source>Source directory %x not found.</source>
-<target>Ο υποκατάλογος πηγής %x δεν βρέθηκε.</target>
+<source>Source folder %x not found.</source>
+<target>Ο υποκατάλογος %x δε βρέθηκε.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Υπάρχουν ανεπίλυτες διενέξεις!</target>
@@ -1401,11 +1404,11 @@ Note: File names must be relative to base directories!
 <source>Not enough free disk space available in:</source>
 <target>Δεν υπάρχει αρκετός διαθέσιμος χώρος στο δίσκο:</target>
 
-<source>Free disk space required:</source>
-<target>Απαιτούμενος ελεύθερος χώρος δίσκου:</target>
+<source>Required:</source>
+<target>Απαιτείται:</target>
 
-<source>Free disk space available:</source>
-<target>Διαθέσιμος ελεύθερος χώρος δίσκου:</target>
+<source>Available:</source>
+<target>Διαθέσιμος:</target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Ο Κάδος Ανακύκλωσης δεν είναι διαθέσιμος για τις ακόλουθες διαδρομές! Τα αρχεία θα διαγραφούν μόνιμα:</target>
@@ -1416,6 +1419,9 @@ Note: File names must be relative to base directories!
 <source>Processing folder pair:</source>
 <target>Σύγκριση του ζεύγους υποκαταλόγων:</target>
 
+<source>Target folder %x already existing.</source>
+<target>Ο υποκατάλογος-στόχος %x υπάρχει ήδη.</target>
+
 <source>Generating database...</source>
 <target>Δημιουργία βάσης δεδομένων...</target>
 
diff --git a/BUILD/Languages/hebrew.lng b/BUILD/Languages/hebrew.lng
index e17ef10b..db4dd2c6 100644
--- a/BUILD/Languages/hebrew.lng
+++ b/BUILD/Languages/hebrew.lng
@@ -10,6 +10,18 @@
 <source>Searching for folder %x...</source>
 <target>מחפש את תיקייה %x...</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>Show in Explorer</source>
 <target>הראה בסייר הקבצים</target>
 
@@ -58,12 +70,6 @@
 <source>About</source>
 <target>אודות</target>
 
-<source>Warning</source>
-<target>אזהרה</target>
-
-<source>Question</source>
-<target>שאלה</target>
-
 <source>Confirm</source>
 <target>אשר</target>
 
@@ -109,6 +115,9 @@
 <source>Info</source>
 <target>מידע</target>
 
+<source>Warning</source>
+<target>אזהרה</target>
+
 <source>Fatal Error</source>
 <target>שגיאה פטלית</target>
 
@@ -139,24 +148,27 @@
 <pluralform>%x בייט</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>לא יכול לקרוא קובץ %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>לא יכול לכתוב קובץ %x.</target>
-
 <source>Database file %x is incompatible.</source>
-<target>קובץ בסיס נתונים %x אינו במבנה מתאים.</target>
+<target>קובץ מסד נתונים %x אינו במבנה מתאים.</target>
 
 <source>Initial synchronization:</source>
 <target>סנכרון ראשוני:</target>
 
 <source>Database file %x does not yet exist.</source>
-<target>קובץ בסיס נתונים %x אינו קיים עדיין.</target>
+<target>קובץ מסד נתונים %x אינו קיים עדיין.</target>
+
+<source>Database file is corrupt:</source>
+<target>קובץ מסד נתונים משובש:</target>
 
 <source>Out of memory!</source>
 <target>תם הזכרון!</target>
 
+<source>Cannot write file %x.</source>
+<target>לא יכול לכתוב קובץ %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>לא יכול לקרוא קובץ %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>קבצי הנתונים אינם כוללים מופע פעילות משותף.</target>
 
@@ -205,6 +217,9 @@
 <source>/sec</source>
 <target>/שנ</target>
 
+<source>Cannot find file %x.</source>
+<target>לא יכול למצוא קובץ %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>קובץ %x אינו כולל תצורה תקינה.</target>
 
@@ -229,14 +244,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>לא יכול לקרוא את שמות צמתי XML:</target>
 
-<source>Cannot find file %x.</source>
-<target>לא יכול למצוא קובץ %x.</target>
-
 <source>&Open...</source>
 <target>&פתח...</target>
 
-<source>&Save...</source>
-<target>&שמור...</target>
+<source>Save &As...</source>
+<target>שמור בשם&</target>
 
 <source>&Quit</source>
 <target>&יציאה</target>
@@ -312,8 +324,8 @@ The command is triggered if:
 <source>(Build: %x)</source>
 <target>(מבנה: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>RealtimeSync בקרת תצורה</target>
+<source>All files</source>
+<target>כל הקבצים</target>
 
 <source>&Restore</source>
 <target>&טען מחדש</target>
@@ -327,8 +339,8 @@ The command is triggered if:
 <source>Waiting for missing directories...</source>
 <target>מחכה למחיצות חסרות...</target>
 
-<source>An input folder name is empty.</source>
-<target>שם תיקיית קלט ריק.</target>
+<source>A folder input field is empty.</source>
+<target>שדה קלט תיקייה ריק.</target>
 
 <source>Logging</source>
 <target>רישום ביומן</target>
@@ -351,26 +363,8 @@ The command is triggered if:
 <source>Custom</source>
 <target>מותאם</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync קובץ אצווה</target>
-
-<source>FreeFileSync configuration</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>FreeFileSync batch</source>
+<target>אצוות FreeFileSync</target>
 
 <source>Synchronization aborted!</source>
 <target>סינכרון בוטל!</target>
@@ -393,8 +387,8 @@ The command is triggered if:
 <source>Unable to connect to sourceforge.net!</source>
 <target>אין תקשורת ל sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>קיימת גירסה חדשה יותר:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>גירסה חדשה של FreeFileSync זמינה:</target>
 
 <source>Download now?</source>
 <target>הורד עכשיו?</target>
@@ -438,6 +432,12 @@ The command is triggered if:
 <source>Extension</source>
 <target>סיומת</target>
 
+<source>Size:</source>
+<target>גודל:</target>
+
+<source>Date:</source>
+<target>תאריך:</target>
+
 <source>Action</source>
 <target>פעולה</target>
 
@@ -471,6 +471,9 @@ The command is triggered if:
 <source>&New</source>
 <target>&חדש</target>
 
+<source>&Save</source>
+<target>&שמור</target>
+
 <source>&Language</source>
 <target>&שפה</target>
 
@@ -537,8 +540,8 @@ The command is triggered if:
 <source>Number of files and folders that will be deleted</source>
 <target>מספר הקבצים והתיקיות שימחקו</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>סך הכל נתונים להעברה</target>
+<source>Total bytes to copy</source>
+<target>סה"כ בתים להעתיק</target>
 
 <source>Items found:</source>
 <target>אלמנטים נמצאו:</target>
@@ -546,11 +549,11 @@ The command is triggered if:
 <source>Speed:</source>
 <target>מהירות:</target>
 
-<source>Remaining time:</source>
-<target>זמן נותר:</target>
+<source>Time remaining:</source>
+<target>זמן שנשאר:</target>
 
-<source>Elapsed time:</source>
-<target>זמן עבר:</target>
+<source>Time elapsed:</source>
+<target>זמן שעבר:</target>
 
 <source>Batch job</source>
 <target>עבודת אצווה</target>
@@ -592,7 +595,7 @@ The command is triggered if:
 <target>בחר משתנה:</target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>זהה והפץ שינויים בשני הצדדים באמצעות שימוש בבסיס נתונים. מחיקות, שינויי שמות וסתירות מתגלים באופן אוטומטי.</target>
+<target>זהה והפץ שינויים בשני הצדדים באמצעות שימוש במסד נתונים. מחיקות, שינויי שמות וסתירות מתגלים באופן אוטומטי.</target>
 
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>גיבוי מראה של מחיצה ימנית. מחיצה שמאלית תתעדכן ותהיה זהה לימנית לאחר הסינכרון.</target>
@@ -672,6 +675,15 @@ is the same
 <source>Source code written in C++ utilizing:</source>
 <target>קוד מקור נכתב ב- C++ באמצעות:</target>
 
+<source>If you like FreeFileSync</source>
+<target>במידה ו-FreeFileSync מוצאת חן בעינכם</target>
+
+<source>Donate with PayPal</source>
+<target>תרום עם פייפל</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>תודות עבור עבודות התרגום של תוכנת הסנכרון:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>משוב והצעות יתקבלו בברכה</target>
 
@@ -684,39 +696,9 @@ is the same
 <source>Email</source>
 <target>דוא"ל:</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>תודות עבור עבודות התרגום של תוכנת הסנכרון:</target>
-
-<source>If you like FreeFileSync</source>
-<target>במידה ו-FreeFileSync מוצאת חן בעינכם</target>
-
-<source>Donate with PayPal</source>
-<target>תרום עם פייפל</target>
-
 <source>Published under the GNU General Public License</source>
 <target>מפורסם במסגרת GNU General Public License</target>
 
-<source>Ignore further errors</source>
-<target>התעלם משגיאות נוספות</target>
-
-<source>Hide further error messages during the current process</source>
-<target>הסתר הודעות שגיאה נוספות בהמשך התהליך הנוכחי</target>
-
-<source>&Ignore</source>
-<target>&התעלם</target>
-
-<source>Do not show this dialog again</source>
-<target>אל תראה מסך זה שנית</target>
-
-<source>&Switch</source>
-<target>&החלפה</target>
-
-<source>&Yes</source>
-<target>&כן</target>
-
-<source>&No</source>
-<target>&לא</target>
-
 <source>Use Recycle Bin</source>
 <target>השתמש בסל המיחזור</target>
 
@@ -789,6 +771,9 @@ 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>Find what:</source>
 <target>חפש מה:</target>
 
@@ -867,8 +852,14 @@ Note: File names must be relative to base directories!
 <source>Never save changes</source>
 <target>אל תשמור שינויים לעולם</target>
 
-<source>Save changes to current configuration?</source>
-<target>שמור שינויים לתצורה נוכחית?</target>
+<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>Configuration loaded!</source>
 <target>תצורה הוטענה!</target>
@@ -963,9 +954,6 @@ Note: File names must be relative to base directories!
 <source>All directories in sync!</source>
 <target>כל המחיצות מסונכרנות!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>הרץ השוואה לפני סנכרון!</target>
-
 <source>Comma separated list</source>
 <target>רשימה מופרדת פסיקים</target>
 
@@ -1011,6 +999,24 @@ Note: File names must be relative to base directories!
 <pluralform>%x מתוך %y שורות בתצוגה</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>התעלם משגיאות נוספות</target>
+
+<source>&Ignore</source>
+<target>&התעלם</target>
+
+<source>&Switch</source>
+<target>&החלפה</target>
+
+<source>Question</source>
+<target>שאלה</target>
+
+<source>&Yes</source>
+<target>&כן</target>
+
+<source>&No</source>
+<target>&לא</target>
+
 <source>Scanning...</source>
 <target>סורק...</target>
 
@@ -1191,6 +1197,9 @@ Note: File names must be relative to base directories!
 <source>Cannot delete directory %x.</source>
 <target>לא יכול למחוק מחיצה %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>לא יכול לכתוב תכונות קובץ של %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>לא יכול לרשום זמן שינוי של %x.</target>
 
@@ -1215,9 +1224,6 @@ Note: File names must be relative to base directories!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>לא יכול להעתיק קישור סימבולי %x אל %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>לא יכול לכתוב תכונות קובץ של %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>לא יכול להעתיק קובץ %x  אל %y.</target>
 
@@ -1242,11 +1248,8 @@ Note: File names must be relative to base directories!
 <source>No change since last synchronization!</source>
 <target>אין שינוי מאז הסנכרון האחרון!</target>
 
-<source>Filter settings have changed!</source>
-<target>קביעת המסנן שונו!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>קובץ זה לא טופל בסנכרון האחרון!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>ערכי מסד הנתונים המתאימים אינם מסונכרנים בהתחשב בהגדרות הנוכחיות.</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>בחר ברירת מחדל של סנכרון: קבצים ישנים ידרסו ע"י קבצים חדשים יותר.</target>
@@ -1374,14 +1377,14 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>מעדכן תכונות של %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>שם תיקיית מטרה אינו יכול להיות ריק.</target>
+<source>Target folder input field must not be empty.</source>
+<target>קלט תיקיית מטרה אינה יכול להיות ריק.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>שם תיקייה לגרסאות קבצים אינו יכול להיות ריק</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>קלט שדה תיקייה עבור גירסאות אינו יכול להיות ריק.</target>
 
-<source>Source directory %x not found.</source>
-<target>מחיצת מקור %x לא נמצאה.</target>
+<source>Source folder %x not found.</source>
+<target>תיקיית מקור %x לא נמצאת.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>קיים קונפליקט לא פתור!</target>
@@ -1398,11 +1401,11 @@ Note: File names must be relative to base directories!
 <source>Not enough free disk space available in:</source>
 <target>אין מספיק מקום דיסק פנוי ב:</target>
 
-<source>Free disk space required:</source>
-<target>מקום דיסק פנוי נדרש:</target>
+<source>Required:</source>
+<target>נדרש:</target>
 
-<source>Free disk space available:</source>
-<target>מקום פנוי בדיסק:</target>
+<source>Available:</source>
+<target>זמין:</target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>סל מחזור אינו זמין עבור הנתיבים הבאים! קבצים ימחקו לצמיתות:</target>
@@ -1413,8 +1416,11 @@ Note: File names must be relative to base directories!
 <source>Processing folder pair:</source>
 <target>מבצע זוג מחיצות:</target>
 
+<source>Target folder %x already existing.</source>
+<target>תיקיית מטרה %x כבר קיימת.</target>
+
 <source>Generating database...</source>
-<target>מיצר בסיס נתונים...</target>
+<target>מייצר מסד נתונים...</target>
 
 <source>Data verification error: Source and target file have different content!</source>
 <target>שגיאה של אימות נתונים קובץ מקור ומטרה בעלי תכולת נתונים שונה!</target>
diff --git a/BUILD/Languages/hungarian.lng b/BUILD/Languages/hungarian.lng
index d06b0529..f1b0ae8b 100644
--- a/BUILD/Languages/hungarian.lng
+++ b/BUILD/Languages/hungarian.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>A programról</target>
 
-<source>Warning</source>
-<target>Figyelem</target>
-
-<source>Question</source>
-<target>Kérdés</target>
-
 <source>Confirm</source>
 <target>Megerősítés</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Információ</target>
 
+<source>Warning</source>
+<target>Figyelem</target>
+
 <source>Fatal Error</source>
 <target>Kritikus hiba</target>
 
@@ -139,12 +136,6 @@
 <pluralform>%x Bájt</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>A következő fájl olvasása sikertelen: %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>A következő fájl írása sikertelen: %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Inkompatibilis adatbázisfájl: %x.</target>
 
@@ -154,9 +145,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>A következő adatbázisfájl nem létezik: %x.</target>
 
+<source>Database file is corrupt:</source>
+<target></target>
+
 <source>Out of memory!</source>
 <target>Elfogyott a szabad memória!</target>
 
+<source>Cannot write file %x.</source>
+<target>A következő fájl írása sikertelen: %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>A következő fájl olvasása sikertelen: %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Az adatbázisfájlok nem osztanak meg közös munkamenetet.</target>
 
@@ -205,6 +205,9 @@
 <source>/sec</source>
 <target>/másodperc</target>
 
+<source>Cannot find file %x.</source>
+<target>Nem található a következő fájl: %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>A következő fájl nem tartalmaz érvényes beállításokat: %x.</target>
 
@@ -229,14 +232,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>A következő XML elemek olvasása sikertelen:</target>
 
-<source>Cannot find file %x.</source>
-<target>Nem található a következő fájl: %x.</target>
-
 <source>&Open...</source>
 <target>&Megnyitás...</target>
 
-<source>&Save...</source>
-<target>Me&ntés...</target>
+<source>Save &As...</source>
+<target></target>
 
 <source>&Quit</source>
 <target>&Kilépés</target>
@@ -327,8 +327,8 @@ A parancs végrehajtódik, ha:
 <source>Waiting for missing directories...</source>
 <target>Várakozás a hiányzó mappákra...</target>
 
-<source>An input folder name is empty.</source>
-<target>A megadott mappa neve üres.</target>
+<source>A folder input field is empty.</source>
+<target></target>
 
 <source>Logging</source>
 <target>Naplózás</target>
@@ -351,8 +351,8 @@ A parancs végrehajtódik, ha:
 <source>Custom</source>
 <target>Egyedi</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync kötegelt fájl</target>
+<source>FreeFileSync batch</source>
+<target></target>
 
 <source>Batch execution</source>
 <target>Kötegelt végrehajtás</target>
@@ -390,8 +390,8 @@ A parancs végrehajtódik, ha:
 <source>Unable to connect to sourceforge.net!</source>
 <target>A csatlakozás a sourceforge.net-hez sikertelen!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>Elérhető a FreeFileSync egy újabb verziója:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target></target>
 
 <source>Download now?</source>
 <target>Letöltsem most?</target>
@@ -435,6 +435,12 @@ A parancs végrehajtódik, ha:
 <source>Extension</source>
 <target>Kiterjesztés</target>
 
+<source>Size:</source>
+<target></target>
+
+<source>Date:</source>
+<target></target>
+
 <source>Action</source>
 <target>Művelet</target>
 
@@ -468,6 +474,9 @@ A parancs végrehajtódik, ha:
 <source>&New</source>
 <target>&Új</target>
 
+<source>&Save</source>
+<target></target>
+
 <source>&Language</source>
 <target>&Nyelv</target>
 
@@ -534,8 +543,8 @@ A parancs végrehajtódik, ha:
 <source>Number of files and folders that will be deleted</source>
 <target>A törlendő fájlok és mappák száma</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>A mozgatandó adatok összmérete</target>
+<source>Total bytes to copy</source>
+<target></target>
 
 <source>Items found:</source>
 <target>Talált elemek száma:</target>
@@ -543,11 +552,11 @@ A parancs végrehajtódik, ha:
 <source>Speed:</source>
 <target>Sebesség:</target>
 
-<source>Remaining time:</source>
-<target>Hátralévő idő:</target>
+<source>Time remaining:</source>
+<target></target>
 
-<source>Elapsed time:</source>
-<target>Eltelt idő:</target>
+<source>Time elapsed:</source>
+<target></target>
 
 <source>Batch job</source>
 <target>Kötegelt feladat</target>
@@ -667,6 +676,18 @@ A fájlok megegyeznek, ha megegyezik
 <source>Source code written in C++ utilizing:</source>
 <target>A programot C++-ban fejlesztették a következők felhasználásával:</target>
 
+<source>If you like FreeFileSync</source>
+<target>FreeFileSync támogatása</target>
+
+<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>Feedback and suggestions are welcome</source>
 <target>Várjuk a visszajelzéseket és az ötleteket</target>
 
@@ -679,42 +700,9 @@ A fájlok megegyeznek, ha megegyezik
 <source>Email</source>
 <target>E-mail</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>If you like FreeFileSync</source>
-<target>FreeFileSync támogatása</target>
-
-<source>Donate with PayPal</source>
-<target>Ha szereted a FreeFileSync-et, támogasd a PayPal segítségével.</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Kiadva a GNU General Public License alatt</target>
 
-<source>Ignore further errors</source>
-<target>További hibák figyelmen kívül hagyása</target>
-
-<source>Hide further error messages during the current process</source>
-<target>A további hibaüzenetek elrejtése az aktuális folyamat során</target>
-
-<source>&Ignore</source>
-<target>&Kihagy</target>
-
-<source>Do not show this dialog again</source>
-<target>Ne mutasd újra ezt a párbeszédablakot</target>
-
-<source>&Switch</source>
-<target>&Váltás</target>
-
-<source>&Yes</source>
-<target>&Igen</target>
-
-<source>&No</source>
-<target>&Nem</target>
-
 <source>Use Recycle Bin</source>
 <target>Lomtár (Recycle Bin) használata</target>
 
@@ -787,6 +775,9 @@ 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>Find what:</source>
 <target>Mit keresünk:</target>
 
@@ -865,8 +856,14 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Never save changes</source>
 <target>Változtatások figyelmen kívül hagyása</target>
 
-<source>Save changes to current configuration?</source>
-<target>Mentsük az aktuális beállítások változásait?</target>
+<source>Do you want to save changes to %x?</source>
+<target></target>
+
+<source>Save</source>
+<target></target>
+
+<source>Don't Save</source>
+<target></target>
 
 <source>Configuration loaded!</source>
 <target>Beállítások betöltve!</target>
@@ -961,9 +958,6 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>All directories in sync!</source>
 <target>Minden mappa szinkronban!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Kérjük, futtass le egy összehasonlítást mielőtt szinkronizálnál!</target>
-
 <source>Comma separated list</source>
 <target>Comma separated values</target>
 
@@ -1009,6 +1003,24 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <pluralform>%x/%y sor a nézetben</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>További hibák figyelmen kívül hagyása</target>
+
+<source>&Ignore</source>
+<target>&Kihagy</target>
+
+<source>&Switch</source>
+<target>&Váltás</target>
+
+<source>Question</source>
+<target>Kérdés</target>
+
+<source>&Yes</source>
+<target>&Igen</target>
+
+<source>&No</source>
+<target>&Nem</target>
+
 <source>Scanning...</source>
 <target>Vizsgálat folyamatban...</target>
 
@@ -1189,12 +1201,12 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Cannot delete directory %x.</source>
 <target>A következő mappa törlése sikertelen: %x.</target>
 
-<source>Cannot write modification time of %x.</source>
-<target>Az utolsó módosítás dátumának a beállítása sikertelen a következő fájlnál: %x.</target>
-
 <source>Cannot write file attributes of %x.</source>
 <target>A következő fájl attribútumainak írása sikertelen: %x.</target>
 
+<source>Cannot write modification time of %x.</source>
+<target>Az utolsó módosítás dátumának a beállítása sikertelen a következő fájlnál: %x.</target>
+
 <source>Cannot find system function %x.</source>
 <target>Nem található a következő rendszerfunkció: %x.</target>
 
@@ -1240,11 +1252,8 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>No change since last synchronization!</source>
 <target>Az utolsó szinkronizálás után nem történt változás.</target>
 
-<source>Filter settings have changed!</source>
-<target>A szűrőbeállítások megváltoztak!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>A fájl nem lett feldolgozva az utolsó szinkronizáció alkalmával!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target></target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Alapértelmezett szinkronizációs irányok beállítása: a régebbi fájlok felülíródnak az újabbakkal.</target>
@@ -1372,14 +1381,14 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Updating attributes of %x</source>
 <target>A(z) %x attribútumainak frissítése</target>
 
-<source>Target folder name must not be empty.</source>
-<target>A célmappa nem lehet üres.</target>
+<source>Target folder input field must not be empty.</source>
+<target></target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>A fájlok verziókövetéséhez használatos mappa neve nem lehet üres.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target></target>
 
-<source>Source directory %x not found.</source>
-<target>Nem található a következő forrásmappa: %x.</target>
+<source>Source folder %x not found.</source>
+<target></target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Feloldatlan ütközések vannak!</target>
@@ -1396,11 +1405,11 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Not enough free disk space available in:</source>
 <target>Nincs elég szabad lemezterület:</target>
 
-<source>Free disk space required:</source>
-<target>Szükséges szabad lemezterület:</target>
+<source>Required:</source>
+<target></target>
 
-<source>Free disk space available:</source>
-<target>Szabad lemezterület:</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>
@@ -1411,6 +1420,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Processing folder pair:</source>
 <target>Mappapár feldolgozása:</target>
 
+<source>Target folder %x already existing.</source>
+<target></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 f80146fb..53e4b011 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -10,6 +10,18 @@
 <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>
+
+<source>Items remaining:</source>
+<target>Elementi rimanenti:</target>
+
+<source>Total time:</source>
+<target>Tempo totale:</target>
+
 <source>Show in Explorer</source>
 <target>Mostra in Esplora Risorse</target>
 
@@ -58,12 +70,6 @@
 <source>About</source>
 <target>Info su</target>
 
-<source>Warning</source>
-<target>Attenzione</target>
-
-<source>Question</source>
-<target>Domanda</target>
-
 <source>Confirm</source>
 <target>Conferma</target>
 
@@ -86,7 +92,7 @@
 <target>Mostra popup</target>
 
 <source>Show pop-up on errors or warnings</source>
-<target>Mostra popup di errori o avviso</target>
+<target>Mostra popup di errore o avviso</target>
 
 <source>Ignore errors</source>
 <target>Ignora errori</target>
@@ -109,6 +115,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Attenzione</target>
+
 <source>Fatal Error</source>
 <target>Errore fatale</target>
 
@@ -139,12 +148,6 @@
 <pluralform>%x Byte</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Impossibile leggere il file %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Impossibile scrivere il file %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Il file database %x non è compatibile.</target>
 
@@ -154,9 +157,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Il file database %x non è ancora stato creato.</target>
 
+<source>Database file is corrupt:</source>
+<target>Il file database è corrotto:</target>
+
 <source>Out of memory!</source>
 <target>Memoria insufficiente!</target>
 
+<source>Cannot write file %x.</source>
+<target>Impossibile scrivere il file %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Impossibile leggere il file %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>I file database non condividono una sessione comune.</target>
 
@@ -205,6 +217,9 @@
 <source>/sec</source>
 <target>/sec</target>
 
+<source>Cannot find file %x.</source>
+<target>Impossibile trovare il file %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Il file %x non contiene una configurazione valida.</target>
 
@@ -229,14 +244,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>Impossibile leggere i seguenti elementi XML:</target>
 
-<source>Cannot find file %x.</source>
-<target>Impossibile trovare il file %x.</target>
-
 <source>&Open...</source>
 <target>&Apri...</target>
 
-<source>&Save...</source>
-<target>&Salva...</target>
+<source>Save &As...</source>
+<target>Salva &Con nome...</target>
 
 <source>&Quit</source>
 <target>&Esci</target>
@@ -312,8 +324,8 @@ Il comando è attivato se:
 <source>(Build: %x)</source>
 <target>(Versione: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>Configurazione di RealtimeSync</target>
+<source>All files</source>
+<target>Tutti i file</target>
 
 <source>&Restore</source>
 <target>&Ripristina</target>
@@ -327,8 +339,8 @@ Il comando è attivato se:
 <source>Waiting for missing directories...</source>
 <target>In attesa delle cartelle mancanti...</target>
 
-<source>An input folder name is empty.</source>
-<target>Il nome di una cartella di input è vuoto.</target>
+<source>A folder input field is empty.</source>
+<target>Un campo cartella input è vuoto.</target>
 
 <source>Logging</source>
 <target>Registo attività</target>
@@ -351,26 +363,8 @@ Il comando è attivato se:
 <source>Custom</source>
 <target>Personalizza</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync file batch</target>
-
-<source>FreeFileSync configuration</source>
-<target>Configurazione di FreeFileSync</target>
-
-<source>Batch execution</source>
-<target>Esecuzione in batch</target>
-
-<source>Items processed:</source>
-<target>Elementi processati:</target>
-
-<source>Items remaining:</source>
-<target>Elementi rimanenti:</target>
-
-<source>Total time:</source>
-<target>Tempo totale:</target>
-
-<source>Stop</source>
-<target>Stop</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
 
 <source>Synchronization aborted!</source>
 <target>Sincronizzazione abortita!</target>
@@ -393,7 +387,7 @@ Il comando è attivato se:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Impossibile collegarsi a sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
+<source>A new version of FreeFileSync is available:</source>
 <target>E' disponibile una nuova versione di FreeFileSync:</target>
 
 <source>Download now?</source>
@@ -438,6 +432,12 @@ Il comando è attivato se:
 <source>Extension</source>
 <target>Estensione</target>
 
+<source>Size:</source>
+<target>Dimensione:</target>
+
+<source>Date:</source>
+<target>Data:</target>
+
 <source>Action</source>
 <target>Azioni</target>
 
@@ -471,6 +471,9 @@ Il comando è attivato se:
 <source>&New</source>
 <target>&Nuovo</target>
 
+<source>&Save</source>
+<target>&Salva</target>
+
 <source>&Language</source>
 <target>&Lingua</target>
 
@@ -537,8 +540,8 @@ Il comando è attivato se:
 <source>Number of files and folders that will be deleted</source>
 <target>Numero di file e cartelle che verranno eliminati</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Volume dei dati che verranno trasferiti</target>
+<source>Total bytes to copy</source>
+<target>Bytes totali da copiare</target>
 
 <source>Items found:</source>
 <target>Elementi trovati:</target>
@@ -546,14 +549,14 @@ Il comando è attivato se:
 <source>Speed:</source>
 <target>Velocita':</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>Tempo rimanente:</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>Tempo trascorso:</target>
 
 <source>Batch job</source>
-<target>Attivitò batch</target>
+<target>Attività batch</target>
 
 <source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
 <target>Crea un file batch per automatizzare la sincronizzazione. Doppio click su questo file o schedula nelle operazioni pianificate del tuo sistema: FreeFileSync.exe <nome file batch>.ffs_batch</target>
@@ -672,6 +675,15 @@ I file sono considerati identici se
 <source>Source code written in C++ utilizing:</source>
 <target>Codice sorgente scritto in C++ utilizzando:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Se ti piace FreeFileSync</target>
+
+<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>Feedback and suggestions are welcome</source>
 <target>Ogni commento o suggerimento è ben accetto</target>
 
@@ -684,39 +696,9 @@ I file sono considerati identici se
 <source>Email</source>
 <target>Email</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Per la traduzione di FreeFileSync, un grazie va a:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Se ti piace FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Fai una donazione con PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Pubblicato sotto licenza GNU General Public</target>
 
-<source>Ignore further errors</source>
-<target>Ignora i prossimi errori</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Non mostrare i successivi messaggi d'errore durante il processo corrente</target>
-
-<source>&Ignore</source>
-<target>&Ignora</target>
-
-<source>Do not show this dialog again</source>
-<target>Non visualizzare più questo messaggio</target>
-
-<source>&Switch</source>
-<target>&Passa</target>
-
-<source>&Yes</source>
-<target>&Si</target>
-
-<source>&No</source>
-<target>&No</target>
-
 <source>Use Recycle Bin</source>
 <target>Usa il Cestino</target>
 
@@ -789,6 +771,9 @@ 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>Find what:</source>
 <target>Trova questo:</target>
 
@@ -867,8 +852,14 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Never save changes</source>
 <target>Non salvare mai le modifiche</target>
 
-<source>Save changes to current configuration?</source>
-<target>Salvare i cambiamenti alla configurazione corrente?</target>
+<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>Configuration loaded!</source>
 <target>Configurazione caricata!</target>
@@ -963,9 +954,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>All directories in sync!</source>
 <target>Tutte le cartelle sincronizzate!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Prima di sincronizzare effettua una comparazione!</target>
-
 <source>Comma separated list</source>
 <target>Elenco elementi separati da virgola</target>
 
@@ -1011,6 +999,24 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <pluralform>%x di %y righe nella vista</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ignora i prossimi errori</target>
+
+<source>&Ignore</source>
+<target>&Ignora</target>
+
+<source>&Switch</source>
+<target>&Passa</target>
+
+<source>Question</source>
+<target>Domanda</target>
+
+<source>&Yes</source>
+<target>&Si</target>
+
+<source>&No</source>
+<target>&No</target>
+
 <source>Scanning...</source>
 <target>Scansione...</target>
 
@@ -1191,6 +1197,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Cannot delete directory %x.</source>
 <target>Impossibile eliminare la cartella %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Impossibile scrivere attributi file di %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Impossibile scrivere data e ora di modifica di %x.</target>
 
@@ -1215,9 +1224,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Impossibile copiare collegamento %x su %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Impossibile scrivere attributi file di %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Impossibile copiare file %x in %y.</target>
 
@@ -1242,11 +1248,8 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>No change since last synchronization!</source>
 <target>Nessun cambiamento dall'ultima sincronizzazione!</target>
 
-<source>Filter settings have changed!</source>
-<target>Le impostazioni del filtro sono cambiate!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Il file non era processato nell'ultima sincronizzazione!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Le voci del database corrispondenti non sono in sincronia con le impostazioni correnti.</target>
 
 <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>
@@ -1374,13 +1377,13 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Updating attributes of %x</source>
 <target>Aggiornamento attributi di %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Il nome della cartella di destinazione non può essere vuoto.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Il campo per la cartella di destinazione non può essere vuoto.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Il nome della cartella per le versioni dei file non può essere vuoto.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>Il campo per la cartella di versione non può essere vuoto.</target>
 
-<source>Source directory %x not found.</source>
+<source>Source folder %x not found.</source>
 <target>Cartella sorgente %x non trovata.</target>
 
 <source>Unresolved conflicts existing!</source>
@@ -1398,11 +1401,11 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Not enough free disk space available in:</source>
 <target>Spazio libero su disco insufficiente in:</target>
 
-<source>Free disk space required:</source>
-<target>Spazio libero su disco richiesto:</target>
+<source>Required:</source>
+<target>Richiesto:</target>
 
-<source>Free disk space available:</source>
-<target>Spazio libero su disco disponibile:</target>
+<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>
@@ -1413,6 +1416,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Processing folder pair:</source>
 <target>Elaborazione coppia di cartelle:</target>
 
+<source>Target folder %x already existing.</source>
+<target>La cartella di destinazione %x è già esistente.</target>
+
 <source>Generating database...</source>
 <target>Generazione database...</target>
 
diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng
index bd10d465..e40b6f92 100644
--- a/BUILD/Languages/japanese.lng
+++ b/BUILD/Languages/japanese.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>情報</target>
 
-<source>Warning</source>
-<target>警告</target>
-
-<source>Question</source>
-<target>質問</target>
-
 <source>Confirm</source>
 <target>確認</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>情報</target>
 
+<source>Warning</source>
+<target>警告</target>
+
 <source>Fatal Error</source>
 <target>致命的なエラー</target>
 
@@ -138,12 +135,6 @@
 <pluralform>%x バイト</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>ファイル %x を読み込めません.</target>
-
-<source>Cannot write file %x.</source>
-<target>ファイル %x に書き込めません.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>データベース %x とは互換性がありません.</target>
 
@@ -153,9 +144,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>データベース %x は存在しません.</target>
 
+<source>Database file is corrupt:</source>
+<target>破損しているデータベース:</target>
+
 <source>Out of memory!</source>
 <target>メモリが足りません!</target>
 
+<source>Cannot write file %x.</source>
+<target>ファイル %x に書き込めません.</target>
+
+<source>Cannot read file %x.</source>
+<target>ファイル %x を読み込めません.</target>
+
 <source>Database files do not share a common session.</source>
 <target>データベースは一般セッションで共有できません.</target>
 
@@ -202,6 +202,9 @@
 <source>/sec</source>
 <target>/秒</target>
 
+<source>Cannot find file %x.</source>
+<target>ファイル %x がみつかりません.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>ファイル %x には有効な構成が含まれていません.</target>
 
@@ -223,20 +226,17 @@
 <source>Volume name %x not part of file name %y!</source>
 <target>ボリューム名 %x にファイル名 %y はありません!</target>
 
-<source>Cannot find file %x.</source>
-<target>ファイル %x がみつかりません.</target>
-
 <source>Cannot read the following XML elements:</source>
 <target>次の XML要素を読み込めません:</target>
 
 <source>&Open...</source>
 <target>開く(&O)...</target>
 
-<source>&Save...</source>
-<target>保存(&S)...</target>
+<source>Save &As...</source>
+<target>別名保存(&A)...</target>
 
 <source>&Quit</source>
-<target>終了(&Q)(&Q)</target>
+<target>終了(&Q)</target>
 
 <source>&Program</source>
 <target>プログラム(&P)</target>
@@ -309,8 +309,8 @@ The command is triggered if:
 <source>(Build: %x)</source>
 <target>(ビルド: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>リアルタイム同期の構成設定</target>
+<source>All files</source>
+<target>すべてのファイル</target>
 
 <source>&Restore</source>
 <target>修復(&R)</target>
@@ -324,8 +324,8 @@ The command is triggered if:
 <source>Waiting for missing directories...</source>
 <target>見失ったディレクトリの待機中...</target>
 
-<source>An input folder name is empty.</source>
-<target>空のフォルダ名入力</target>
+<source>A folder input field is empty.</source>
+<target>フォルダ入力欄が空白です.</target>
 
 <source>Logging</source>
 <target>ログ</target>
@@ -348,11 +348,8 @@ The command is triggered if:
 <source>Custom</source>
 <target>カスタム</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync バッチファイル</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync 構成設定</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync 一括</target>
 
 <source>Batch execution</source>
 <target>一括処理を実行</target>
@@ -390,18 +387,18 @@ The command is triggered if:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Sourceforge.net に接続できません!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>FreeFileSync の新しいバージョンが利用可能です:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>FreeFileSync の新しいバージョンが利用できます:</target>
 
 <source>Download now?</source>
 <target>ダウンロードしますか?</target>
 
-<source>Information</source>
-<target>インフォメーション</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync は最新です!</target>
 
+<source>Information</source>
+<target>インフォメーション</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>FreeFileSync の更新確認を毎週自動的に行いますか?</target>
 
@@ -435,6 +432,12 @@ The command is triggered if:
 <source>Extension</source>
 <target>拡張子</target>
 
+<source>Size:</source>
+<target>サイズ:</target>
+
+<source>Date:</source>
+<target>日時:</target>
+
 <source>Action</source>
 <target>操作</target>
 
@@ -468,6 +471,9 @@ The command is triggered if:
 <source>&New</source>
 <target>新規(&N)</target>
 
+<source>&Save</source>
+<target>保存(&S)</target>
+
 <source>&Language</source>
 <target>使用言語(&L)</target>
 
@@ -534,11 +540,8 @@ The command is triggered if:
 <source>Number of files and folders that will be deleted</source>
 <target>削除されたファイル、およびフォルダの数</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>転送されたデータの総量</target>
-
-<source>Operation:</source>
-<target>操作:</target>
+<source>Total bytes to copy</source>
+<target>コピーする合計バイト</target>
 
 <source>Items found:</source>
 <target>見つかった要素:</target>
@@ -546,11 +549,11 @@ The command is triggered if:
 <source>Speed:</source>
 <target>速度:</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>残り時間:</target>
 
-<source>Elapsed time:</source>
-<target>経過時間:</target>
+<source>Time elapsed:</source>
+<target>経過時間</target>
 
 <source>Batch job</source>
 <target>一括処理</target>
@@ -672,6 +675,15 @@ is the same
 <source>Source code written in C++ utilizing:</source>
 <target>ソースコードは C++ で書かれています</target>
 
+<source>If you like FreeFileSync</source>
+<target>FreeFileSync が気に入った場合</target>
+
+<source>Donate with PayPal</source>
+<target>PayPal から寄付する</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>FreeFileSync のローカライズへの協力に感謝します:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>フィードバック、提案などはこちらから</target>
 
@@ -684,39 +696,9 @@ is the same
 <source>Email</source>
 <target>E-メール</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>FreeFileSync のローカライズへの協力に感謝します:</target>
-
-<source>If you like FreeFileSync</source>
-<target>FreeFileSync が気に入った場合</target>
-
-<source>Donate with PayPal</source>
-<target>PayPal から寄付する</target>
-
 <source>Published under the GNU General Public License</source>
 <target>GNU 一般共有使用許諾に基づき公開されています</target>
 
-<source>Ignore further errors</source>
-<target>以降のエラーを無視</target>
-
-<source>Hide further error messages during the current process</source>
-<target>現在の処理中は以降のエラーメッセージを表示しない</target>
-
-<source>&Ignore</source>
-<target>無視(&I)</target>
-
-<source>Do not show this dialog again</source>
-<target>次回から表示しない</target>
-
-<source>&Switch</source>
-<target>切り替え(&S)</target>
-
-<source>&Yes</source>
-<target>はい(&Y)</target>
-
-<source>&No</source>
-<target>いいえ(&N)</target>
-
 <source>Use Recycle Bin</source>
 <target>ゴミ箱を使用</target>
 
@@ -789,6 +771,9 @@ 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>Find what:</source>
 <target>検索語:</target>
 
@@ -867,8 +852,14 @@ Note: File names must be relative to base directories!
 <source>Never save changes</source>
 <target>変更を保存しない</target>
 
-<source>Save changes to current configuration?</source>
-<target>現在の構成の変更を保存しますか?</target>
+<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>Configuration loaded!</source>
 <target>構成設定を読み込み中!</target>
@@ -963,9 +954,6 @@ Note: File names must be relative to base directories!
 <source>All directories in sync!</source>
 <target>すべてのディレクトリを同期!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>同期処理を実行する前に比較を行ってください!</target>
-
 <source>Comma separated list</source>
 <target>カンマ区切り</target>
 
@@ -1007,6 +995,24 @@ Note: File names must be relative to base directories!
 <pluralform>%x / %y 行を表示</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>以降のエラーを無視</target>
+
+<source>&Ignore</source>
+<target>無視(&I)</target>
+
+<source>&Switch</source>
+<target>切り替え(&S)</target>
+
+<source>Question</source>
+<target>質問</target>
+
+<source>&Yes</source>
+<target>はい(&Y)</target>
+
+<source>&No</source>
+<target>いいえ(&N)</target>
+
 <source>Scanning...</source>
 <target>スキャン中...</target>
 
@@ -1182,6 +1188,9 @@ Note: File names must be relative to base directories!
 <source>Cannot delete directory %x.</source>
 <target>ディレクトリ %x を削除できません.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>%x のファイル属性を書き込めません.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>%x の更新時刻を書き込めませんでした.</target>
 
@@ -1206,9 +1215,6 @@ Note: File names must be relative to base directories!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>S リンクを %x から %y にコピーできません.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>%x のファイル属性を書き込めません.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>%x から %y にコピーできません.</target>
 
@@ -1233,11 +1239,8 @@ Note: File names must be relative to base directories!
 <source>No change since last synchronization!</source>
 <target>前回の同期以降、変更はありません!</target>
 
-<source>Filter settings have changed!</source>
-<target>フィルター設定は変更されています!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>このファイルは最後の同期操作時に処理されていません!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>現在の設定で同期を行うための、対応したデータベースエントリが存在しません.</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>同期方向のデフォルト設定: 古いファイルに新しいファイルを上書き</target>
@@ -1365,14 +1368,14 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>%x の属性を更新</target>
 
-<source>Target folder name must not be empty.</source>
-<target>対象フォルダ名に空白は使用出来ません.</target>
+<source>Target folder input field must not be empty.</source>
+<target>対象フォルダ入力欄が空白になっています.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>ファイルバージョンのフォルダ名に空白は使用出来ません.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>バージョン管理のためフォルダ入力欄に空白は使えません.</target>
 
-<source>Source directory %x not found.</source>
-<target>ソースディレクトリ %x がみつかりません.</target>
+<source>Source folder %x not found.</source>
+<target>ソースフォルダ %x が見つかりません</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>未解決の不一致があります!</target>
@@ -1389,11 +1392,11 @@ Note: File names must be relative to base directories!
 <source>Not enough free disk space available in:</source>
 <target>利用可能なディスク空き容量が足りません:</target>
 
-<source>Free disk space required:</source>
-<target>必要なディスク空き容量:</target>
+<source>Required:</source>
+<target>必須:</target>
 
-<source>Free disk space available:</source>
-<target>利用可能なディスク空き容量:</target>
+<source>Available:</source>
+<target>利用可能:</target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>以下のパスにあるゴミ箱が利用できません! 代わりにファイルは完全削除されます:</target>
@@ -1404,6 +1407,9 @@ Note: File names must be relative to base directories!
 <source>Processing folder pair:</source>
 <target>フォルダペアを処理中:</target>
 
+<source>Target folder %x already existing.</source>
+<target>対象フォルダ %x は既に存在します.</target>
+
 <source>Generating database...</source>
 <target>データベースを作成中...</target>
 
diff --git a/BUILD/Languages/korean.lng b/BUILD/Languages/korean.lng
index 47561dfe..79f58d51 100644
--- a/BUILD/Languages/korean.lng
+++ b/BUILD/Languages/korean.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>상세 정보</target>
 
-<source>Warning</source>
-<target>경고</target>
-
-<source>Question</source>
-<target>질문</target>
-
 <source>Confirm</source>
 <target>확인</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>정보</target>
 
+<source>Warning</source>
+<target>경고</target>
+
 <source>Fatal Error</source>
 <target>치명적 오류</target>
 
@@ -138,12 +135,6 @@
 <pluralform>%x 바이트</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>파일 %x 을(를) 읽을 수 없습니다.</target>
-
-<source>Cannot write file %x.</source>
-<target>파일 %x 을(를) 쓸 수 없습니다.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>데이터베이스 파일 %x 은(는) 호환 불가능합니다.</target>
 
@@ -153,9 +144,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>데이터베이스 파일 %x 은(는) 아직 존재하지 않습니다.</target>
 
+<source>Database file is corrupt:</source>
+<target>데이터베이스 파일 손상 :</target>
+
 <source>Out of memory!</source>
 <target>메모리 부족!</target>
 
+<source>Cannot write file %x.</source>
+<target>파일 %x 을(를) 쓸 수 없습니다.</target>
+
+<source>Cannot read file %x.</source>
+<target>파일 %x 을(를) 읽을 수 없습니다.</target>
+
 <source>Database files do not share a common session.</source>
 <target>데이터베이스 파일이 일반/공동 세션을 공유하지 않습니다.</target>
 
@@ -183,7 +183,7 @@
 </target>
 
 <source>Error parsing file %x, row %y, column %z.</source>
-<target>분석 오류 - 파일: %x, 행: %y, 열: %z</target>
+<target>분석 오류 - 파일: %x; 행: %y; 열: %z</target>
 
 <source>Scanning:</source>
 <target>스캔 :</target>
@@ -202,6 +202,9 @@
 <source>/sec</source>
 <target>/초</target>
 
+<source>Cannot find file %x.</source>
+<target>파일 %x 을(를) 찾을 수 없습니다.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>파일 %x 의 구성이 유효하지 않습니다.</target>
 
@@ -223,17 +226,14 @@
 <source>Volume name %x not part of file name %y!</source>
 <target>볼륨 이름 %x 은(는) 파일 이름 %y 의 일부가 아님!</target>
 
-<source>Cannot find file %x.</source>
-<target>파일 %x 을(를) 찾을 수 없습니다.</target>
-
 <source>Cannot read the following XML elements:</source>
 <target>다음 XML 요소를 읽을 수 없습니다 :</target>
 
 <source>&Open...</source>
 <target>열기(&O)</target>
 
-<source>&Save...</source>
-<target>저장(&S)</target>
+<source>Save &As...</source>
+<target>다른 이름으로 저장(&A)</target>
 
 <source>&Quit</source>
 <target>종료(&Q)</target>
@@ -263,7 +263,7 @@
 <target>3. '시작'을 누르세요.</target>
 
 <source>To get started just import a .ffs_batch file.</source>
-<target>시작하려면 .ffs_batch file (일괄 파일)만 가져오면 됩니다.</target>
+<target>시작하려면 .ffs_batch file (일괄 파일)을 가져오십시오.</target>
 
 <source>Folders to watch</source>
 <target>열어 볼 폴더</target>
@@ -292,7 +292,7 @@ The command is triggered if:
 - new folders arrive (e.g. USB stick insert)
 </source>
 <target>
-명령은 다음과 경우에 실행됩니다 :
+명령은 다음과 같은 경우에 실행됩니다 :
 - 파일이나 하위 폴더 변경 시
 - 새 폴더가 생겼을 시 (예 : USB 스틱 삽입)
 </target>
@@ -309,8 +309,8 @@ The command is triggered if:
 <source>(Build: %x)</source>
 <target>(빌드: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>실시간 동기화 설정</target>
+<source>All files</source>
+<target>모든 파일</target>
 
 <source>&Restore</source>
 <target>복원(&R)</target>
@@ -324,8 +324,8 @@ The command is triggered if:
 <source>Waiting for missing directories...</source>
 <target>누락 디렉토리 대기 중...</target>
 
-<source>An input folder name is empty.</source>
-<target>입력 폴더 이름이 비어 있습니다.</target>
+<source>A folder input field is empty.</source>
+<target>폴더 입력 필드 하나가 비어 있습니다.</target>
 
 <source>Logging</source>
 <target>로깅</target>
@@ -348,11 +348,8 @@ The command is triggered if:
 <source>Custom</source>
 <target>개인 설정</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync 일괄 파일</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync 구성 설정</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync 일괄처리(배치)</target>
 
 <source>Batch execution</source>
 <target>일괄 실행</target>
@@ -390,18 +387,18 @@ The command is triggered if:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Sourceforge.net에 접속할 수 없습니다!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>새로운 버전의 FreeFileSync가 나왔습니다.</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>새로운 버전의 FreeFileSync가 나왔습니다 :</target>
 
 <source>Download now?</source>
 <target>지금 다운로드 하시겠습니까?</target>
 
-<source>Information</source>
-<target>인포메이션 (정보)</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync 는 현재 최신버전 상태입니다!</target>
 
+<source>Information</source>
+<target>인포메이션 (정보)</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>FreeFileSync가 매주 자동으로 업데이트를 확인하도록 하시겠습니까?</target>
 
@@ -435,6 +432,12 @@ The command is triggered if:
 <source>Extension</source>
 <target>확장자</target>
 
+<source>Size:</source>
+<target>크기 :</target>
+
+<source>Date:</source>
+<target>날짜 :</target>
+
 <source>Action</source>
 <target>실행</target>
 
@@ -460,13 +463,16 @@ The command is triggered if:
 <target>최대절전모드</target>
 
 <source>1. &Compare</source>
-<target>1. 비교</target>
+<target>1. 비교(&C)</target>
 
 <source>2. &Synchronize</source>
-<target>2. 동기화</target>
+<target>2. 동기화(&S)</target>
 
 <source>&New</source>
-<target>신규 작업</target>
+<target>신규 작업(&N)</target>
+
+<source>&Save</source>
+<target>저장(&S)</target>
 
 <source>&Language</source>
 <target>언어 선택(&L)</target>
@@ -534,11 +540,8 @@ The command is triggered if:
 <source>Number of files and folders that will be deleted</source>
 <target>삭제될 파일 및 폴더 개수</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>전송하게 될 전체 데이터 용량</target>
-
-<source>Operation:</source>
-<target>작업 :</target>
+<source>Total bytes to copy</source>
+<target>복사할 전체 바이트 크기</target>
 
 <source>Items found:</source>
 <target>발견된 항목 :</target>
@@ -546,10 +549,10 @@ The command is triggered if:
 <source>Speed:</source>
 <target>속도 :</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>남은 시간 :</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>경과 시간 :</target>
 
 <source>Batch job</source>
@@ -672,6 +675,15 @@ is the same
 <source>Source code written in C++ utilizing:</source>
 <target>소스코드는 C++ 언어로 아래 툴을 사용하여 작성되었습니다 :</target>
 
+<source>If you like FreeFileSync</source>
+<target>FreeFileSync를 위한 기부</target>
+
+<source>Donate with PayPal</source>
+<target>PayPal로 기부하기</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>FreeFileSync 현지화에 도움을 주신 분들께 감사 드립니다 :</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>모든 의견 및 건의/제안을 환영합니다</target>
 
@@ -684,39 +696,9 @@ is the same
 <source>Email</source>
 <target>이메일</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>FreeFileSync 현지화에 도움을 주신 분들께 감사 드립니다 :</target>
-
-<source>If you like FreeFileSync</source>
-<target>FreeFileSync를 위한 기부</target>
-
-<source>Donate with PayPal</source>
-<target>PayPal로 기부하기</target>
-
 <source>Published under the GNU General Public License</source>
 <target>GNU 일반 공용 라이센스에 의한 출시</target>
 
-<source>Ignore further errors</source>
-<target>더 이상의 오류는 무시</target>
-
-<source>Hide further error messages during the current process</source>
-<target>현재 처리과정 동안 추가오류 메세지 숨기기</target>
-
-<source>&Ignore</source>
-<target>무시(&I)</target>
-
-<source>Do not show this dialog again</source>
-<target>다음부터 표시하지 않음</target>
-
-<source>&Switch</source>
-<target>스위치[전환](&S)</target>
-
-<source>&Yes</source>
-<target>예(&Y)</target>
-
-<source>&No</source>
-<target>아니오(&N)</target>
-
 <source>Use Recycle Bin</source>
 <target>휴지통 사용</target>
 
@@ -760,7 +742,7 @@ Note: File names must be relative to base directories!
 <target>실패 - 안전 파일 복사</target>
 
 <source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
-<target>임시 파일 (*.ffs_tmp)로 우선 작성 후, 파일명을 변경합니다. 이러면 치명적인 오류가 발생하더라도 일관된 상태를 보장할 수 있습니다.</target>
+<target>임시 파일 (*.ffs_tmp)로 우선 작성 후, 파일명을 변경합니다. 이렇게 할 경우 치명적인 오류가 발생하더라도 일관된 상태를 보장할 수 있습니다.</target>
 
 <source>Copy locked files</source>
 <target>락 걸린 파일 복사</target>
@@ -789,6 +771,9 @@ 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>Find what:</source>
 <target>검색어 :</target>
 
@@ -867,8 +852,14 @@ Note: File names must be relative to base directories!
 <source>Never save changes</source>
 <target>변경사항 절대 저장 안 함.</target>
 
-<source>Save changes to current configuration?</source>
-<target>현재 설정의 변경 내용을 저장하시겠습니까?</target>
+<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>Configuration loaded!</source>
 <target>설정 로드 완료!</target>
@@ -963,9 +954,6 @@ Note: File names must be relative to base directories!
 <source>All directories in sync!</source>
 <target>모든 디렉토리 동기화!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>동기화 작업 이전에 비교를 먼저 실행해 주십시오!</target>
-
 <source>Comma separated list</source>
 <target>콤마 분리 목록</target>
 
@@ -1007,6 +995,24 @@ Note: File names must be relative to base directories!
 <pluralform>보기에 나타난 %y개 행의 %x개 대상</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>더 이상의 오류는 무시</target>
+
+<source>&Ignore</source>
+<target>무시(&I)</target>
+
+<source>&Switch</source>
+<target>스위치[전환](&S)</target>
+
+<source>Question</source>
+<target>질문</target>
+
+<source>&Yes</source>
+<target>예(&Y)</target>
+
+<source>&No</source>
+<target>아니오(&N)</target>
+
 <source>Scanning...</source>
 <target>스캔 중...</target>
 
@@ -1182,6 +1188,9 @@ Note: File names must be relative to base directories!
 <source>Cannot delete directory %x.</source>
 <target>디렉토리 %x 을(를) 삭제할 수 없습니다.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>%x의 파일 속성을 쓸 수 없습니다.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>%x의 수정 시간을 쓸 수 없습니다.</target>
 
@@ -1206,9 +1215,6 @@ Note: File names must be relative to base directories!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>심볼릭 링크 %x 을(를) %y (으)로 복사할 수 없습니다.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>%x의 파일 속성을 쓸 수 없습니다.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>파일 %x 을(를) %y (으)로 복사할 수 없습니다.</target>
 
@@ -1233,11 +1239,8 @@ Note: File names must be relative to base directories!
 <source>No change since last synchronization!</source>
 <target>마지막 동기화 이후 변경사항 없음!</target>
 
-<source>Filter settings have changed!</source>
-<target>필터 설정이 변경 됐습니다!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>이 파일은 마지막 동기화에서 처리되지 않았습니다!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>해당 데이터베이스 항목은 현재 설정 상태에서 동기화 되지 않습니다.</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>기본값 동기화 방향 설정 : 이전 파일들은 신규 파일들로 덮어 쓰여집니다.</target>
@@ -1365,14 +1368,14 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>%x 속성 업데이트 중</target>
 
-<source>Target folder name must not be empty.</source>
-<target>대상 폴더 이름은 비워둘 수 없습니다.</target>
+<source>Target folder input field must not be empty.</source>
+<target>대상 폴더 입력 필드가 비어 있어서는 안 됩니다.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>파일 버저닝을 위한 폴더 이름은 비워둘 수 없습니다.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>버저닝을 위한 폴더 입력 필드가 비어 있어서는 안 됩니다.</target>
 
-<source>Source directory %x not found.</source>
-<target>소스 디렉토리 %x 을(를) 찾을 수 없습니다.</target>
+<source>Source folder %x not found.</source>
+<target>소스 폴더 %x을(를) 찾을 수 없음.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>해결되지 않은 충돌이 있습니다!</target>
@@ -1389,11 +1392,11 @@ Note: File names must be relative to base directories!
 <source>Not enough free disk space available in:</source>
 <target>사용 가능한 디스크 여유 공간이 부족합니다 :</target>
 
-<source>Free disk space required:</source>
-<target>필요한 디스크 여유 공간 :</target>
+<source>Required:</source>
+<target>필요 공간(크기) :</target>
 
-<source>Free disk space available:</source>
-<target>사용 가능한 디스크 여유 공간 :</target>
+<source>Available:</source>
+<target>여유 공간(크기) :</target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>다음 경로로는 휴지통을 사용할 수 없습니다! 대신 파일을 영구적으로 삭제합니다 :</target>
@@ -1404,6 +1407,9 @@ Note: File names must be relative to base directories!
 <source>Processing folder pair:</source>
 <target>폴더 페어 처리 중 :</target>
 
+<source>Target folder %x already existing.</source>
+<target>대상 폴더 %x이(가) 이미 존재함.</target>
+
 <source>Generating database...</source>
 <target>데이터베이스 생성 중...</target>
 
diff --git a/BUILD/Languages/lithuanian.lng b/BUILD/Languages/lithuanian.lng
index e30eb48c..7b44874a 100644
--- a/BUILD/Languages/lithuanian.lng
+++ b/BUILD/Languages/lithuanian.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>Apie</target>
 
-<source>Warning</source>
-<target>Perspėjimas</target>
-
-<source>Question</source>
-<target>Klausimas</target>
-
 <source>Confirm</source>
 <target>Patvirtinti</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Informacija</target>
 
+<source>Warning</source>
+<target>Perspėjimas</target>
+
 <source>Fatal Error</source>
 <target>Kritinė klaida</target>
 
@@ -141,12 +138,6 @@
 <pluralform>%x Baitai</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Nepavyksta nuskaityti failo %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Nepavyksta įrašyti failo %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Duomenų bazė %x yra netinkama.</target>
 
@@ -156,9 +147,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Duomenų bazės failo %x dar nėra.</target>
 
+<source>Database file is corrupt:</source>
+<target></target>
+
 <source>Out of memory!</source>
 <target>Trūksta atminties!</target>
 
+<source>Cannot write file %x.</source>
+<target>Nepavyksta įrašyti failo %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Nepavyksta nuskaityti failo %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Duomenų bazės failai nesidalina bendros sesijos.</target>
 
@@ -211,6 +211,9 @@
 <source>/sec</source>
 <target>/sek.</target>
 
+<source>Cannot find file %x.</source>
+<target>Nepavyksta rasti failo %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Failas %x neturi tinkamų nustatymų.</target>
 
@@ -235,14 +238,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>Nepavyksta perskaityti sekančių XML elementų:</target>
 
-<source>Cannot find file %x.</source>
-<target>Nepavyksta rasti failo %x.</target>
-
 <source>&Open...</source>
 <target>&Atverti...</target>
 
-<source>&Save...</source>
-<target>&Išsaugoti...</target>
+<source>Save &As...</source>
+<target></target>
 
 <source>&Quit</source>
 <target>&Išeiti</target>
@@ -318,8 +318,8 @@ Komanda inicijuojama jei:
 <source>(Build: %x)</source>
 <target>(Komponavimo versija: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>RealtimeSync nustatymai</target>
+<source>All files</source>
+<target></target>
 
 <source>&Restore</source>
 <target>&Atstatyti</target>
@@ -333,8 +333,8 @@ Komanda inicijuojama jei:
 <source>Waiting for missing directories...</source>
 <target>Laikiama trūkstamų katalogų...</target>
 
-<source>An input folder name is empty.</source>
-<target>Įvesties aplanko pavadinimas yra tuščias.</target>
+<source>A folder input field is empty.</source>
+<target></target>
 
 <source>Logging</source>
 <target>Užduoties duomenys</target>
@@ -357,11 +357,8 @@ Komanda inicijuojama jei:
 <source>Custom</source>
 <target>Savitas</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync paketinės užduoties failas</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync nustatymai</target>
+<source>FreeFileSync batch</source>
+<target></target>
 
 <source>Batch execution</source>
 <target>Paketinės užduoties vykdymas</target>
@@ -399,18 +396,18 @@ Komanda inicijuojama jei:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Nepavyksta prisijungti prie sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>Naujesnė FreeFileSync versija yra pasiekiama:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target></target>
 
 <source>Download now?</source>
 <target>Atsiųsti dabar?</target>
 
-<source>Information</source>
-<target>Informacija</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync yra naujausia!</target>
 
+<source>Information</source>
+<target>Informacija</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Ar tikrai norite, kad FreeFileSync automatiškai ieškoti atnaujinimų kiekvieną savaitę?</target>
 
@@ -444,6 +441,12 @@ Komanda inicijuojama jei:
 <source>Extension</source>
 <target>Plėtinys</target>
 
+<source>Size:</source>
+<target></target>
+
+<source>Date:</source>
+<target></target>
+
 <source>Action</source>
 <target>Veiksmas</target>
 
@@ -477,6 +480,9 @@ Komanda inicijuojama jei:
 <source>&New</source>
 <target>&Naujas</target>
 
+<source>&Save</source>
+<target></target>
+
 <source>&Language</source>
 <target>&Kalba</target>
 
@@ -543,11 +549,8 @@ Komanda inicijuojama jei:
 <source>Number of files and folders that will be deleted</source>
 <target>Failų ir aplankų, kurie bus ištrinti, skaičius</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Visas duomenų kiekis, kuris bus perduotas</target>
-
-<source>Operation:</source>
-<target>Operacija:</target>
+<source>Total bytes to copy</source>
+<target></target>
 
 <source>Items found:</source>
 <target>Rasta elementų:</target>
@@ -555,11 +558,11 @@ Komanda inicijuojama jei:
 <source>Speed:</source>
 <target>Greitis:</target>
 
-<source>Remaining time:</source>
-<target>Likęs laikas:</target>
+<source>Time remaining:</source>
+<target></target>
 
-<source>Elapsed time:</source>
-<target>Praėjęs laikas:</target>
+<source>Time elapsed:</source>
+<target></target>
 
 <source>Batch job</source>
 <target>Paketinė užduotis</target>
@@ -681,6 +684,15 @@ yra toks pats
 <source>Source code written in C++ utilizing:</source>
 <target>Šaltinio kodas parašytas su C++ naudojant:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Jei Jums patinka FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>Paremkite per PayPal</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Didelė padėka už FreeFileSync vertimą reiškiama:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>Nuomonė ir patarimai laukiami</target>
 
@@ -693,39 +705,9 @@ yra toks pats
 <source>Email</source>
 <target>El. paštas</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Didelė padėka už FreeFileSync vertimą reiškiama:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Jei Jums patinka FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Paremkite per PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Platinama su GNU General Public licenzija</target>
 
-<source>Ignore further errors</source>
-<target>Ignoruoti tolimesnes klaidas</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Slėpti tolimesnius klaidų pranešimus per esamą procesą</target>
-
-<source>&Ignore</source>
-<target>&Ignoruoti</target>
-
-<source>Do not show this dialog again</source>
-<target>Nerodyti šio lango daugiau</target>
-
-<source>&Switch</source>
-<target>&Perjungti</target>
-
-<source>&Yes</source>
-<target>&Taip</target>
-
-<source>&No</source>
-<target>&Ne</target>
-
 <source>Use Recycle Bin</source>
 <target>Naudoti šiukšliadėžę</target>
 
@@ -798,6 +780,9 @@ 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>Find what:</source>
 <target>Rasti kas:</target>
 
@@ -876,8 +861,14 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Never save changes</source>
 <target>Niekada nesaugoti pakeitimų</target>
 
-<source>Save changes to current configuration?</source>
-<target>Išsaugoti pakeitimus į esamus nustatymus?</target>
+<source>Do you want to save changes to %x?</source>
+<target></target>
+
+<source>Save</source>
+<target></target>
+
+<source>Don't Save</source>
+<target></target>
 
 <source>Configuration loaded!</source>
 <target>Nustatymai įkelti!</target>
@@ -972,9 +963,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>All directories in sync!</source>
 <target>Visi katalogai sinchronizuoti!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Prašome paleisti sulyginimą prieš sinchronizavimą!</target>
-
 <source>Comma separated list</source>
 <target>Kableliais atksirtas sąrašas</target>
 
@@ -1028,6 +1016,24 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <pluralform>%x iš %y eilių rodmenyje</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ignoruoti tolimesnes klaidas</target>
+
+<source>&Ignore</source>
+<target>&Ignoruoti</target>
+
+<source>&Switch</source>
+<target>&Perjungti</target>
+
+<source>Question</source>
+<target>Klausimas</target>
+
+<source>&Yes</source>
+<target>&Taip</target>
+
+<source>&No</source>
+<target>&Ne</target>
+
 <source>Scanning...</source>
 <target>Skenuojama...</target>
 
@@ -1218,6 +1224,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Cannot delete directory %x.</source>
 <target>Nepavyksta ištrinti katalogo %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Nepavyksta įrašyti atributų failui %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Nepavyksta šrašyti pakeitimo datos %x.</target>
 
@@ -1242,9 +1251,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Nepavyksta nukopijuoti simbolinės nuorodos %x į %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Nepavyksta įrašyti atributų failui %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Nepavyksta nukopijuoti failo %x į %y.</target>
 
@@ -1269,11 +1275,8 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>No change since last synchronization!</source>
 <target>Nėra pakitimo nuo pakutinio sinchronizavimo!</target>
 
-<source>Filter settings have changed!</source>
-<target>Filtro nustatymai buvo pakeisti!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Failas nebuvo apdirbtas paskutinio sinchronizavimo!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target></target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Nustatomos numatytos sinchronizavimo kryptys: Seni failai bus perrašyti naujesniais failais.</target>
@@ -1401,14 +1404,14 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Updating attributes of %x</source>
 <target>Atnaujinami atributai %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Tikslo aplanko pavadinimas privalo nebūti tuščias.</target>
+<source>Target folder input field must not be empty.</source>
+<target></target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Aplanko pavadinimas failų versionavimui privalo nebūti tuščias.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target></target>
 
-<source>Source directory %x not found.</source>
-<target>Šaltinio katalogas %x nerastas.</target>
+<source>Source folder %x not found.</source>
+<target></target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Yra neišspręstų konfliktų!</target>
@@ -1425,11 +1428,11 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Not enough free disk space available in:</source>
 <target>Nepakanka laisvos disko vietos:</target>
 
-<source>Free disk space required:</source>
-<target>Laisva disko vieta reikalinga:</target>
+<source>Required:</source>
+<target></target>
 
-<source>Free disk space available:</source>
-<target>Laisva disko vieta prieinama:</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>
@@ -1440,6 +1443,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Processing folder pair:</source>
 <target>Apdorojama aplankų pora:</target>
 
+<source>Target folder %x already existing.</source>
+<target></target>
+
 <source>Generating database...</source>
 <target>Generuojama duomenų bazė...</target>
 
diff --git a/BUILD/Languages/norwegian.lng b/BUILD/Languages/norwegian.lng
index 89bac192..3cf0f3d6 100644
--- a/BUILD/Languages/norwegian.lng
+++ b/BUILD/Languages/norwegian.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>Om</target>
 
-<source>Warning</source>
-<target>Advarsel</target>
-
-<source>Question</source>
-<target>Spørsmål</target>
-
 <source>Confirm</source>
 <target>Bekreft</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Advarsel</target>
+
 <source>Fatal Error</source>
 <target>Fatal feil</target>
 
@@ -139,12 +136,6 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Kan ikke lese fil %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Kan ikke skrive fil %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Databasefil %x er inkompatibel.</target>
 
@@ -154,9 +145,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Databasefil %x finnes ikke ennå.</target>
 
+<source>Database file is corrupt:</source>
+<target></target>
+
 <source>Out of memory!</source>
 <target>For lite minne!</target>
 
+<source>Cannot write file %x.</source>
+<target>Kan ikke skrive fil %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Kan ikke lese fil %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Databasefiler deler ikke en felles synkroniseringsøkt.</target>
 
@@ -205,6 +205,9 @@
 <source>/sec</source>
 <target>/sek</target>
 
+<source>Cannot find file %x.</source>
+<target>Kan ikke finne filen %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Filen %x inneholder ikke en gyldig innstilling.</target>
 
@@ -226,16 +229,13 @@
 <source>Volume name %x not part of file name %y!</source>
 <target>Volumnavn %x ikke del av filnavn %y!</target>
 
-<source>Cannot find file %x.</source>
-<target>Kan ikke finne filen %x.</target>
-
 <source>Cannot read the following XML elements:</source>
 <target>Kan ikke lese følgende XML-elementer:</target>
 
 <source>&Open...</source>
 <target></target>
 
-<source>&Save...</source>
+<source>Save &As...</source>
 <target></target>
 
 <source>&Quit</source>
@@ -308,8 +308,8 @@ The command is triggered if:
 <source>(Build: %x)</source>
 <target>(Build: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>RealtimeSync-innstilling</target>
+<source>All files</source>
+<target></target>
 
 <source>&Restore</source>
 <target>&Gjenopprett</target>
@@ -323,7 +323,7 @@ The command is triggered if:
 <source>Waiting for missing directories...</source>
 <target>Venter på manglende mapper...</target>
 
-<source>An input folder name is empty.</source>
+<source>A folder input field is empty.</source>
 <target></target>
 
 <source>Logging</source>
@@ -347,11 +347,8 @@ The command is triggered if:
 <source>Custom</source>
 <target>Brukerdefinert</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync batch-fil</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync-innstilling</target>
+<source>FreeFileSync batch</source>
+<target></target>
 
 <source>Batch execution</source>
 <target>Batch-kjøring</target>
@@ -389,18 +386,18 @@ The command is triggered if:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Ikke i stand til å koble til sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>En nyere versjon av FreeFileSync er tilgjengelig:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target></target>
 
 <source>Download now?</source>
 <target>Laste ned nå?</target>
 
-<source>Information</source>
-<target>Informasjon</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync er oppdatert!</target>
 
+<source>Information</source>
+<target>Informasjon</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Skal FreeFileSync automatisk se etter oppdateringer hver uke?</target>
 
@@ -434,6 +431,12 @@ The command is triggered if:
 <source>Extension</source>
 <target>Filendelse</target>
 
+<source>Size:</source>
+<target></target>
+
+<source>Date:</source>
+<target></target>
+
 <source>Action</source>
 <target>Handling</target>
 
@@ -467,6 +470,9 @@ The command is triggered if:
 <source>&New</source>
 <target>&Ny</target>
 
+<source>&Save</source>
+<target></target>
+
 <source>&Language</source>
 <target>&Språk</target>
 
@@ -533,11 +539,8 @@ The command is triggered if:
 <source>Number of files and folders that will be deleted</source>
 <target></target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Totale antall data som blir overført</target>
-
-<source>Operation:</source>
-<target>Handling:</target>
+<source>Total bytes to copy</source>
+<target></target>
 
 <source>Items found:</source>
 <target>Elementer funnet:</target>
@@ -545,11 +548,11 @@ The command is triggered if:
 <source>Speed:</source>
 <target>Hastighet:</target>
 
-<source>Remaining time:</source>
-<target>Gjenstående tid:</target>
+<source>Time remaining:</source>
+<target></target>
 
-<source>Elapsed time:</source>
-<target>Tid gått:</target>
+<source>Time elapsed:</source>
+<target></target>
 
 <source>Batch job</source>
 <target>Batch-jobb</target>
@@ -671,6 +674,15 @@ er det samme
 <source>Source code written in C++ utilizing:</source>
 <target>Kildekode skrevet i C++ med hjelp fra:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Hvis du liker FreeFileSync</target>
+
+<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>Feedback and suggestions are welcome</source>
 <target>Tilbakemelding og forslag er velkomne</target>
 
@@ -683,39 +695,9 @@ er det samme
 <source>Email</source>
 <target>E-post</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Stor takk for oversettelse av FreeFileSync går til:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Hvis du liker FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Doner med PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Utgitt under GNU General Public Licence</target>
 
-<source>Ignore further errors</source>
-<target>Ignorer ytterligere feil</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Skjul ytterligere feilmeldinger under den gjeldende prosessen</target>
-
-<source>&Ignore</source>
-<target>&Ignorer</target>
-
-<source>Do not show this dialog again</source>
-<target>Ikke vis denne dialog igjen</target>
-
-<source>&Switch</source>
-<target>&Skift</target>
-
-<source>&Yes</source>
-<target>&Ja</target>
-
-<source>&No</source>
-<target>&Nei</target>
-
 <source>Use Recycle Bin</source>
 <target>Bruk papirkurv</target>
 
@@ -788,6 +770,9 @@ 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>Find what:</source>
 <target>Søk hva:</target>
 
@@ -866,8 +851,14 @@ Merk: Filnavn må være relative til basismapper!
 <source>Never save changes</source>
 <target>Aldri lagre endringer</target>
 
-<source>Save changes to current configuration?</source>
-<target>Lagre endringer til gjeldende innstilling?</target>
+<source>Do you want to save changes to %x?</source>
+<target></target>
+
+<source>Save</source>
+<target></target>
+
+<source>Don't Save</source>
+<target></target>
 
 <source>Configuration loaded!</source>
 <target>Innstilling lastet!</target>
@@ -962,9 +953,6 @@ Merk: Filnavn må være relative til basismapper!
 <source>All directories in sync!</source>
 <target>Alle mapper er synkronisert!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Kjør en sammenligning før synkronisering!</target>
-
 <source>Comma separated list</source>
 <target>Komma-separert liste</target>
 
@@ -1010,6 +998,24 @@ Merk: Filnavn må være relative til basismapper!
 <pluralform>%x av %y rekker</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ignorer ytterligere feil</target>
+
+<source>&Ignore</source>
+<target>&Ignorer</target>
+
+<source>&Switch</source>
+<target>&Skift</target>
+
+<source>Question</source>
+<target>Spørsmål</target>
+
+<source>&Yes</source>
+<target>&Ja</target>
+
+<source>&No</source>
+<target>&Nei</target>
+
 <source>Scanning...</source>
 <target>Skanner...</target>
 
@@ -1190,6 +1196,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Cannot delete directory %x.</source>
 <target>Kan ikke slette mappen %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Kan ikke skrive filattributter til %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Kan ikke skrive endringstid til %x.</target>
 
@@ -1214,9 +1223,6 @@ Merk: Filnavn må være relative til basismapper!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Kan ikke kopiere symbolsk lenke %x til %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Kan ikke skrive filattributter til %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Kan ikke kopiere filen %x til %y.</target>
 
@@ -1241,11 +1247,8 @@ Merk: Filnavn må være relative til basismapper!
 <source>No change since last synchronization!</source>
 <target>Ingen endringer siden siste synkronisering!</target>
 
-<source>Filter settings have changed!</source>
-<target>Filterinnstillinger er endret!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Filen ble ikke behandlet ved siste synkronisering!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target></target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Stiller inn standard synkroniseringsretning: Gamle filer blir overskrevet med nyere filer.</target>
@@ -1373,14 +1376,14 @@ Merk: Filnavn må være relative til basismapper!
 <source>Updating attributes of %x</source>
 <target>Oppdaterer attributter til %x</target>
 
-<source>Target folder name must not be empty.</source>
+<source>Target folder input field must not be empty.</source>
 <target></target>
 
-<source>Folder name for file versioning must not be empty.</source>
+<source>Folder input field for versioning must not be empty.</source>
 <target></target>
 
-<source>Source directory %x not found.</source>
-<target>Kildemappen %x ikke funnet.</target>
+<source>Source folder %x not found.</source>
+<target></target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Uløste konflikter finnes!</target>
@@ -1397,11 +1400,11 @@ Merk: Filnavn må være relative til basismapper!
 <source>Not enough free disk space available in:</source>
 <target>Ikke nok ledig diskplass tilgjengelig på:</target>
 
-<source>Free disk space required:</source>
-<target>Ledig diskplass som kreves:</target>
+<source>Required:</source>
+<target></target>
 
-<source>Free disk space available:</source>
-<target>Ledig diskplass tilgjengelig:</target>
+<source>Available:</source>
+<target></target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Papirkurv er ikke tilgjengelig for de følgende baner! Filer blir isteden slettet permanent:</target>
@@ -1412,6 +1415,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Processing folder pair:</source>
 <target>Behandler mappepar:</target>
 
+<source>Target folder %x already existing.</source>
+<target></target>
+
 <source>Generating database...</source>
 <target>Oppretter database...</target>
 
diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng
index 255cd2ab..08b5366c 100644
--- a/BUILD/Languages/polish.lng
+++ b/BUILD/Languages/polish.lng
@@ -10,6 +10,18 @@
 <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>
+
+<source>Items remaining:</source>
+<target>Pozostałe elementy:</target>
+
+<source>Total time:</source>
+<target>Całkowity czas:</target>
+
 <source>Show in Explorer</source>
 <target>Wyświetl w Explorerze</target>
 
@@ -32,7 +44,7 @@
 <target>Określ alternatywne ustawienia porównywania</target>
 
 <source>Select alternate synchronization settings</source>
-<target>Stwórz alternatywne reguły synchronizacji</target>
+<target>Określ alternatywne reguły synchronizacji</target>
 
 <source>Filter is active</source>
 <target>Filtr jest aktywny</target>
@@ -58,12 +70,6 @@
 <source>About</source>
 <target>O Programie</target>
 
-<source>Warning</source>
-<target>Ostrzeżenie</target>
-
-<source>Question</source>
-<target>Pytanie</target>
-
 <source>Confirm</source>
 <target>Potwierdź</target>
 
@@ -109,6 +115,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Ostrzeżenie</target>
+
 <source>Fatal Error</source>
 <target>Błąd krytyczny</target>
 
@@ -140,12 +149,6 @@
 <pluralform>%x Bajtów</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Nie można odczytać pliku %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Nie można zapisać pliku %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Plika bazy danych %x nie jest kompatybilny.</target>
 
@@ -155,9 +158,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Plik bazy danych %x nie istnieje.</target>
 
+<source>Database file is corrupt:</source>
+<target>Plik bazy danych jest uszkodzony:</target>
+
 <source>Out of memory!</source>
 <target>Brak wolnej pamięci!</target>
 
+<source>Cannot write file %x.</source>
+<target>Nie można zapisać pliku %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Nie można odczytać pliku %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Pliki bazy danych nie współdzielą sesji.</target>
 
@@ -208,6 +220,9 @@
 <source>/sec</source>
 <target>/sekundę</target>
 
+<source>Cannot find file %x.</source>
+<target>Nie można znaleźć pliku %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Plik %x nie zawiera prawidłowej konfiguracji</target>
 
@@ -232,14 +247,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>Nie można odczytać elementu XML:</target>
 
-<source>Cannot find file %x.</source>
-<target>Nie można znaleźć pliku %x.</target>
-
 <source>&Open...</source>
 <target>&Otwórz...</target>
 
-<source>&Save...</source>
-<target>&Zapisz</target>
+<source>Save &As...</source>
+<target>Zapi&sz jako...</target>
 
 <source>&Quit</source>
 <target>&Zamknij</target>
@@ -248,13 +260,13 @@
 <target>&Program</target>
 
 <source>&Content</source>
-<target>&Zawartość</target>
+<target>Za&wartość</target>
 
 <source>&About</source>
-<target>&O Programie</target>
+<target>O Program&ie</target>
 
 <source>&Help</source>
-<target>&Pomoc</target>
+<target>P&omoc</target>
 
 <source>Usage:</source>
 <target>Użycie:</target>
@@ -269,19 +281,19 @@
 <target>3. Wciśnij 'Start'.</target>
 
 <source>To get started just import a .ffs_batch file.</source>
-<target>Aby rozpocząć po prostu zaimportuj plik .ffs_batch</target>
+<target>Aby rozpocząć po zaimportuj plik .ffs_batch.</target>
 
 <source>Folders to watch</source>
 <target>Obserwowane katalogi</target>
 
 <source>Add folder</source>
-<target>Dodaj folder</target>
+<target>Dodaj katalog</target>
 
 <source>Remove folder</source>
-<target>Usuń folder</target>
+<target>Usuń katalog</target>
 
 <source>Select a folder</source>
-<target>Wybierz folder</target>
+<target>Wybierz katalog</target>
 
 <source>Delay [seconds]</source>
 <target>Opóźnienie [sekundy]</target>
@@ -315,8 +327,8 @@ Komenda jest wykonywana gdy:
 <source>(Build: %x)</source>
 <target>(Zbudowano: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>Konfiguracja RealtimeSync</target>
+<source>All files</source>
+<target>Wszystkie pliki</target>
 
 <source>&Restore</source>
 <target>&Przywróć</target>
@@ -330,8 +342,8 @@ Komenda jest wykonywana gdy:
 <source>Waiting for missing directories...</source>
 <target>Oczekiwanie na brakujące katalogi...</target>
 
-<source>An input folder name is empty.</source>
-<target>Nazwa katalogu jest pusta.</target>
+<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>
@@ -354,32 +366,14 @@ Komenda jest wykonywana gdy:
 <source>Custom</source>
 <target>Własne</target>
 
-<source>FreeFileSync batch file</source>
+<source>FreeFileSync batch</source>
 <target>Plik wsadowy FreeFileSync</target>
 
-<source>FreeFileSync configuration</source>
-<target>Konfiguracja FreeFileSync</target>
-
-<source>Batch execution</source>
-<target>Uruchomienie pliku wsadowego</target>
-
-<source>Items processed:</source>
-<target>Przetworzeone elementy:</target>
-
-<source>Items remaining:</source>
-<target>Pozostałe elementy:</target>
-
-<source>Total time:</source>
-<target>Całkowity czas:</target>
-
-<source>Stop</source>
-<target>Zatrzymaj</target>
-
 <source>Synchronization aborted!</source>
 <target>Synchronizacja przerwana!</target>
 
 <source>Synchronization completed with errors!</source>
-<target>Synchronizacja zakończona z błędami.</target>
+<target>Synchronizacja zakończona z błędami!</target>
 
 <source>Nothing to synchronize!</source>
 <target>Brak plików do synchronizacji!</target>
@@ -388,7 +382,7 @@ Komenda jest wykonywana gdy:
 <target>Synchronizacja zakończona pomyślnie!</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>Wciśnij "Przełącz" aby rozwiązać wszystkie problemy w głównym oknie FreeFileSync.</target>
+<target>Kliknij "Przełącz" aby rozwiązać wszystkie problemy w głównym oknie FreeFileSync.</target>
 
 <source>Switching to FreeFileSync main dialog...</source>
 <target>Przełączanie do głównego okna FreeFileSync...</target>
@@ -396,20 +390,20 @@ Komenda jest wykonywana gdy:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Nie można się połączyć z sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
+<source>A new version of FreeFileSync is available:</source>
 <target>Dostępna jest nowa wersja FreeFileSync:</target>
 
 <source>Download now?</source>
 <target>Pobrać teraz?</target>
 
-<source>Information</source>
-<target>Informacja</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>Posiadasz aktualną wersję FreeFileSync!</target>
 
+<source>Information</source>
+<target>Informacja</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
-<target>Czy chcesz aby FreeFileSync sprawdzał uaktualnienia co tydzień?</target>
+<target>Czy chcesz aby FreeFileSync sprawdzał aktualizacje co tydzień?</target>
 
 <source>(Requires an Internet connection!)</source>
 <target>(Wymaga połączenia z Internetem!)</target>
@@ -441,6 +435,12 @@ Komenda jest wykonywana gdy:
 <source>Extension</source>
 <target>Rozszerzenie</target>
 
+<source>Size:</source>
+<target>Rozmiar:</target>
+
+<source>Date:</source>
+<target>Data:</target>
+
 <source>Action</source>
 <target>Akcja</target>
 
@@ -474,6 +474,9 @@ Komenda jest wykonywana gdy:
 <source>&New</source>
 <target>&Nowy</target>
 
+<source>&Save</source>
+<target>&Zapisz</target>
+
 <source>&Language</source>
 <target>&Język</target>
 
@@ -508,10 +511,10 @@ Komenda jest wykonywana gdy:
 <target>Rozpocznij synchronizację</target>
 
 <source>Add folder pair</source>
-<target>Dodaj foldery do porównania</target>
+<target>Dodaj katalogi do porównania</target>
 
 <source>Remove folder pair</source>
-<target>Usuń parę folderów</target>
+<target>Usuń katalogi</target>
 
 <source>Swap sides</source>
 <target>Zamień stronami</target>
@@ -520,7 +523,7 @@ Komenda jest wykonywana gdy:
 <target>Wczytaj konfigurację z pliku</target>
 
 <source>Save current configuration to file</source>
-<target>Zapisz aktualny plik konfiguracyjny</target>
+<target>Zapisz konfiguracyję do pliku</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Ostatnio użyta konfiguracja (naciśnij DEL żeby usunąć z listy)</target>
@@ -540,11 +543,8 @@ Komenda jest wykonywana gdy:
 <source>Number of files and folders that will be deleted</source>
 <target>Liczba plików i katalogów, które zostaną usunięte</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Liczba danych do przekopiowania</target>
-
-<source>Operation:</source>
-<target>Operacja:</target>
+<source>Total bytes to copy</source>
+<target>Całkowity rozmiar do skopiowania</target>
 
 <source>Items found:</source>
 <target>Znalezione elementy:</target>
@@ -552,17 +552,17 @@ Komenda jest wykonywana gdy:
 <source>Speed:</source>
 <target>Prędkość:</target>
 
-<source>Remaining time:</source>
-<target>Pozostały czas:</target>
+<source>Time remaining:</source>
+<target>Do ukończenia:</target>
 
-<source>Elapsed time:</source>
-<target>Czas:</target>
+<source>Time elapsed:</source>
+<target>Szacowany czas:</target>
 
 <source>Batch job</source>
 <target>Plik wsadowy</target>
 
 <source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
-<target>Utwórz plik wsadowy aby zautomatyzować proces synchronizacji. Kliknij dwa razy na ten plik lub dodaj go do menadżera zadań w swoim systemie: FreeFileSync.exe <nazwa_pliku>.ffs_batch</target>
+<target>Utwórz plik wsadowy aby zautomatyzować proces synchronizacji. Kliknij dwa razy na ten plik lub dodaj go do menadżera zadań w Twoim systemie: FreeFileSync.exe <nazwa_pliku>.ffs_batch</target>
 
 <source>Help</source>
 <target>Pomoc</target>
@@ -577,7 +577,7 @@ Komenda jest wykonywana gdy:
 <target>Prawy</target>
 
 <source>Status feedback</source>
-<target>Opinia statusu</target>
+<target>Status</target>
 
 <source>Show progress dialog</source>
 <target>Pokaż okno postępu</target>
@@ -607,7 +607,7 @@ Komenda jest wykonywana gdy:
 <target>Kopiuj nowe lub aktualniejsze pliki na prawą stronę.</target>
 
 <source>Configure your own synchronization rules.</source>
-<target>Skonfiguruj swoje własne zasady synchronizacji.</target>
+<target>Skonfiguruj swoje własne reguły synchronizacji.</target>
 
 <source>Deletion handling</source>
 <target>Obsługa usuwania</target>
@@ -650,8 +650,8 @@ are the same
 </source>
 <target>
 Pliki są równe jeżeli
-	 - ostatni czas zapisu
-	 - rozmiar pliku
+     - ostatni czas zapisu
+     - rozmiar pliku
 są równe
 </target>
 
@@ -678,6 +678,15 @@ jest identyczna
 <source>Source code written in C++ utilizing:</source>
 <target>Kod stworzony w C++ z wykorzystaniem:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Podoba Ci się FreeFileSync?</target>
+
+<source>Donate with PayPal</source>
+<target>Wesprzyj z PayPal</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Podziękowania za tłumaczenie FreeFileSync:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>Wszelkie opinie i sugestie mile widziane</target>
 
@@ -690,39 +699,9 @@ jest identyczna
 <source>Email</source>
 <target>Poczta</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Podziękowania za tłumaczenie FreeFileSync:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Podoba Ci się FreeFileSync?</target>
-
-<source>Donate with PayPal</source>
-<target>Wesprzyj z PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Udostępnione na zasadach licencji GNU General Public License</target>
 
-<source>Ignore further errors</source>
-<target>Ignoruj kolejne błędy</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Ukryj kolejne informacje o błędach dla tego zadania</target>
-
-<source>&Ignore</source>
-<target>&Ignoruj</target>
-
-<source>Do not show this dialog again</source>
-<target>Nie pokazuj tego okna ponownie</target>
-
-<source>&Switch</source>
-<target>&Zamień</target>
-
-<source>&Yes</source>
-<target>&Tak</target>
-
-<source>&No</source>
-<target>&Nie</target>
-
 <source>Use Recycle Bin</source>
 <target>Użyj kosza</target>
 
@@ -772,7 +751,7 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <target>Kopiuj zablokowane pliki</target>
 
 <source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Kopiuj pliki udostępnione i zablokowane używając usługi Volume Shadow Copy (Wymaga uprawnień administratora)</target>
+<target>Kopiuj udostępnione lub zablokowane pliki używając usługi Volume Shadow Copy (Wymaga uprawnień administratora)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopiuj uprawnienia plików</target>
@@ -795,6 +774,9 @@ 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>Find what:</source>
 <target>Co:</target>
 
@@ -873,8 +855,14 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Never save changes</source>
 <target>Nigdy nie zapisuj zmian</target>
 
-<source>Save changes to current configuration?</source>
-<target>Zapisać zmiany obecnej konfiguracji?</target>
+<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>Configuration loaded!</source>
 <target>Konfiguracja wczytana!</target>
@@ -969,9 +957,6 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>All directories in sync!</source>
 <target>Wszystkie katalogi zsynchronizowane!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Przed synchronizacją należy uruchomić Porównaj!</target>
-
 <source>Comma separated list</source>
 <target>Lista oddzielona przecinkami</target>
 
@@ -1021,6 +1006,24 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <pluralform>%x z %y rzędów w widoku</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ignoruj kolejne błędy</target>
+
+<source>&Ignore</source>
+<target>&Ignoruj</target>
+
+<source>&Switch</source>
+<target>&Zamień</target>
+
+<source>Question</source>
+<target>Pytanie</target>
+
+<source>&Yes</source>
+<target>&Tak</target>
+
+<source>&No</source>
+<target>&Nie</target>
+
 <source>Scanning...</source>
 <target>Skanowanie...</target>
 
@@ -1206,6 +1209,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Cannot delete directory %x.</source>
 <target>Nie można usunąć katalogu %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Nie można zapisać atrybutów %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Nie można zapisać czasu modyfikacji %x.</target>
 
@@ -1230,9 +1236,6 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Nie można skopiować dowiązania symbolicznego %x do %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Nie można zapisać atrybutów %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Nie można skopiować pliku %x do %y.</target>
 
@@ -1257,11 +1260,8 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>No change since last synchronization!</source>
 <target>Brak zmian od ostatniej synchronizacji!</target>
 
-<source>Filter settings have changed!</source>
-<target>Ustawienia filtra uległy zmianie!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Plik nie został przetworzony podczas ostatniej synchronizacji!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Zgodnie z obecnymi ustawieniami, poszczególne wpisy w bazie danych nie są zsynchronizowane.</target>
 
 <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>
@@ -1330,7 +1330,7 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <target>Nadpisz prawy element</target>
 
 <source>Do nothing</source>
-<target>Nic nie rób</target>
+<target>Nie rób nic</target>
 
 <source>Update attributes on left</source>
 <target>Aktualizuj atrybuty po lewej stronie</target>
@@ -1389,14 +1389,14 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Updating attributes of %x</source>
 <target>Aktualizowanie atrybutów %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Katalog docelowy nie może być pusty.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Pole katalog docelowy nie może być puste.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Nazwa katalogu do wersjonowania plików nie może być pusta.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>Pole katalog źródłowy nie może być puste.</target>
 
-<source>Source directory %x not found.</source>
-<target>Katalog źródłowy %x nie istnieje.</target>
+<source>Source folder %x not found.</source>
+<target>Nie znaleziono katalogu docelowego %x.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Istnieją nierozwiązane konflikty!</target>
@@ -1413,11 +1413,11 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Not enough free disk space available in:</source>
 <target>Brak wystarczającej przestrzeni dyskowej na:</target>
 
-<source>Free disk space required:</source>
-<target>Wymagane wolne miejsce:</target>
+<source>Required:</source>
+<target>Wymagane:</target>
 
-<source>Free disk space available:</source>
-<target>Wolne miejsce:</target>
+<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>
@@ -1428,6 +1428,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Processing folder pair:</source>
 <target>Przetwarzanie folderów:</target>
 
+<source>Target folder %x already existing.</source>
+<target>Katalog docelowy %x już istnieje.</target>
+
 <source>Generating database...</source>
 <target>Generowanie bazy danych...</target>
 
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index 70530ccb..b75ffb70 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>Sobre</target>
 
-<source>Warning</source>
-<target>Atenção</target>
-
-<source>Question</source>
-<target>Questão</target>
-
 <source>Confirm</source>
 <target>Confirmar</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Atenção</target>
+
 <source>Fatal Error</source>
 <target>Erro crítico</target>
 
@@ -139,12 +136,6 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Não é possível ler o ficheiro %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Não é possível escrever o ficheiro %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Base de dados %x não é compatível.</target>
 
@@ -154,9 +145,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Base de dados %x não existe.</target>
 
+<source>Database file is corrupt:</source>
+<target></target>
+
 <source>Out of memory!</source>
 <target>Sem memória disponível!</target>
 
+<source>Cannot write file %x.</source>
+<target>Não é possível escrever o ficheiro %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Não é possível ler o ficheiro %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>As bases de dados são de sessões diferentes.</target>
 
@@ -205,6 +205,9 @@
 <source>/sec</source>
 <target>/seg</target>
 
+<source>Cannot find file %x.</source>
+<target>Não é possível encontrar o ficheiro %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Ficheiro %x não tem uma configuração válida.</target>
 
@@ -229,14 +232,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>Não é possível ler os elementos XML:</target>
 
-<source>Cannot find file %x.</source>
-<target>Não é possível encontrar o ficheiro %x.</target>
-
 <source>&Open...</source>
 <target>&Abrir...</target>
 
-<source>&Save...</source>
-<target>&Guardar...</target>
+<source>Save &As...</source>
+<target></target>
 
 <source>&Quit</source>
 <target>S&air</target>
@@ -312,8 +312,8 @@ O comando é executado se:
 <source>(Build: %x)</source>
 <target>(Build: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>Configuração do RealtimeSync</target>
+<source>All files</source>
+<target></target>
 
 <source>&Restore</source>
 <target>&Restaurar</target>
@@ -327,8 +327,8 @@ O comando é executado se:
 <source>Waiting for missing directories...</source>
 <target>A aguardar pelos directórios em falta...</target>
 
-<source>An input folder name is empty.</source>
-<target>Um dos campos de comparação está vazio.</target>
+<source>A folder input field is empty.</source>
+<target></target>
 
 <source>Logging</source>
 <target>A escrever em log</target>
@@ -351,11 +351,8 @@ O comando é executado se:
 <source>Custom</source>
 <target>Personalizado</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync ficheiro batch</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync configuração</target>
+<source>FreeFileSync batch</source>
+<target></target>
 
 <source>Batch execution</source>
 <target>Execução do batch</target>
@@ -393,18 +390,18 @@ O comando é executado se:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Não é possível ligar a sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>Mais recente versão do FreeFileSync disponível:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target></target>
 
 <source>Download now?</source>
 <target>Fazer download agora?</target>
 
-<source>Information</source>
-<target>Informação</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync está actualizado!</target>
 
+<source>Information</source>
+<target>Informação</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Deseja que o FreeFileSync procure automaticamente actualizações todas as semanas?</target>
 
@@ -438,6 +435,12 @@ O comando é executado se:
 <source>Extension</source>
 <target>Extensão</target>
 
+<source>Size:</source>
+<target></target>
+
+<source>Date:</source>
+<target></target>
+
 <source>Action</source>
 <target>Ação</target>
 
@@ -471,6 +474,9 @@ O comando é executado se:
 <source>&New</source>
 <target>&Novo</target>
 
+<source>&Save</source>
+<target></target>
+
 <source>&Language</source>
 <target>&Língua</target>
 
@@ -537,11 +543,8 @@ O comando é executado se:
 <source>Number of files and folders that will be deleted</source>
 <target>Número de ficheiros e pastas a ser eliminados</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Volume de dados a ser transferido</target>
-
-<source>Operation:</source>
-<target>Operação:</target>
+<source>Total bytes to copy</source>
+<target></target>
 
 <source>Items found:</source>
 <target>Elementos encontrados:</target>
@@ -549,11 +552,11 @@ O comando é executado se:
 <source>Speed:</source>
 <target>Velocidade:</target>
 
-<source>Remaining time:</source>
-<target>Tempo restante:</target>
+<source>Time remaining:</source>
+<target></target>
 
-<source>Elapsed time:</source>
-<target>Tempo passado:</target>
+<source>Time elapsed:</source>
+<target></target>
 
 <source>Batch job</source>
 <target>Ficheiro Batch</target>
@@ -674,6 +677,15 @@ Os ficheiros são considerados iguais se
 <source>Source code written in C++ utilizing:</source>
 <target>Código fonte escrito em C++ utilizando:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Se gosta do FreeFileSync</target>
+
+<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>Feedback and suggestions are welcome</source>
 <target>Comentários e sugestões são apreciados</target>
 
@@ -686,39 +698,9 @@ Os ficheiros são considerados iguais se
 <source>Email</source>
 <target>Email</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Pela tradução de FreeFileSync, um agradecimento a:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Se gosta do FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Doar usando PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Publicado sobre GNU General Public License</target>
 
-<source>Ignore further errors</source>
-<target>Ignorar próximos erros</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Ocultar próximas mensagens de erro durante este processo</target>
-
-<source>&Ignore</source>
-<target>&Ignorar</target>
-
-<source>Do not show this dialog again</source>
-<target>Não mostrar este diálogo novamente</target>
-
-<source>&Switch</source>
-<target>&Trocar</target>
-
-<source>&Yes</source>
-<target>&Sim</target>
-
-<source>&No</source>
-<target>&Não</target>
-
 <source>Use Recycle Bin</source>
 <target>Utilizar Reciclagem</target>
 
@@ -791,6 +773,9 @@ 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>
+<target>Não mostrar este diálogo novamente</target>
+
 <source>Find what:</source>
 <target>Procurar:</target>
 
@@ -869,8 +854,14 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Never save changes</source>
 <target>Nunca guardar alterações</target>
 
-<source>Save changes to current configuration?</source>
-<target>Guardar alterações à configuração?</target>
+<source>Do you want to save changes to %x?</source>
+<target></target>
+
+<source>Save</source>
+<target></target>
+
+<source>Don't Save</source>
+<target></target>
 
 <source>Configuration loaded!</source>
 <target>Configuração carregada!</target>
@@ -965,9 +956,6 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>All directories in sync!</source>
 <target>Todas as pastas sincronizadas!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Use Comparar antes da primeira sincronização!</target>
-
 <source>Comma separated list</source>
 <target>Lista de itens separados por vírgulas</target>
 
@@ -1013,6 +1001,24 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <pluralform>%x de %y linhas em vista</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ignorar próximos erros</target>
+
+<source>&Ignore</source>
+<target>&Ignorar</target>
+
+<source>&Switch</source>
+<target>&Trocar</target>
+
+<source>Question</source>
+<target>Questão</target>
+
+<source>&Yes</source>
+<target>&Sim</target>
+
+<source>&No</source>
+<target>&Não</target>
+
 <source>Scanning...</source>
 <target>A pesquisar...</target>
 
@@ -1193,6 +1199,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Cannot delete directory %x.</source>
 <target>Não é possível eliminar o directório %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Não é possível escrever os atributos de %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Não é possível alterar a data de modificação a %x.</target>
 
@@ -1217,9 +1226,6 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Não é possível copiar o link simbólico %x para %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Não é possível escrever os atributos de %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Não é possível copiar o ficheiro %x para %y.</target>
 
@@ -1244,11 +1250,8 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>No change since last synchronization!</source>
 <target>Não há alterações desde a última sincronização!</target>
 
-<source>Filter settings have changed!</source>
-<target>Opções de filtro alteradas!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>O ficheiro não foi processado na última sincronização!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target></target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Escolher direcção de sincronização por defeito: Os ficheiros antigos serão substituídos pelos novos.</target>
@@ -1376,14 +1379,14 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Updating attributes of %x</source>
 <target>Actualizar atributos de %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Nome da pasta de destino não pode estar vazio.</target>
+<source>Target folder input field must not be empty.</source>
+<target></target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Nome da pasta para manter versões não pode estar vazio.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target></target>
 
-<source>Source directory %x not found.</source>
-<target>Directório fonte %x não encontrado.</target>
+<source>Source folder %x not found.</source>
+<target></target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Existem conflitos por resolver!</target>
@@ -1400,11 +1403,11 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Not enough free disk space available in:</source>
 <target>Não há espaço livre suficiente em:</target>
 
-<source>Free disk space required:</source>
-<target>Espaço livre necessário em disco:</target>
+<source>Required:</source>
+<target></target>
 
-<source>Free disk space available:</source>
-<target>Espaço livre disponível em disco:</target>
+<source>Available:</source>
+<target></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>
@@ -1415,6 +1418,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Processing folder pair:</source>
 <target>A processar o par do directorio:</target>
 
+<source>Target folder %x already existing.</source>
+<target></target>
+
 <source>Generating database...</source>
 <target>A gerar base de dados...</target>
 
diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng
index a6e83355..6a7f1332 100644
--- a/BUILD/Languages/portuguese_br.lng
+++ b/BUILD/Languages/portuguese_br.lng
@@ -1,5 +1,5 @@
 <header>
-	<language name>Português do Brasil</language name>
+	<language name>Português (BR)</language name>
 	<translator>Edison Aranha</translator>
 	<locale>pt_BR</locale>
 	<flag file>brazil.png</flag file>
@@ -10,6 +10,18 @@
 <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>
+
+<source>Items remaining:</source>
+<target>Elementos restantes:</target>
+
+<source>Total time:</source>
+<target>Tempo total:</target>
+
 <source>Show in Explorer</source>
 <target>Mostrar no Explorer</target>
 
@@ -58,12 +70,6 @@
 <source>About</source>
 <target>Sobre</target>
 
-<source>Warning</source>
-<target>Avisos</target>
-
-<source>Question</source>
-<target>Questão</target>
-
 <source>Confirm</source>
 <target>Confirmar</target>
 
@@ -109,6 +115,9 @@
 <source>Info</source>
 <target>Informações</target>
 
+<source>Warning</source>
+<target>Avisos</target>
+
 <source>Fatal Error</source>
 <target>Erro fatal</target>
 
@@ -139,12 +148,6 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Não foi possível ler o arquivo %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Não foi possível escrever o arquivo %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>O arquivo de banco de dados %x é incompatível.</target>
 
@@ -154,9 +157,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>O arquivo de banco de dados %x ainda não existe.</target>
 
+<source>Database file is corrupt:</source>
+<target>O arquivo de banco de dados está corrompido</target>
+
 <source>Out of memory!</source>
 <target>Falta de memória!</target>
 
+<source>Cannot write file %x.</source>
+<target>Não foi possível escrever o arquivo %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Não foi possível ler o arquivo %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Os arquivos de banco de dados são de sessões diferentes.</target>
 
@@ -205,6 +217,9 @@
 <source>/sec</source>
 <target>/seg</target>
 
+<source>Cannot find file %x.</source>
+<target>Não foi possível encontrar o aquivo %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>O arquivo %x não contém uma configuração válida.</target>
 
@@ -226,17 +241,14 @@
 <source>Volume name %x not part of file name %y!</source>
 <target>Nome do volume %x não é parte do arquivo %y!</target>
 
-<source>Cannot find file %x.</source>
-<target>Não foi possível encontrar o aquivo %x.</target>
-
 <source>Cannot read the following XML elements:</source>
 <target>Não foi possível ler os seguintes elementos XML:</target>
 
 <source>&Open...</source>
 <target>&Abrir...</target>
 
-<source>&Save...</source>
-<target>&Salvar...</target>
+<source>Save &As...</source>
+<target>Salvar &Como...</target>
 
 <source>&Quit</source>
 <target>Sai&r</target>
@@ -312,8 +324,8 @@ O comando é disparado se:
 <source>(Build: %x)</source>
 <target>(Versão: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>Configuração do RealtimeSync</target>
+<source>All files</source>
+<target>Todos os arquivos</target>
 
 <source>&Restore</source>
 <target>&Restaurar</target>
@@ -327,8 +339,8 @@ O comando é disparado se:
 <source>Waiting for missing directories...</source>
 <target>Esperando por diretórios faltantes...</target>
 
-<source>An input folder name is empty.</source>
-<target>Um nome de pasta de entrada está em branco.</target>
+<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>
@@ -351,26 +363,8 @@ O comando é disparado se:
 <source>Custom</source>
 <target>Personalizado</target>
 
-<source>FreeFileSync batch file</source>
-<target>Arquivo de lote do FreeFileSync</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync configuração</target>
-
-<source>Batch execution</source>
-<target>Execução da tarefa em lote</target>
-
-<source>Items processed:</source>
-<target>Elementos processados:</target>
-
-<source>Items remaining:</source>
-<target>Elementos restantes:</target>
-
-<source>Total time:</source>
-<target>Tempo total:</target>
-
-<source>Stop</source>
-<target>Parar</target>
+<source>FreeFileSync batch</source>
+<target>Tarefa em lote do FreeFileSync</target>
 
 <source>Synchronization aborted!</source>
 <target>Sincronização cancelada!</target>
@@ -393,18 +387,18 @@ O comando é disparado se:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Não foi possível conectar a sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
+<source>A new version of FreeFileSync is available:</source>
 <target>Uma nova versão do FreeFileSync está disponível:</target>
 
 <source>Download now?</source>
 <target>Baixar agora?</target>
 
-<source>Information</source>
-<target>Informação</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync está atualizado!</target>
 
+<source>Information</source>
+<target>Informação</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Deseja que o FreeFileSync procure automaticamente novas versões todas as semanas?</target>
 
@@ -438,6 +432,12 @@ O comando é disparado se:
 <source>Extension</source>
 <target>Extensão</target>
 
+<source>Size:</source>
+<target>Tamanho:</target>
+
+<source>Date:</source>
+<target>Data:</target>
+
 <source>Action</source>
 <target>Ação</target>
 
@@ -463,7 +463,7 @@ O comando é disparado se:
 <target>Hibernar</target>
 
 <source>1. &Compare</source>
-<target>1. &Comparar</target>
+<target>1. C&omparar</target>
 
 <source>2. &Synchronize</source>
 <target>2. S&incronizar</target>
@@ -471,6 +471,9 @@ O comando é disparado se:
 <source>&New</source>
 <target>&Novo</target>
 
+<source>&Save</source>
+<target>&Salvar</target>
+
 <source>&Language</source>
 <target>&Idioma</target>
 
@@ -537,11 +540,8 @@ O comando é disparado se:
 <source>Number of files and folders that will be deleted</source>
 <target>Número de arquivos e pastas que serão apagados</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Volume total de dados que será transferido</target>
-
-<source>Operation:</source>
-<target>Operação:</target>
+<source>Total bytes to copy</source>
+<target>Bytes totais a serem copiados</target>
 
 <source>Items found:</source>
 <target>Elementos encontrados:</target>
@@ -549,10 +549,10 @@ O comando é disparado se:
 <source>Speed:</source>
 <target>Velocidade:</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>Tempo restante:</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>Tempo decorrido:</target>
 
 <source>Batch job</source>
@@ -675,6 +675,15 @@ Os arquivos são considerados iguais se
 <source>Source code written in C++ utilizing:</source>
 <target>Código-fonte escrito em C++ utilizando:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Se você gosta do FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>Doar usando PayPal</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Pela tradução do FreeFileSync, um agradecimento a:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>Críticas e sugestões são bem-vindas</target>
 
@@ -687,39 +696,9 @@ Os arquivos são considerados iguais se
 <source>Email</source>
 <target>E-mail</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Pela tradução do FreeFileSync, um agradecimento a:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Se você gosta do FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Doar usando PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Publicado sobre a GNU General Public License</target>
 
-<source>Ignore further errors</source>
-<target>Ignorar erros subsequentes</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Ocultar próximas mensagens de erro durante este processo</target>
-
-<source>&Ignore</source>
-<target>&Ignorar</target>
-
-<source>Do not show this dialog again</source>
-<target>Não mostrar este diálogo novamente</target>
-
-<source>&Switch</source>
-<target>&Alterar</target>
-
-<source>&Yes</source>
-<target>&Sim</target>
-
-<source>&No</source>
-<target>&Não</target>
-
 <source>Use Recycle Bin</source>
 <target>Utilizar Lixeira</target>
 
@@ -760,7 +739,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <target>&Config. Padrão</target>
 
 <source>Fail-safe file copy</source>
-<target>Cópia de arquivos a prova de falha</target>
+<target>Cópia de arquivos a prova de falhas</target>
 
 <source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
 <target>Escreve para um arquivo temporário primeiro (*.ffs_tmp) e depois o renomeia. Isto garante um estado consistente mesmo em caso de erro fatal.</target>
@@ -792,6 +771,9 @@ 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>Find what:</source>
 <target>Localizar o que:</target>
 
@@ -870,8 +852,14 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Never save changes</source>
 <target>Nunca salvar alterações</target>
 
-<source>Save changes to current configuration?</source>
-<target>Salvar modificações para a configuração atual?</target>
+<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>Configuration loaded!</source>
 <target>Configuração carregada!</target>
@@ -966,9 +954,6 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>All directories in sync!</source>
 <target>Todos os diretórios em sincronismo!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Por favor execute primeiro a Comparação antes de sincronizar!</target>
-
 <source>Comma separated list</source>
 <target>Lista de itens separados por vírgulas</target>
 
@@ -1014,6 +999,24 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <pluralform>%x de %y linhas</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ignorar erros subsequentes</target>
+
+<source>&Ignore</source>
+<target>&Ignorar</target>
+
+<source>&Switch</source>
+<target>&Alterar</target>
+
+<source>Question</source>
+<target>Questão</target>
+
+<source>&Yes</source>
+<target>&Sim</target>
+
+<source>&No</source>
+<target>&Não</target>
+
 <source>Scanning...</source>
 <target>Pesquisando...</target>
 
@@ -1194,6 +1197,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Cannot delete directory %x.</source>
 <target>Não foi possível excluir o diretório %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Não foi possível escrever os atributos de arquivo de %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Não foi possível escrever a data de modificação de %x.</target>
 
@@ -1218,9 +1224,6 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Não foi possível copiar o link simbólico %x para %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Não foi possível escrever os atributos de arquivo de %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Não foi possível copiar o arquivo %x para %y.</target>
 
@@ -1245,11 +1248,8 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>No change since last synchronization!</source>
 <target>Nenhuma mudança desde a última sincronização!</target>
 
-<source>Filter settings have changed!</source>
-<target>As configurações do filtro foram alteradas!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>O arquivo não foi processado pela última sincronização!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>As entradas de banco de dados correspondentes não estão em sincronia considerando as configurações atuais.</target>
 
 <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>
@@ -1315,7 +1315,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <target>Sobrescrever item à esquerda</target>
 
 <source>Overwrite right item</source>
-<target>Sobrescrever item à esquerda</target>
+<target>Sobrescrever item à direita</target>
 
 <source>Do nothing</source>
 <target>Não fazer nada</target>
@@ -1377,14 +1377,14 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Updating attributes of %x</source>
 <target>Atualizando atributos de %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>O nome da pasta de destino não pode estar em branco.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Campo de entrada da pasta de destino não pode ficar vazio.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>O nome da pasta para o controle de versões não pode estar em branco.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>Campo de entrada da pasta para controle de versão não pode ficar vazio.</target>
 
-<source>Source directory %x not found.</source>
-<target>O diretório de origem %x não foi encontrado.</target>
+<source>Source folder %x not found.</source>
+<target>Pasta de origem %x não foi encontrada.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Conflitos não resolvidos existentes!</target>
@@ -1401,11 +1401,11 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Not enough free disk space available in:</source>
 <target>Espaço em disco insuficiente em:</target>
 
-<source>Free disk space required:</source>
-<target>Espaço livre em disco requerido:</target>
+<source>Required:</source>
+<target>Requerido:</target>
 
-<source>Free disk space available:</source>
-<target>Espaço livre em disco:</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>
@@ -1416,6 +1416,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Processing folder pair:</source>
 <target>Processando par de pastas:</target>
 
+<source>Target folder %x already existing.</source>
+<target>Pasta de destino %x já existe.</target>
+
 <source>Generating database...</source>
 <target>Gerando banco de dados...</target>
 
diff --git a/BUILD/Languages/romanian.lng b/BUILD/Languages/romanian.lng
index 1e526883..9c0f7999 100644
--- a/BUILD/Languages/romanian.lng
+++ b/BUILD/Languages/romanian.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>Despre</target>
 
-<source>Warning</source>
-<target>Atenție</target>
-
-<source>Question</source>
-<target>Întrebare</target>
-
 <source>Confirm</source>
 <target>Confirmare</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Informații</target>
 
+<source>Warning</source>
+<target>Atenție</target>
+
 <source>Fatal Error</source>
 <target>Eroare Fatală</target>
 
@@ -140,12 +137,6 @@
 <pluralform>%x de Baiți</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Nu pot citi fila %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Nu pot scrie fila %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Fila cu baza de date %x este incompatibilă.</target>
 
@@ -155,9 +146,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Fila cu baza de date %x nu există încă.</target>
 
+<source>Database file is corrupt:</source>
+<target>Fila bazei de date este stricată (coruptă)</target>
+
 <source>Out of memory!</source>
 <target>Memorie epuizată!</target>
 
+<source>Cannot write file %x.</source>
+<target>Nu pot scrie fila %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Nu pot citi fila %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Filele cu baze de date nu partajează o sesiune comună.</target>
 
@@ -208,6 +208,9 @@
 <source>/sec</source>
 <target>/sec</target>
 
+<source>Cannot find file %x.</source>
+<target>Nu pot găsi fila %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Fila %x nu conține o configurație validă.</target>
 
@@ -232,14 +235,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>Nu pot citi următoarele elemente XML:</target>
 
-<source>Cannot find file %x.</source>
-<target>Nu pot găsi fila %x.</target>
-
 <source>&Open...</source>
 <target>&Deschide...</target>
 
-<source>&Save...</source>
-<target>&Salvează...</target>
+<source>Save &As...</source>
+<target>Salvează c&a...</target>
 
 <source>&Quit</source>
 <target>&Ieși</target>
@@ -315,8 +315,8 @@ Comanda este declanșată dacă:
 <source>(Build: %x)</source>
 <target>(Compilația: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>Configurația RealtimeSync</target>
+<source>All files</source>
+<target>Toate Filele</target>
 
 <source>&Restore</source>
 <target>&Restaurează</target>
@@ -330,8 +330,8 @@ Comanda este declanșată dacă:
 <source>Waiting for missing directories...</source>
 <target>Aștept ca dosarele lipsă să devină disponibile...</target>
 
-<source>An input folder name is empty.</source>
-<target>Un cîmp de introducere a numelui de dosar este gol.</target>
+<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>
@@ -354,11 +354,8 @@ Comanda este declanșată dacă:
 <source>Custom</source>
 <target>Sincronizare Personalizată</target>
 
-<source>FreeFileSync batch file</source>
-<target>Filă Set FreeFileSync</target>
-
-<source>FreeFileSync configuration</source>
-<target>Configurație FreeFileSync</target>
+<source>FreeFileSync batch</source>
+<target>Set FreeFileSync</target>
 
 <source>Batch execution</source>
 <target>Execută Fila Set</target>
@@ -396,18 +393,18 @@ Comanda este declanșată dacă:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Conectarea la situl sourceforge.net nu poate fi realizată!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
+<source>A new version of FreeFileSync is available:</source>
 <target>Este disponibilă o versiune nouă a softului:</target>
 
 <source>Download now?</source>
 <target>Vrei s-o descarci acum ?</target>
 
-<source>Information</source>
-<target>Informații</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>Ai deja ultima versiune a softului!</target>
 
+<source>Information</source>
+<target>Informații</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Vrei ca FreeFileSync să caute automat actualizări în fiecare săptămînă ?</target>
 
@@ -441,6 +438,12 @@ Comanda este declanșată dacă:
 <source>Extension</source>
 <target>Extensie</target>
 
+<source>Size:</source>
+<target>Mărime:</target>
+
+<source>Date:</source>
+<target>Dată:</target>
+
 <source>Action</source>
 <target>Acțiune</target>
 
@@ -474,6 +477,9 @@ Comanda este declanșată dacă:
 <source>&New</source>
 <target>Configurație &Nouă</target>
 
+<source>&Save</source>
+<target>&Salvează</target>
+
 <source>&Language</source>
 <target>&Limbă</target>
 
@@ -540,11 +546,8 @@ Comanda este declanșată dacă:
 <source>Number of files and folders that will be deleted</source>
 <target>Numărul de file și dosare care vor fi șterse</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Volumul total de date care va fi transferat</target>
-
-<source>Operation:</source>
-<target>Operație:</target>
+<source>Total bytes to copy</source>
+<target>Numărul total de baiți copiați</target>
 
 <source>Items found:</source>
 <target>Elemente Găsite:</target>
@@ -552,10 +555,10 @@ Comanda este declanșată dacă:
 <source>Speed:</source>
 <target>Viteză:</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>Timp Rămas:</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>Timp Scurs:</target>
 
 <source>Batch job</source>
@@ -678,6 +681,15 @@ este același
 <source>Source code written in C++ utilizing:</source>
 <target>Cod sursă scris în C++ folosind:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Donează pentru FreeFileSync</target>
+
+<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>Feedback and suggestions are welcome</source>
 <target>Opiniile și sugestiile despre program sînt binevenite</target>
 
@@ -690,39 +702,9 @@ este același
 <source>Email</source>
 <target>Adresa Autorului</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Mulțumiri pentru traducerea FreeFileSync:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Donează pentru FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Donează prin PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Publicat sub licența GNU GPL</target>
 
-<source>Ignore further errors</source>
-<target>Ignoră erorile ulterioare</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Ascunde mesajele de eroare apărute ulterior în timpul acestui proces</target>
-
-<source>&Ignore</source>
-<target>&Ignoră</target>
-
-<source>Do not show this dialog again</source>
-<target>Nu arăta acest dialog din nou</target>
-
-<source>&Switch</source>
-<target>&Comută</target>
-
-<source>&Yes</source>
-<target>&Da</target>
-
-<source>&No</source>
-<target>&Nu</target>
-
 <source>Use Recycle Bin</source>
 <target>Mută în Reciclator</target>
 
@@ -795,6 +777,9 @@ 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>Find what:</source>
 <target>Găsește Asta:</target>
 
@@ -873,8 +858,14 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Never save changes</source>
 <target>Nu salva niciodată modificările</target>
 
-<source>Save changes to current configuration?</source>
-<target>Vrei să salvezi modificările configurației curente?</target>
+<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>Configuration loaded!</source>
 <target>Configurație deschisă !</target>
@@ -969,9 +960,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>All directories in sync!</source>
 <target>Toate dosarele au fost sincronizate!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Rulează compararea înainte de a sincroniza!</target>
-
 <source>Comma separated list</source>
 <target>Listă de elemente separate prin virgulă</target>
 
@@ -1021,6 +1009,24 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <pluralform>%x din %y de rînduri afișate</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ignoră erorile ulterioare</target>
+
+<source>&Ignore</source>
+<target>&OK</target>
+
+<source>&Switch</source>
+<target>&Comută</target>
+
+<source>Question</source>
+<target>Întrebare</target>
+
+<source>&Yes</source>
+<target>&Da</target>
+
+<source>&No</source>
+<target>&Nu</target>
+
 <source>Scanning...</source>
 <target>Scanez...</target>
 
@@ -1206,6 +1212,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Cannot delete directory %x.</source>
 <target>Nu pot șterge dosarul %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Nu pot scrie atributele de filă ale lui %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Nu pot scrie modificarea timpului pentru %x.</target>
 
@@ -1230,9 +1239,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Nu pot copia legătura simbolică %x în %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Nu pot scrie atributele de filă ale lui %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Nu pot copia fila %x în %y.</target>
 
@@ -1257,11 +1263,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>No change since last synchronization!</source>
 <target>Nu sînt schimbări de la ultima sincronizare!</target>
 
-<source>Filter settings have changed!</source>
-<target>Setările filtrului au fost schimbate!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Fila nu a fost procesată la ultima sincronizare!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Intrările corespondente din baza de date nu sînt considerate sincronizate, avînd în vedere setările curente.</target>
 
 <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>
@@ -1389,13 +1392,13 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Updating attributes of %x</source>
 <target>Actualizez atributele lui %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Numele dosarului țintă nu poate să lipsească.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Cîmpul de introducere a dosarului țintă nu trebuie să fie gol.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Numele dosarului pentru versionarea filelor nu poate să lipsească.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>Cîmpul de introducere a dosarului pentru versionare nu trebuie să fie gol.</target>
 
-<source>Source directory %x not found.</source>
+<source>Source folder %x not found.</source>
 <target>Dosarul sursă %x nu a fost găsit.</target>
 
 <source>Unresolved conflicts existing!</source>
@@ -1413,11 +1416,11 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Not enough free disk space available in:</source>
 <target>Spațiu de stocare insuficient pe:</target>
 
-<source>Free disk space required:</source>
-<target>Spațiu liber necesar:</target>
+<source>Required:</source>
+<target>Necesar:</target>
 
-<source>Free disk space available:</source>
-<target>Spațiu liber disponibil:</target>
+<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>
@@ -1428,6 +1431,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Processing folder pair:</source>
 <target>Procesez perechea de dosare:</target>
 
+<source>Target folder %x already existing.</source>
+<target>Dosarul țintă %x există deja.</target>
+
 <source>Generating database...</source>
 <target>Generez baza de date...</target>
 
diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng
index 79b98c07..2bf43563 100644
--- a/BUILD/Languages/russian.lng
+++ b/BUILD/Languages/russian.lng
@@ -10,6 +10,18 @@
 <source>Searching for folder %x...</source>
 <target>Поиск папки %x...</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>Show in Explorer</source>
 <target>Показать в Проводнике</target>
 
@@ -58,12 +70,6 @@
 <source>About</source>
 <target>О программе</target>
 
-<source>Warning</source>
-<target>Внимание</target>
-
-<source>Question</source>
-<target>Вопрос</target>
-
 <source>Confirm</source>
 <target>Подтвердить</target>
 
@@ -109,6 +115,9 @@
 <source>Info</source>
 <target>Информация</target>
 
+<source>Warning</source>
+<target>Внимание</target>
+
 <source>Fatal Error</source>
 <target>Критическая ошибка</target>
 
@@ -140,12 +149,6 @@
 <pluralform>%x Байт</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Не удается прочитать файл %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Не удается записать файл %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Файл базы данных %x несовместим.</target>
 
@@ -155,9 +158,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Файл базы данных %x еще не существует.</target>
 
+<source>Database file is corrupt:</source>
+<target>Файл базы данных поврежден:</target>
+
 <source>Out of memory!</source>
 <target>Недостаточно памяти!</target>
 
+<source>Cannot write file %x.</source>
+<target>Не удается записать файл %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Не удается прочитать файл %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Файлы баз данных не имеют общей сессии.</target>
 
@@ -208,6 +220,9 @@
 <source>/sec</source>
 <target>/с</target>
 
+<source>Cannot find file %x.</source>
+<target>Не удается найти файл %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Файл %x не содержит действительной конфигурации.</target>
 
@@ -232,14 +247,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>Невозможно прочитать следующие XML элементы:</target>
 
-<source>Cannot find file %x.</source>
-<target>Не удается найти файл %x.</target>
-
 <source>&Open...</source>
 <target>&Открыть...</target>
 
-<source>&Save...</source>
-<target>&Сохранить...</target>
+<source>Save &As...</source>
+<target>Сохранить &как...</target>
 
 <source>&Quit</source>
 <target>&Выход</target>
@@ -316,7 +328,7 @@ The command is triggered if:
 <target>(сборка %x)</target>
 
 <source>All files</source>
-<target></target>
+<target>Все файлы</target>
 
 <source>&Restore</source>
 <target>&Восстановить</target>
@@ -330,8 +342,8 @@ The command is triggered if:
 <source>Waiting for missing directories...</source>
 <target>Ожидание пропущенных папок...</target>
 
-<source>An input folder name is empty.</source>
-<target>Поле ввода имени папки пустое.</target>
+<source>A folder input field is empty.</source>
+<target>Поле ввода папки пустое.</target>
 
 <source>Logging</source>
 <target>Лог-файлы</target>
@@ -354,23 +366,8 @@ The command is triggered if:
 <source>Custom</source>
 <target>Выборочно</target>
 
-<source>FreeFileSync batch file</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>FreeFileSync batch</source>
+<target>Пакетное задание FreeFileSync</target>
 
 <source>Synchronization aborted!</source>
 <target>Синхронизация отменена!</target>
@@ -393,7 +390,7 @@ The command is triggered if:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Невозможно соединиться с sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
+<source>A new version of FreeFileSync is available:</source>
 <target>Доступна новая версия FreeFileSync:</target>
 
 <source>Download now?</source>
@@ -438,6 +435,12 @@ The command is triggered if:
 <source>Extension</source>
 <target>Расширение</target>
 
+<source>Size:</source>
+<target>Размер:</target>
+
+<source>Date:</source>
+<target>Дата:</target>
+
 <source>Action</source>
 <target>Действие</target>
 
@@ -471,6 +474,9 @@ The command is triggered if:
 <source>&New</source>
 <target>&Новая</target>
 
+<source>&Save</source>
+<target>&Сохранить</target>
+
 <source>&Language</source>
 <target>&Язык</target>
 
@@ -540,8 +546,8 @@ The command is triggered if:
 <source>Number of files and folders that will be deleted</source>
 <target>Количество файлов и папок, которые будут удалены</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Общий объем данных, который будет передаваться</target>
+<source>Total bytes to copy</source>
+<target>Всего байт для копирования</target>
 
 <source>Items found:</source>
 <target>Элементов найдено:</target>
@@ -549,10 +555,10 @@ The command is triggered if:
 <source>Speed:</source>
 <target>Скорость:</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>Времени осталось:</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>Времени прошло:</target>
 
 <source>Batch job</source>
@@ -670,6 +676,15 @@ is the same
 <source>Source code written in C++ utilizing:</source>
 <target>Исходный код написан на C++ с использованием:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Если Вам понравился FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>Отправить деньги через PayPal</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Большое спасибо за перевод FreeFileSync:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>Замечания и предложения приветствуются</target>
 
@@ -682,39 +697,9 @@ is the same
 <source>Email</source>
 <target>Почта</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Большое спасибо за перевод FreeFileSync:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Если Вам понравился FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Отправить деньги через PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Издается под лицензией GNU General Public License</target>
 
-<source>Ignore further errors</source>
-<target>Игнорировать последующие ошибки</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Скрыть последующие ошибки во время текущего процесса</target>
-
-<source>&Ignore</source>
-<target>&Игнорировать</target>
-
-<source>Do not show this dialog again</source>
-<target>Больше не показывать это окно</target>
-
-<source>&Switch</source>
-<target>&Переключить</target>
-
-<source>&Yes</source>
-<target>&Да</target>
-
-<source>&No</source>
-<target>&Нет</target>
-
 <source>Use Recycle Bin</source>
 <target>Использовать "Корзину"</target>
 
@@ -787,6 +772,9 @@ 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>Find what:</source>
 <target>Найти:</target>
 
@@ -865,8 +853,14 @@ Note: File names must be relative to base directories!
 <source>Never save changes</source>
 <target>Никогда не сохранять изменения</target>
 
-<source>Save changes to current configuration?</source>
-<target>Сохранить изменения в текущих настройках синхронизации?</target>
+<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>Configuration loaded!</source>
 <target>Настройки синхронизации загружены!</target>
@@ -961,9 +955,6 @@ Note: File names must be relative to base directories!
 <source>All directories in sync!</source>
 <target>Все папки синхронизированы!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Пожалуйста, запустите сравнение перед синхронизацией!</target>
-
 <source>Comma separated list</source>
 <target>Список, разделяемый запятыми</target>
 
@@ -1013,6 +1004,24 @@ Note: File names must be relative to base directories!
 <pluralform>%x из %y строк показано</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Игнорировать последующие ошибки</target>
+
+<source>&Ignore</source>
+<target>&Игнорировать</target>
+
+<source>&Switch</source>
+<target>&Переключить</target>
+
+<source>Question</source>
+<target>Вопрос</target>
+
+<source>&Yes</source>
+<target>&Да</target>
+
+<source>&No</source>
+<target>&Нет</target>
+
 <source>Scanning...</source>
 <target>Сканирование...</target>
 
@@ -1201,12 +1210,12 @@ Note: File names must be relative to base directories!
 <source>Cannot delete directory %x.</source>
 <target>Не удается удалить папку %x.</target>
 
-<source>Cannot write modification time of %x.</source>
-<target>Не удается записать время модификации файла %x.</target>
-
 <source>Cannot write file attributes of %x.</source>
 <target>Не удается записать атрибуты файла %x.</target>
 
+<source>Cannot write modification time of %x.</source>
+<target>Не удается записать время модификации файла %x.</target>
+
 <source>Cannot find system function %x.</source>
 <target>Не удается найти системную функцию %x.</target>
 
@@ -1252,11 +1261,8 @@ Note: File names must be relative to base directories!
 <source>No change since last synchronization!</source>
 <target>Никаких изменений с последней синхронизации!</target>
 
-<source>Filter settings have changed!</source>
-<target>Настройки фильтра были изменены!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Файл не был обработан при последней синхронизации!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Соответствующие записи в базе данных не синхронизированы с учетом текущих настроек.</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>
@@ -1387,13 +1393,13 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>Обновление атрибутов %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Путь целевой папки не должен быть пустым.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Поле ввода целевой папки не должно быть пустым.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Путь папки для старых версий файлов не должен быть пустым.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>Поле ввода папки для старых версий файлов не должно быть пустым.</target>
 
-<source>Source directory %x not found.</source>
+<source>Source folder %x not found.</source>
 <target>Исходная папка %x не найдена.</target>
 
 <source>Unresolved conflicts existing!</source>
@@ -1411,11 +1417,11 @@ Note: File names must be relative to base directories!
 <source>Not enough free disk space available in:</source>
 <target>Не достаточно свободного места в:</target>
 
-<source>Free disk space required:</source>
-<target>Требуемое свободное место на диске:</target>
+<source>Required:</source>
+<target>Требуется:</target>
 
-<source>Free disk space available:</source>
-<target>Доступно свободного места на диске:</target>
+<source>Available:</source>
+<target>Доступно:</target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Для этого пути "Корзина" не доступна! Файлы будут удалены безвозвратно:</target>
@@ -1426,6 +1432,9 @@ Note: File names must be relative to base directories!
 <source>Processing folder pair:</source>
 <target>Обработка пары папок:</target>
 
+<source>Target folder %x already existing.</source>
+<target>Целевая папка %x уже существует.</target>
+
 <source>Generating database...</source>
 <target>Создание базы данных...</target>
 
diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index 49461187..21511cea 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>O programu(1)</target>
 
-<source>Warning</source>
-<target>Pozor</target>
-
-<source>Question</source>
-<target>Vprašanje</target>
-
 <source>Confirm</source>
 <target>Potrdi</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Pozor</target>
+
 <source>Fatal Error</source>
 <target>Usodna napaka</target>
 
@@ -141,14 +138,8 @@
 <pluralform>%x Bajtov</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Ne morem prebrati datoteke %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Ne morem zapisati datoteke %x.</target>
-
 <source>Database file %x is incompatible.</source>
-<target>Datoteka podatkovne baze %x je nekopatibilna.</target>
+<target>Datoteka podatkovne baze %x je nekompatibilna.</target>
 
 <source>Initial synchronization:</source>
 <target>Začetna sinhronizacija:</target>
@@ -156,9 +147,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Datoteka podatkovne baze %x še ne obstaja.</target>
 
+<source>Database file is corrupt:</source>
+<target>Datoteka podatkovne baze je poškodovana:</target>
+
 <source>Out of memory!</source>
 <target>Zmanjkalo pomnilnika!</target>
 
+<source>Cannot write file %x.</source>
+<target>Ne morem zapisati datoteke %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Ne morem prebrati datoteke %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Datoteke podatkovne baze si ne delijo skupne seje.</target>
 
@@ -211,6 +211,9 @@
 <source>/sec</source>
 <target>/sek</target>
 
+<source>Cannot find file %x.</source>
+<target>Ne morem najti datoteke %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Datoteka %x ne vsebuje veljavnih nastavitev</target>
 
@@ -235,14 +238,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>Ne morem brati naslednje XML elemente:</target>
 
-<source>Cannot find file %x.</source>
-<target>Ne morem najti datoteke %x.</target>
-
 <source>&Open...</source>
 <target>&Odpri...</target>
 
-<source>&Save...</source>
-<target>&Shrani...</target>
+<source>Save &As...</source>
+<target>Shr&ani kot...</target>
 
 <source>&Quit</source>
 <target>&Zapri</target>
@@ -318,8 +318,8 @@ Ukaz se sproži če:
 <source>(Build: %x)</source>
 <target>(Izgradnja: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>RealtimeSync nastavitve</target>
+<source>All files</source>
+<target>Vse datoteke</target>
 
 <source>&Restore</source>
 <target>&Obnovi</target>
@@ -333,8 +333,8 @@ Ukaz se sproži če:
 <source>Waiting for missing directories...</source>
 <target>Čakam na manjkajoče imenike...</target>
 
-<source>An input folder name is empty.</source>
-<target>Vhodno ime mape je prazno.</target>
+<source>A folder input field is empty.</source>
+<target>Vnosno polje za mapo je prazno.</target>
 
 <source>Logging</source>
 <target>Beleženje</target>
@@ -357,11 +357,8 @@ Ukaz se sproži če:
 <source>Custom</source>
 <target>Po meri</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync paketna datoteka</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync konfiguracija</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync paket</target>
 
 <source>Batch execution</source>
 <target>Paketno izvajanje</target>
@@ -399,18 +396,18 @@ Ukaz se sproži če:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Ne morem se povezati na sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>Na voljo je nova različica FreeFileSync:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>Nova različica FreeFileSync je na voljo:</target>
 
 <source>Download now?</source>
 <target>Prenesem sedaj?</target>
 
-<source>Information</source>
-<target>Informacije</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync je posodobljen!</target>
 
+<source>Information</source>
+<target>Informacije</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Ali želite, da FreeFileSync samodejno preverja za posodobitve vsak teden?</target>
 
@@ -444,6 +441,12 @@ Ukaz se sproži če:
 <source>Extension</source>
 <target>Razširitev</target>
 
+<source>Size:</source>
+<target>Velikost:</target>
+
+<source>Date:</source>
+<target>Datum:</target>
+
 <source>Action</source>
 <target>Ukrep</target>
 
@@ -477,6 +480,9 @@ Ukaz se sproži če:
 <source>&New</source>
 <target>&Novo</target>
 
+<source>&Save</source>
+<target>&Shrani</target>
+
 <source>&Language</source>
 <target>&Jezik</target>
 
@@ -543,11 +549,8 @@ Ukaz se sproži če:
 <source>Number of files and folders that will be deleted</source>
 <target>Število datotek in map, ki bodo izbrisane</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Količina podatkov, ki bo prenesena</target>
-
-<source>Operation:</source>
-<target>Operacija:</target>
+<source>Total bytes to copy</source>
+<target>Skupno bajtov za kopiranje</target>
 
 <source>Items found:</source>
 <target>Najdenih elementov:</target>
@@ -555,11 +558,11 @@ Ukaz se sproži če:
 <source>Speed:</source>
 <target>Hitrost:</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>Preostali čas:</target>
 
-<source>Elapsed time:</source>
-<target>Pretečen čas:</target>
+<source>Time elapsed:</source>
+<target>Pretečeni čas:</target>
 
 <source>Batch job</source>
 <target>Paketno opravilo</target>
@@ -681,6 +684,15 @@ enaka
 <source>Source code written in C++ utilizing:</source>
 <target>Izvorna koda napisana v C++ z uporabo:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Če vam je FreeFileSync všeč</target>
+
+<source>Donate with PayPal</source>
+<target>Doniraj s PayPal</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Zahvale za prevod FreeFileSync gredo:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>Povratne informacije in predlogi so dobrodošli</target>
 
@@ -693,39 +705,9 @@ enaka
 <source>Email</source>
 <target>Email</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Zahvale za prevod FreeFileSync gredo:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Če vam je FreeFileSync všeč</target>
-
-<source>Donate with PayPal</source>
-<target>Doniraj s PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Objavljeno pod licenco GNU General Public</target>
 
-<source>Ignore further errors</source>
-<target>Ignoriraj nadaljnje napake</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Skrijte nadaljnja obvestila o napakah med trenutnim procesom</target>
-
-<source>&Ignore</source>
-<target>&Ignoriraj</target>
-
-<source>Do not show this dialog again</source>
-<target>Ne prikaži več tega pogovornega okna</target>
-
-<source>&Switch</source>
-<target>&Preklopi</target>
-
-<source>&Yes</source>
-<target>&Da</target>
-
-<source>&No</source>
-<target>&Ne</target>
-
 <source>Use Recycle Bin</source>
 <target>Uporabi Koš</target>
 
@@ -798,6 +780,9 @@ 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>Find what:</source>
 <target>Najdi kaj</target>
 
@@ -876,8 +861,14 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Never save changes</source>
 <target>Nikoli ne shrani sprememb</target>
 
-<source>Save changes to current configuration?</source>
-<target>Shranim spremembe trenutne konfiguracije?</target>
+<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>Configuration loaded!</source>
 <target>Konfiguracija naložena!</target>
@@ -972,9 +963,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>All directories in sync!</source>
 <target>Vsi imeniki so sinhronizirani!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Prosim najprej zaženite Primerjaj preden sinhronizirate!</target>
-
 <source>Comma separated list</source>
 <target>Seznam ločen z vejico</target>
 
@@ -1028,6 +1016,24 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <pluralform>%x od %y vrstic v prikazu</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ignoriraj nadaljnje napake</target>
+
+<source>&Ignore</source>
+<target>&Ignoriraj</target>
+
+<source>&Switch</source>
+<target>&Preklopi</target>
+
+<source>Question</source>
+<target>Vprašanje</target>
+
+<source>&Yes</source>
+<target>&Da</target>
+
+<source>&No</source>
+<target>&Ne</target>
+
 <source>Scanning...</source>
 <target>Pregledujem...</target>
 
@@ -1218,6 +1224,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Cannot delete directory %x.</source>
 <target>Ne morem izbrisati imenika %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Ne morem zapisati datotečnih atributov od %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Ne morem zapisati časa spremembe od %x.</target>
 
@@ -1242,9 +1251,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Ne morem kopirati simboličnih povezav %x v %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Ne morem zapisati datotečnih atributov od %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Ne morem kopirati datoteke %x v %y.</target>
 
@@ -1269,11 +1275,8 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>No change since last synchronization!</source>
 <target>Ni sprememb od zadnje sinhronizacije!</target>
 
-<source>Filter settings have changed!</source>
-<target>Nastavitve filtra so bile spremenjene!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Datoteka ni bila obdelana z zadnjo sinhronizacijo!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Ustrezni vnosi v podatkovni bazi niso sinhronizirani pri upoštevanju trenutnih nastavitev.</target>
 
 <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>
@@ -1401,14 +1404,14 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Updating attributes of %x</source>
 <target>Posodabljam atribute od %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Ime ciljne mape ne sme biti prazno.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Vnosno polje za ciljno mapo ne sme biti prazno.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Ime mape za ustvarjanje različic ne sme biti prazno.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>Vnosno polje za ustvarjanje različic ne sme biti prazno.</target>
 
-<source>Source directory %x not found.</source>
-<target>Izvorni imenik %x ni bil najden.</target>
+<source>Source folder %x not found.</source>
+<target>Izvorna mapa %x se ne najde.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Obstajajo nerešeni spori!</target>
@@ -1425,11 +1428,11 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Not enough free disk space available in:</source>
 <target>Na voljo ni dovolj prostega prostora na disku v:</target>
 
-<source>Free disk space required:</source>
-<target>Potreben prostor na disku:</target>
+<source>Required:</source>
+<target>Zahtevano:</target>
 
-<source>Free disk space available:</source>
-<target>Prosti disk, ki je na voljo:</target>
+<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>
@@ -1440,6 +1443,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Processing folder pair:</source>
 <target>Obdelujem par map:</target>
 
+<source>Target folder %x already existing.</source>
+<target>Ciljna mapa %x že obstaja.</target>
+
 <source>Generating database...</source>
 <target>Ustvarjam podatkovno bazo...</target>
 
diff --git a/BUILD/Languages/spanish.lng b/BUILD/Languages/spanish.lng
index 39f6db69..fa14ba86 100644
--- a/BUILD/Languages/spanish.lng
+++ b/BUILD/Languages/spanish.lng
@@ -10,6 +10,18 @@
 <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>
+
+<source>Items remaining:</source>
+<target>Elementos restantes:</target>
+
+<source>Total time:</source>
+<target>Tiempo total:</target>
+
 <source>Show in Explorer</source>
 <target>Mostrar en Explorer</target>
 
@@ -58,12 +70,6 @@
 <source>About</source>
 <target>Acerca de</target>
 
-<source>Warning</source>
-<target>Atención</target>
-
-<source>Question</source>
-<target>Pregunta</target>
-
 <source>Confirm</source>
 <target>Confirmar</target>
 
@@ -109,6 +115,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Atención</target>
+
 <source>Fatal Error</source>
 <target>Error fatal</target>
 
@@ -139,12 +148,6 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>No se puede leer el archivo %x</target>
-
-<source>Cannot write file %x.</source>
-<target>No se puede escribir el archivo %x</target>
-
 <source>Database file %x is incompatible.</source>
 <target>El archivo de base de datos %x es incompatible</target>
 
@@ -154,9 +157,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>El archivo de base de datos %x aún no existe</target>
 
+<source>Database file is corrupt:</source>
+<target>El archivo de base de datos está dañado:</target>
+
 <source>Out of memory!</source>
 <target>¡Sin memoria!</target>
 
+<source>Cannot write file %x.</source>
+<target>No se puede escribir el archivo %x</target>
+
+<source>Cannot read file %x.</source>
+<target>No se puede leer el archivo %x</target>
+
 <source>Database files do not share a common session.</source>
 <target>Los archivos de base de datos no comparten una sesión común</target>
 
@@ -205,6 +217,9 @@
 <source>/sec</source>
 <target>/seg</target>
 
+<source>Cannot find file %x.</source>
+<target>No se puede encontrar el archivo %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>El archivo %x no contiene una configuración válida.</target>
 
@@ -229,14 +244,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>Incapaz de leer los siguientes elementos XML:</target>
 
-<source>Cannot find file %x.</source>
-<target>No se puede encontrar el archivo %x.</target>
-
 <source>&Open...</source>
 <target>&Abrir...</target>
 
-<source>&Save...</source>
-<target>&Guardar...</target>
+<source>Save &As...</source>
+<target>Guardar &Como...</target>
 
 <source>&Quit</source>
 <target>&Salir</target>
@@ -312,8 +324,8 @@ El comando es disparado si::
 <source>(Build: %x)</source>
 <target>(Completado: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>Configuración de RealtimeSync</target>
+<source>All files</source>
+<target>Todos los archivos</target>
 
 <source>&Restore</source>
 <target>&Restaurar</target>
@@ -327,8 +339,8 @@ El comando es disparado si::
 <source>Waiting for missing directories...</source>
 <target>Esperando directorios faltantes...</target>
 
-<source>An input folder name is empty.</source>
-<target>Un nombre de carpeta de entrada está vacío.</target>
+<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>
@@ -351,26 +363,8 @@ El comando es disparado si::
 <source>Custom</source>
 <target>Personalizado</target>
 
-<source>FreeFileSync batch file</source>
-<target>Archivo por lotes de FreeFileSync</target>
-
-<source>FreeFileSync configuration</source>
-<target>Configuración de FreeFileSync</target>
-
-<source>Batch execution</source>
-<target>Ejecución por lotes</target>
-
-<source>Items processed:</source>
-<target>Elementos procesados:</target>
-
-<source>Items remaining:</source>
-<target>Elementos restantes:</target>
-
-<source>Total time:</source>
-<target>Tiempo total:</target>
-
-<source>Stop</source>
-<target>Detener</target>
+<source>FreeFileSync batch</source>
+<target>Batch de FreeFileSync</target>
 
 <source>Synchronization aborted!</source>
 <target>¡Sincronización abortada!</target>
@@ -393,18 +387,18 @@ El comando es disparado si::
 <source>Unable to connect to sourceforge.net!</source>
 <target>¡Incapaz de conectar con sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
+<source>A new version of FreeFileSync is available:</source>
 <target>Una nueva versión de FreeFileSync está disponible:</target>
 
 <source>Download now?</source>
 <target>¿Descargar ahora?</target>
 
-<source>Information</source>
-<target>Información</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>¡FreeFileSync está actualizado!</target>
 
+<source>Information</source>
+<target>Información</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>¿Quiere que FreeFileSync detecte automáticamente actualizaciones cada semana?</target>
 
@@ -438,6 +432,12 @@ El comando es disparado si::
 <source>Extension</source>
 <target>Extensión</target>
 
+<source>Size:</source>
+<target>Tamaño:</target>
+
+<source>Date:</source>
+<target>Fecha:</target>
+
 <source>Action</source>
 <target>Acción</target>
 
@@ -471,6 +471,9 @@ El comando es disparado si::
 <source>&New</source>
 <target>&Nuevo</target>
 
+<source>&Save</source>
+<target>&Guardar</target>
+
 <source>&Language</source>
 <target>&Idioma</target>
 
@@ -537,11 +540,8 @@ El comando es disparado si::
 <source>Number of files and folders that will be deleted</source>
 <target>Número de archivos y carpetas que serán eliminados</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Cantidad total de datos que serán transferidos</target>
-
-<source>Operation:</source>
-<target>Operación:</target>
+<source>Total bytes to copy</source>
+<target>Total de bytes a copiar</target>
 
 <source>Items found:</source>
 <target>Elementos encontrados:</target>
@@ -549,10 +549,10 @@ El comando es disparado si::
 <source>Speed:</source>
 <target>Velocidad:</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>Tiempo restante:</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>Tiempo transcurrido:</target>
 
 <source>Batch job</source>
@@ -675,6 +675,15 @@ es el mismo
 <source>Source code written in C++ utilizing:</source>
 <target>Código fuente escrito en C++ utilizando:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Si te gusta FreeFileSync</target>
+
+<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>Feedback and suggestions are welcome</source>
 <target>Feedback y sugerencias son bienvenidas</target>
 
@@ -687,39 +696,9 @@ es el mismo
 <source>Email</source>
 <target>Correo electrónico</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Agradecimientos por la traducción de FreeFileSync a:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Si te gusta FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Donar a través de PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Publicado bajo "GNU General Public License"</target>
 
-<source>Ignore further errors</source>
-<target>Ignorar más errores</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Ocultar próximos mensajes de error durante el proceso actual</target>
-
-<source>&Ignore</source>
-<target>&Ignorar</target>
-
-<source>Do not show this dialog again</source>
-<target>No volver a mostrar este diálogo</target>
-
-<source>&Switch</source>
-<target>&Cambiar</target>
-
-<source>&Yes</source>
-<target>&Si</target>
-
-<source>&No</source>
-<target>&No</target>
-
 <source>Use Recycle Bin</source>
 <target>Utilizar Papelera de Reciclaje</target>
 
@@ -792,6 +771,9 @@ 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>
+<target>No volver a mostrar este diálogo</target>
+
 <source>Find what:</source>
 <target>Buscar:</target>
 
@@ -870,8 +852,14 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Never save changes</source>
 <target>Nunca guardar cambios</target>
 
-<source>Save changes to current configuration?</source>
-<target>¿Guardar los cambios de la configuración actual?</target>
+<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>Configuration loaded!</source>
 <target>¡Configuración cargada!</target>
@@ -966,9 +954,6 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>All directories in sync!</source>
 <target>¡Todos los directorios en sincronización!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>¡Por favor, ejecute la comparación antes de la sincronización!</target>
-
 <source>Comma separated list</source>
 <target>Lista separada por comas</target>
 
@@ -1014,6 +999,24 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <pluralform>%x de %y filas en vista</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ignorar más errores</target>
+
+<source>&Ignore</source>
+<target>&Ignorar</target>
+
+<source>&Switch</source>
+<target>&Cambiar</target>
+
+<source>Question</source>
+<target>Pregunta</target>
+
+<source>&Yes</source>
+<target>&Si</target>
+
+<source>&No</source>
+<target>&No</target>
+
 <source>Scanning...</source>
 <target>Escaneando...</target>
 
@@ -1194,6 +1197,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Cannot delete directory %x.</source>
 <target>No se puede eliminar el directorio %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>No se pueden escribir los atributos de archivo de %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>No se puede escribir el tiempo de modificación de %x.</target>
 
@@ -1218,9 +1224,6 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>No se puede copiar el enlance simbólico %x a %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>No se pueden escribir los atributos de archivo de %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>No se puede copiar el archivo %x a %y.</target>
 
@@ -1245,11 +1248,8 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>No change since last synchronization!</source>
 <target>¡Ningún cambio desde la última sincronización!</target>
 
-<source>Filter settings have changed!</source>
-<target>¡Las opciones de filtrado han cambiado!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>¡El archivo no fue procesado por la última sincronización!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Las correspondientes entradas de la base de datos no se encuentran en sincronización, considerando la configuración actual.</target>
 
 <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>
@@ -1377,14 +1377,14 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Updating attributes of %x</source>
 <target>Actualizar atributos de %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>El nombre de la carpeta de destino no debe estar vacío.</target>
+<source>Target folder input field must not be empty.</source>
+<target>El campo de entrada de la carpeta de destino no debe estar vacío.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>El nombre de la carpeta de versiones de archivos no debe estar vacío.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>El campo de entrada de la carpeta para el control de versiones no debe estar vacío.</target>
 
-<source>Source directory %x not found.</source>
-<target>Directorio fuente %x no encontrado.</target>
+<source>Source folder %x not found.</source>
+<target>El archivo de origen %x no ha sido encontrado.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>¡Existen conflictos sin resolver!</target>
@@ -1401,11 +1401,11 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Not enough free disk space available in:</source>
 <target>Espacio en disco insuficiente en:</target>
 
-<source>Free disk space required:</source>
-<target>Espacio de disco necesario:</target>
+<source>Required:</source>
+<target>Requerido:</target>
 
-<source>Free disk space available:</source>
-<target>Espacio de disco disponible:</target>
+<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>
@@ -1416,6 +1416,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Processing folder pair:</source>
 <target>Procesar un par de carpetas:</target>
 
+<source>Target folder %x already existing.</source>
+<target>La carpeta de destino %x ya existe.</target>
+
 <source>Generating database...</source>
 <target>Generando base de datos...</target>
 
diff --git a/BUILD/Languages/swedish.lng b/BUILD/Languages/swedish.lng
index 85364f34..e472d893 100644
--- a/BUILD/Languages/swedish.lng
+++ b/BUILD/Languages/swedish.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>Om</target>
 
-<source>Warning</source>
-<target>Varning</target>
-
-<source>Question</source>
-<target>Fråga</target>
-
 <source>Confirm</source>
 <target>Bekräfta</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Info</target>
 
+<source>Warning</source>
+<target>Varning</target>
+
 <source>Fatal Error</source>
 <target>Allvarligt fel</target>
 
@@ -139,12 +136,6 @@
 <pluralform>%x Byte</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Filen %x kan inte läsas in</target>
-
-<source>Cannot write file %x.</source>
-<target>Filen %x kan inte skrivas</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Databasfilen %x är inkompatibel</target>
 
@@ -154,9 +145,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Databasfilen %x finns ännu inte</target>
 
+<source>Database file is corrupt:</source>
+<target>Databafilen är korrupt</target>
+
 <source>Out of memory!</source>
 <target>Minnesbrist!</target>
 
+<source>Cannot write file %x.</source>
+<target>Filen %x kan inte skrivas</target>
+
+<source>Cannot read file %x.</source>
+<target>Filen %x kan inte läsas in</target>
+
 <source>Database files do not share a common session.</source>
 <target>Databasfilerna har ingen gemensam session</target>
 
@@ -205,6 +205,9 @@
 <source>/sec</source>
 <target>/s</target>
 
+<source>Cannot find file %x.</source>
+<target>Filen %x kan inte hittas</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Filen %x innehåller ingen giltig konfiguration.</target>
 
@@ -226,17 +229,14 @@
 <source>Volume name %x not part of file name %y!</source>
 <target>Volymnamn %x saknas i filnamn %y!</target>
 
-<source>Cannot find file %x.</source>
-<target>Filen %x kan inte hittas</target>
-
 <source>Cannot read the following XML elements:</source>
 <target>Kan inte läsa följande XML-element:</target>
 
 <source>&Open...</source>
 <target>&Öppna...</target>
 
-<source>&Save...</source>
-<target>&Spara...</target>
+<source>Save &As...</source>
+<target>Spara s&om...</target>
 
 <source>&Quit</source>
 <target>&Avsluta</target>
@@ -312,8 +312,8 @@ Kommandot triggas om:
 <source>(Build: %x)</source>
 <target>(Bygge: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>RealtimeSync konfiguration</target>
+<source>All files</source>
+<target>Alla filer</target>
 
 <source>&Restore</source>
 <target>&Återställ</target>
@@ -325,10 +325,10 @@ Kommandot triggas om:
 <target>Övervakning aktiverad...</target>
 
 <source>Waiting for missing directories...</source>
-<target>Väntar på saknade destinationer...</target>
+<target>Väntar på saknade mappsökvägar...</target>
 
-<source>An input folder name is empty.</source>
-<target>Det saknas ett källmappsnamn</target>
+<source>A folder input field is empty.</source>
+<target>Ett inmatningsfält är tomt</target>
 
 <source>Logging</source>
 <target>Loggar</target>
@@ -351,11 +351,8 @@ Kommandot triggas om:
 <source>Custom</source>
 <target>Anpassat</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync batch-fil</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync konfiguration</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
 
 <source>Batch execution</source>
 <target>Batch-körning</target>
@@ -393,18 +390,18 @@ Kommandot triggas om:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Kan inte ansluta sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>En nyare version av FreeFileSync finns tillgänglig:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>Det finns en ny version av FreeFileSync</target>
 
 <source>Download now?</source>
 <target>Ladda ner nu?</target>
 
-<source>Information</source>
-<target>Information</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync är uppdaterad!</target>
 
+<source>Information</source>
+<target>Information</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Vill du att FreeFileSync skall söka efter uppdateringar varje vecka?</target>
 
@@ -438,6 +435,12 @@ Kommandot triggas om:
 <source>Extension</source>
 <target>Filformat</target>
 
+<source>Size:</source>
+<target>Storlek:</target>
+
+<source>Date:</source>
+<target>Datum:</target>
+
 <source>Action</source>
 <target>Aktivitet</target>
 
@@ -471,6 +474,9 @@ Kommandot triggas om:
 <source>&New</source>
 <target>&Nytt</target>
 
+<source>&Save</source>
+<target>&Spara</target>
+
 <source>&Language</source>
 <target>&Språk</target>
 
@@ -537,11 +543,8 @@ Kommandot triggas om:
 <source>Number of files and folders that will be deleted</source>
 <target>Antal filer och mappar som kommer att tas bort</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Total mängd data som kommer att överföras</target>
-
-<source>Operation:</source>
-<target>Arbetsuppgift:</target>
+<source>Total bytes to copy</source>
+<target>Byte att kopiera</target>
 
 <source>Items found:</source>
 <target>Funna poster:</target>
@@ -549,10 +552,10 @@ Kommandot triggas om:
 <source>Speed:</source>
 <target>Hastighet:</target>
 
-<source>Remaining time:</source>
-<target>Kvarvarande tid:</target>
+<source>Time remaining:</source>
+<target>Återstående tid:</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>Förfluten tid:</target>
 
 <source>Batch job</source>
@@ -675,6 +678,15 @@ Filerna betecknas som lika om,
 <source>Source code written in C++ utilizing:</source>
 <target>Källkod skriven i C++ med hjälp av:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Om du gillar FreeFileSync</target>
+
+<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>Feedback and suggestions are welcome</source>
 <target>Återkoppling och förslag är välkommna</target>
 
@@ -687,39 +699,9 @@ Filerna betecknas som lika om,
 <source>Email</source>
 <target>E-post</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>If you like FreeFileSync</source>
-<target>Om du gillar FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Donera via PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Publiserad under GNU General Public License</target>
 
-<source>Ignore further errors</source>
-<target>Ignorera ytterligare fel</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Dölj vidare felmeddelanden under aktuell process</target>
-
-<source>&Ignore</source>
-<target>&Ignorera</target>
-
-<source>Do not show this dialog again</source>
-<target>Visa inte den här dialogrutan igen</target>
-
-<source>&Switch</source>
-<target>&Växla</target>
-
-<source>&Yes</source>
-<target>&Ja</target>
-
-<source>&No</source>
-<target>&Nej</target>
-
 <source>Use Recycle Bin</source>
 <target>Använd papperskorgen</target>
 
@@ -792,6 +774,9 @@ 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>Find what:</source>
 <target>Sök efter:</target>
 
@@ -870,8 +855,14 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Never save changes</source>
 <target>Spara aldrig ändringar</target>
 
-<source>Save changes to current configuration?</source>
-<target>Vill du spara ändringarna i aktuella inställningar?</target>
+<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>Configuration loaded!</source>
 <target>Inställningar inlästa!</target>
@@ -966,9 +957,6 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>All directories in sync!</source>
 <target>Alla mappar synkroniserade!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Du måste trycka "Jämför" innan du kan synkronisera.</target>
-
 <source>Comma separated list</source>
 <target>Komma-separerad lista</target>
 
@@ -1014,6 +1002,24 @@ OBS! Filnamnen måste anges relativt till basmappar
 <pluralform>%x av %y rader i vyn</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ignorera ytterligare fel</target>
+
+<source>&Ignore</source>
+<target>&Ignorera</target>
+
+<source>&Switch</source>
+<target>&Växla</target>
+
+<source>Question</source>
+<target>Fråga</target>
+
+<source>&Yes</source>
+<target>&Ja</target>
+
+<source>&No</source>
+<target>&Nej</target>
+
 <source>Scanning...</source>
 <target>Skannar...</target>
 
@@ -1194,6 +1200,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Cannot delete directory %x.</source>
 <target>Kan inte ta bort mappen %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Kan inte skriva filattribut för %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Kan inte ändra tidsangivelsen för %x.</target>
 
@@ -1218,9 +1227,6 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Kan inte kopiera den symboliska länken %x till %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Kan inte skriva filattribut för %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Kan inte kopiera filen %x till %y.</target>
 
@@ -1245,11 +1251,8 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>No change since last synchronization!</source>
 <target>Inga ändringar sedan senaste synkronisering!</target>
 
-<source>Filter settings have changed!</source>
-<target>Filterinställningar har ändrats!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Filen bearbetades inte vid senaste synkroniseringen</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Aktuella databasposter är inte synkroniserad i förhållande till aktuella inställningar</target>
 
 <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>
@@ -1377,14 +1380,14 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Updating attributes of %x</source>
 <target>Uppdaterar attribut för %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Målmappens namn saknas.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Indatafältet för målmapp får inte vara tomt.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Mappnamn för versionshantering saknas.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>Indatafältet för versionshantering får inte vara tomt.</target>
 
-<source>Source directory %x not found.</source>
-<target>Källmappen %x hittas inte</target>
+<source>Source folder %x not found.</source>
+<target>Källmappen %x kan inte hittas.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Obehandlad konflikt upptäckt!</target>
@@ -1401,11 +1404,11 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Not enough free disk space available in:</source>
 <target>Ej tillräckligt ledigt diskutrymme på:</target>
 
-<source>Free disk space required:</source>
-<target>Krav på ledigt diskutrymme:</target>
+<source>Required:</source>
+<target>Utrymmeskrav:</target>
 
-<source>Free disk space available:</source>
-<target>Ledigt diskutrymme:</target>
+<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>
@@ -1416,6 +1419,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Processing folder pair:</source>
 <target>Bearbetar mapp-paret:</target>
 
+<source>Target folder %x already existing.</source>
+<target>Målmappen %x finns redan.</target>
+
 <source>Generating database...</source>
 <target>Skapar databas...</target>
 
diff --git a/BUILD/Languages/turkish.lng b/BUILD/Languages/turkish.lng
index 8a654cae..c58532a3 100644
--- a/BUILD/Languages/turkish.lng
+++ b/BUILD/Languages/turkish.lng
@@ -58,12 +58,6 @@
 <source>About</source>
 <target>Hakkında</target>
 
-<source>Warning</source>
-<target>Uyarı</target>
-
-<source>Question</source>
-<target>Soru</target>
-
 <source>Confirm</source>
 <target>Doğrula</target>
 
@@ -109,6 +103,9 @@
 <source>Info</source>
 <target>Bilgi</target>
 
+<source>Warning</source>
+<target>Uyarı</target>
+
 <source>Fatal Error</source>
 <target>Ölümcül Hata</target>
 
@@ -139,12 +136,6 @@
 <pluralform>%x Bayt</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>%x dosyası okunamadı.</target>
-
-<source>Cannot write file %x.</source>
-<target>%x dosyası yazılamadı.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>%x veritabanı dosyası uyumsuz</target>
 
@@ -154,9 +145,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>%x veritabanı dosyası henüz yok.</target>
 
+<source>Database file is corrupt:</source>
+<target>Veritabanı dosyası bozulmuş:</target>
+
 <source>Out of memory!</source>
 <target>Bellek yetersiz!</target>
 
+<source>Cannot write file %x.</source>
+<target>%x dosyası yazılamadı.</target>
+
+<source>Cannot read file %x.</source>
+<target>%x dosyası okunamadı.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Veritabanı dosyaları ortak bir oturumu paylaşamaz.</target>
 
@@ -205,6 +205,9 @@
 <source>/sec</source>
 <target>/san</target>
 
+<source>Cannot find file %x.</source>
+<target>%x dosyası bulunamadı.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>%x dosyası geçerli bir yapılandırma bilgisi içermiyor.</target>
 
@@ -229,14 +232,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>Şu XML elemanları okunamadı:</target>
 
-<source>Cannot find file %x.</source>
-<target>%x dosyası bulunamadı.</target>
-
 <source>&Open...</source>
 <target>&Aç...</target>
 
-<source>&Save...</source>
-<target>&Kaydet</target>
+<source>Save &As...</source>
+<target>F&arklı Kaydet...</target>
 
 <source>&Quit</source>
 <target>Çı&k</target>
@@ -312,8 +312,8 @@ Komut şu durumlarda yürütülür:
 <source>(Build: %x)</source>
 <target>(Yapım: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>RealtimeSync yapılandırması</target>
+<source>All files</source>
+<target>Tüm dosyalar</target>
 
 <source>&Restore</source>
 <target>Ge&ri yükle</target>
@@ -327,8 +327,8 @@ Komut şu durumlarda yürütülür:
 <source>Waiting for missing directories...</source>
 <target>Kayıp klasörler için bekleniyor...</target>
 
-<source>An input folder name is empty.</source>
-<target>Bir giriş klasörü adı eksik.</target>
+<source>A folder input field is empty.</source>
+<target>Bir klasör giriş alanı boş.</target>
 
 <source>Logging</source>
 <target>Günlükleme</target>
@@ -351,11 +351,8 @@ Komut şu durumlarda yürütülür:
 <source>Custom</source>
 <target>Özel</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync toplu iş dosyası</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync yapılandırması</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync toplu işi</target>
 
 <source>Batch execution</source>
 <target>Toplu komut yürütme</target>
@@ -393,18 +390,18 @@ Komut şu durumlarda yürütülür:
 <source>Unable to connect to sourceforge.net!</source>
 <target>sourceforge.net sitesine bağlanılamıyor!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>FreeFileSync programının yeni bir sürümü yayınlanmış:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>Yeni bir FreeFileSync sürümü yayınlanmış:</target>
 
 <source>Download now?</source>
 <target>Şimdi indir?</target>
 
-<source>Information</source>
-<target>Bilgi</target>
-
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync güncel!</target>
 
+<source>Information</source>
+<target>Bilgi</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>FreeFileSync güncellemelerinin her hafta denetlenmesini ister misiniz?</target>
 
@@ -438,6 +435,12 @@ Komut şu durumlarda yürütülür:
 <source>Extension</source>
 <target>Uzantı</target>
 
+<source>Size:</source>
+<target>Boyut:</target>
+
+<source>Date:</source>
+<target>Tarih:</target>
+
 <source>Action</source>
 <target>İşlem</target>
 
@@ -471,6 +474,9 @@ Komut şu durumlarda yürütülür:
 <source>&New</source>
 <target>Ye&ni</target>
 
+<source>&Save</source>
+<target>&Kaydet</target>
+
 <source>&Language</source>
 <target>Di&l</target>
 
@@ -537,11 +543,8 @@ Komut şu durumlarda yürütülür:
 <source>Number of files and folders that will be deleted</source>
 <target>Silinecek dosya ve klasör sayısı</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Aktarılacak toplam veri miktarı</target>
-
-<source>Operation:</source>
-<target>İşlem:</target>
+<source>Total bytes to copy</source>
+<target>Toplam kopyalayanacak bayt</target>
 
 <source>Items found:</source>
 <target>Bulunan bileşenler:</target>
@@ -549,17 +552,17 @@ Komut şu durumlarda yürütülür:
 <source>Speed:</source>
 <target>Hız:</target>
 
-<source>Remaining time:</source>
-<target>Kalan zaman:</target>
+<source>Time remaining:</source>
+<target>Kalan süre:</target>
 
-<source>Elapsed time:</source>
-<target>Geçen zaman:</target>
+<source>Time elapsed:</source>
+<target>Geçen süre:</target>
 
 <source>Batch job</source>
 <target>Toplu iş</target>
 
 <source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
-<target>Eşleştirmeyi otomatikleştirmek için bir komut yığın dosyası oluşturun. Bu dosyaya çift tıklayarak ya da sisteminizdeki görev zamanlayıcıya: FreeFileSync.exe <görev adı>.ffs_batch şeklinde yazarak ekleyin</target>
+<target>Eşleştirmeyi otomatikleştirmek için bir toplu iş komut dosyası oluşturun. Bu dosyaya çift tıklayarak ya da sisteminizdeki görev zamanlayıcıya: FreeFileSync.exe <görev adı>.ffs_batch şeklinde yazarak ekleyin</target>
 
 <source>Help</source>
 <target>Yardım</target>
@@ -675,6 +678,15 @@ aynı olmalıdır
 <source>Source code written in C++ utilizing:</source>
 <target>Kaynak kodu C++ kullanılarak yazılmıştır:</target>
 
+<source>If you like FreeFileSync</source>
+<target>FreeFileSync’i beğendiyseniz</target>
+
+<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>Feedback and suggestions are welcome</source>
 <target>Öneri ve geri bildirimlerinizi bekleriz</target>
 
@@ -687,39 +699,9 @@ aynı olmalıdır
 <source>Email</source>
 <target>E-posta</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>FreeFileSync çevirmenlerine çok teşekkürler:</target>
-
-<source>If you like FreeFileSync</source>
-<target>FreeFileSync’i beğendiyseniz</target>
-
-<source>Donate with PayPal</source>
-<target>PayPal ile bağış yapın</target>
-
 <source>Published under the GNU General Public License</source>
 <target>GNU Genel Kamu Lisansı şartları altında yayınlanmıştır</target>
 
-<source>Ignore further errors</source>
-<target>Sonraki hataları yoksay</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Yürürlükteki işlem boyunca başka hata iletisi gösterme</target>
-
-<source>&Ignore</source>
-<target>&Yoksay</target>
-
-<source>Do not show this dialog again</source>
-<target>Bu iletiyi yeniden gösterme</target>
-
-<source>&Switch</source>
-<target>&Değiştir</target>
-
-<source>&Yes</source>
-<target>&Evet</target>
-
-<source>&No</source>
-<target>&Hayır</target>
-
 <source>Use Recycle Bin</source>
 <target>Geri Dönüşüm Kutusu'nu kullan</target>
 
@@ -792,6 +774,9 @@ 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>Find what:</source>
 <target>Aranacak:</target>
 
@@ -870,8 +855,14 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Never save changes</source>
 <target>Asla değişiklikleri kaydetme</target>
 
-<source>Save changes to current configuration?</source>
-<target>Değişiklikleri şu anki yapılandırmaya kaydetmek ister misiniz?</target>
+<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>
+<target>Kaydetme</target>
 
 <source>Configuration loaded!</source>
 <target>Yapılandırma yüklendi!</target>
@@ -966,9 +957,6 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>All directories in sync!</source>
 <target>Tüm klasörler eş!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Lütfen eşleştirmeden önce karşılaştırma yapın!</target>
-
 <source>Comma separated list</source>
 <target>Virgül ile ayrılmış liste</target>
 
@@ -1014,6 +1002,24 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <pluralform>%x / %y satır gösteriliyor</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Sonraki hataları yoksay</target>
+
+<source>&Ignore</source>
+<target>&Yoksay</target>
+
+<source>&Switch</source>
+<target>&Değiştir</target>
+
+<source>Question</source>
+<target>Soru</target>
+
+<source>&Yes</source>
+<target>&Evet</target>
+
+<source>&No</source>
+<target>&Hayır</target>
+
 <source>Scanning...</source>
 <target>Taranıyor...</target>
 
@@ -1194,6 +1200,9 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Cannot delete directory %x.</source>
 <target>%x klasörü silinemedi.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>%x dosya öznitelikleri yazılamadı.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>%x son değişiklik zamanı yazılamadı.</target>
 
@@ -1218,9 +1227,6 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>%x simgesel bağlantısı %y olarak kopyalanamadı.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>%x dosya öznitelikleri yazılamadı.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>%x dosyası %y olarak kopyalanamadı.</target>
 
@@ -1245,11 +1251,8 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>No change since last synchronization!</source>
 <target>Son eşleştirmeden bu yana değişik olmamış!</target>
 
-<source>Filter settings have changed!</source>
-<target>Süzgeç ayarları değiştirildi!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Dosya son eşleştirmede işlenmemiş!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Karşı düşen veritabanı kayıtları, geçerli ayarlar göz önüne alındığında eşleşmiyor.</target>
 
 <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>
@@ -1377,13 +1380,13 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Updating attributes of %x</source>
 <target>%x öznitelikleri güncelleniyor</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Hedef klasör adı boş olamaz.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Hedef klasör giriş alanı boş olmamalı.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>Dosya sürümlemesi için klasör adı boş olamaz.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>Sürüm için klasör giriş alanı boş olmamalı.</target>
 
-<source>Source directory %x not found.</source>
+<source>Source folder %x not found.</source>
 <target>%x kaynak klasörü bulunamadı.</target>
 
 <source>Unresolved conflicts existing!</source>
@@ -1401,11 +1404,11 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Not enough free disk space available in:</source>
 <target>Şurada yeterli disk alanı yok :</target>
 
-<source>Free disk space required:</source>
-<target>Gereken boş disk alanı:</target>
+<source>Required:</source>
+<target>Zorunlu:</target>
 
-<source>Free disk space available:</source>
-<target>Kullanılabilir disk alanı:</target>
+<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>
@@ -1416,6 +1419,9 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Processing folder pair:</source>
 <target>İşlenen klasör çifti:</target>
 
+<source>Target folder %x already existing.</source>
+<target>%x hedef klasörü zaten var.</target>
+
 <source>Generating database...</source>
 <target>Veri tabanı oluşturuluyor...</target>
 
diff --git a/BUILD/Languages/ukrainian.lng b/BUILD/Languages/ukrainian.lng
index b7f89539..9de06b00 100644
--- a/BUILD/Languages/ukrainian.lng
+++ b/BUILD/Languages/ukrainian.lng
@@ -10,6 +10,18 @@
 <source>Searching for folder %x...</source>
 <target>Пошук каталогу  %x...</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>Show in Explorer</source>
 <target>Показати у Провіднику</target>
 
@@ -58,12 +70,6 @@
 <source>About</source>
 <target>Про</target>
 
-<source>Warning</source>
-<target>Увага</target>
-
-<source>Question</source>
-<target>Питання</target>
-
 <source>Confirm</source>
 <target>Підтвердити</target>
 
@@ -109,6 +115,9 @@
 <source>Info</source>
 <target>Інформація</target>
 
+<source>Warning</source>
+<target>Увага</target>
+
 <source>Fatal Error</source>
 <target>Критична помилка</target>
 
@@ -140,12 +149,6 @@
 <pluralform>%x байтів</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>Не вдається прочитати файл %x.</target>
-
-<source>Cannot write file %x.</source>
-<target>Не вдається записати файл %x.</target>
-
 <source>Database file %x is incompatible.</source>
 <target>Несумісний файл бази даних %x.</target>
 
@@ -155,9 +158,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>Файл бази даних %x ще не існує.</target>
 
+<source>Database file is corrupt:</source>
+<target>Файл бази даних пошкоджений:</target>
+
 <source>Out of memory!</source>
 <target>Бракує пам'яті!</target>
 
+<source>Cannot write file %x.</source>
+<target>Не вдається записати файл %x.</target>
+
+<source>Cannot read file %x.</source>
+<target>Не вдається прочитати файл %x.</target>
+
 <source>Database files do not share a common session.</source>
 <target>Файли баз даних не поділяють спільну сесію.</target>
 
@@ -208,6 +220,9 @@
 <source>/sec</source>
 <target>/сек</target>
 
+<source>Cannot find file %x.</source>
+<target>Не вдається знайти файлу %x.</target>
+
 <source>File %x does not contain a valid configuration.</source>
 <target>Файл %x не містить правильної конфігурації.</target>
 
@@ -232,14 +247,11 @@
 <source>Cannot read the following XML elements:</source>
 <target>Не вдається прочитати такі елементи XML:</target>
 
-<source>Cannot find file %x.</source>
-<target>Не вдається знайти файлу %x.</target>
-
 <source>&Open...</source>
 <target>Відкрити...</target>
 
-<source>&Save...</source>
-<target>Зберегти...</target>
+<source>Save &As...</source>
+<target>Зберегти як...</target>
 
 <source>&Quit</source>
 <target>Вихід</target>
@@ -315,8 +327,8 @@ The command is triggered if:
 <source>(Build: %x)</source>
 <target>(компіляція %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>Налаштування RealtimeSync</target>
+<source>All files</source>
+<target>Всі файли</target>
 
 <source>&Restore</source>
 <target>&Відновити</target>
@@ -330,8 +342,8 @@ The command is triggered if:
 <source>Waiting for missing directories...</source>
 <target>Очікування пропущених каталогів...</target>
 
-<source>An input folder name is empty.</source>
-<target>Назва вхідної папки порожня.</target>
+<source>A folder input field is empty.</source>
+<target>Порожнє поле папки.</target>
 
 <source>Logging</source>
 <target>Лог-файли</target>
@@ -354,26 +366,8 @@ The command is triggered if:
 <source>Custom</source>
 <target>Вибірково</target>
 
-<source>FreeFileSync batch file</source>
-<target>Файл завдання FreeFileSync</target>
-
-<source>FreeFileSync configuration</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>FreeFileSync batch</source>
+<target>Командний файл FreeFileSync</target>
 
 <source>Synchronization aborted!</source>
 <target>Синхронізація припинена!</target>
@@ -396,7 +390,7 @@ The command is triggered if:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Не можна з’єднатися з sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
+<source>A new version of FreeFileSync is available:</source>
 <target>Доступна нова версія FreeFileSync:</target>
 
 <source>Download now?</source>
@@ -441,6 +435,12 @@ The command is triggered if:
 <source>Extension</source>
 <target>Розширення</target>
 
+<source>Size:</source>
+<target>Розмір:</target>
+
+<source>Date:</source>
+<target>Дата:</target>
+
 <source>Action</source>
 <target>Дія</target>
 
@@ -472,7 +472,10 @@ The command is triggered if:
 <target>2. &Синхронізувати</target>
 
 <source>&New</source>
-<target>&Нова</target>
+<target>Нова</target>
+
+<source>&Save</source>
+<target>Зберегти</target>
 
 <source>&Language</source>
 <target>&Мова</target>
@@ -543,8 +546,8 @@ The command is triggered if:
 <source>Number of files and folders that will be deleted</source>
 <target>Кількість файлів і папок, які будуть вилучені</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>Загальний об’єм даних, які будуть передаватися</target>
+<source>Total bytes to copy</source>
+<target>Всього зкопіювати байтів</target>
 
 <source>Items found:</source>
 <target>Елементів знайдено:</target>
@@ -552,10 +555,10 @@ The command is triggered if:
 <source>Speed:</source>
 <target>Швидкість:</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>Залишилось часу:</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>Пройшло часу:</target>
 
 <source>Batch job</source>
@@ -674,6 +677,15 @@ is the same
 <source>Source code written in C++ utilizing:</source>
 <target>Код програми написаний на C++ з використанням:</target>
 
+<source>If you like FreeFileSync</source>
+<target>Якщо Вам сподобався FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>Пожертвувати через PayPal</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Щира подяка за переклад FreeFileSync:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>Відгуки та пропозиції вітаються</target>
 
@@ -686,39 +698,9 @@ is the same
 <source>Email</source>
 <target>Почта</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Щира подяка за переклад FreeFileSync:</target>
-
-<source>If you like FreeFileSync</source>
-<target>Якщо Вам сподобався FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>Пожертвувати через PayPal</target>
-
 <source>Published under the GNU General Public License</source>
 <target>Видано за ліцензією GNU General Public License</target>
 
-<source>Ignore further errors</source>
-<target>Ігнорувати майбутні помилки</target>
-
-<source>Hide further error messages during the current process</source>
-<target>Приховати наступні помилки підчас цього процесу</target>
-
-<source>&Ignore</source>
-<target>&Ігнорувати</target>
-
-<source>Do not show this dialog again</source>
-<target>Надалі не показувати це вікно</target>
-
-<source>&Switch</source>
-<target>&Змінити</target>
-
-<source>&Yes</source>
-<target>&Так</target>
-
-<source>&No</source>
-<target>&Ні</target>
-
 <source>Use Recycle Bin</source>
 <target>Використовувати "Корзину"</target>
 
@@ -791,6 +773,9 @@ 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>Find what:</source>
 <target>Знайти:</target>
 
@@ -869,8 +854,14 @@ Note: File names must be relative to base directories!
 <source>Never save changes</source>
 <target>Ніколи не зберігати змін</target>
 
-<source>Save changes to current configuration?</source>
-<target>Зберегти зміни в активних налаштуваннях?</target>
+<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>Configuration loaded!</source>
 <target>Налаштування синхронізації загружено!</target>
@@ -965,9 +956,6 @@ Note: File names must be relative to base directories!
 <source>All directories in sync!</source>
 <target>Всі каталоги синхронізовані!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>Будь ласка, запустіть порівняння перед синхронізацією!</target>
-
 <source>Comma separated list</source>
 <target>Розділений комами список</target>
 
@@ -1017,6 +1005,24 @@ Note: File names must be relative to base directories!
 <pluralform>%x з %y рядків</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>Ігнорувати майбутні помилки</target>
+
+<source>&Ignore</source>
+<target>&Ігнорувати</target>
+
+<source>&Switch</source>
+<target>&Змінити</target>
+
+<source>Question</source>
+<target>Питання</target>
+
+<source>&Yes</source>
+<target>&Так</target>
+
+<source>&No</source>
+<target>&Ні</target>
+
 <source>Scanning...</source>
 <target>Сканування...</target>
 
@@ -1202,6 +1208,9 @@ Note: File names must be relative to base directories!
 <source>Cannot delete directory %x.</source>
 <target>Не вдається видалити каталог х%.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>Не вдається записати атрибути файла %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Не вдається записати часу модифікації %х.</target>
 
@@ -1226,9 +1235,6 @@ Note: File names must be relative to base directories!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Не вдається зкопіювати символьне посилання %х в %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>Не вдається записати атрибути файла %x.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>Не вдається зкопіювати файл %х до %y.</target>
 
@@ -1253,11 +1259,8 @@ Note: File names must be relative to base directories!
 <source>No change since last synchronization!</source>
 <target>Жодних змін з останньої синхронізації!</target>
 
-<source>Filter settings have changed!</source>
-<target>Налаштування фільтра були змінені!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>Файл не був оброблений при останній синхронізації!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>Згідно з поточними налаштуваннями відповідні записи в базах даних не синхронізовані.</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>
@@ -1388,13 +1391,13 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>Оновлення атрибутів %x</target>
 
-<source>Target folder name must not be empty.</source>
-<target>Назва цільової папки не повинна бути порожньою.</target>
+<source>Target folder input field must not be empty.</source>
+<target>Поле цільової папки не повинно бути порожнім.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
+<source>Folder input field for versioning must not be empty.</source>
 <target>Назва папки для версій файлів не повинна бути порожньою.</target>
 
-<source>Source directory %x not found.</source>
+<source>Source folder %x not found.</source>
 <target>Вихідний каталог %x не знайдено.</target>
 
 <source>Unresolved conflicts existing!</source>
@@ -1412,11 +1415,11 @@ Note: File names must be relative to base directories!
 <source>Not enough free disk space available in:</source>
 <target>Не достатньо вільного місця в:</target>
 
-<source>Free disk space required:</source>
-<target>Потрібне вільне місце на диску:</target>
+<source>Required:</source>
+<target>Потрібно:</target>
 
-<source>Free disk space available:</source>
-<target>Доступно вільного місця на диску:</target>
+<source>Available:</source>
+<target>Доступно:</target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>Корзина для цього шляху недоступна. Файли будуть вилучені назавжди:</target>
@@ -1427,6 +1430,9 @@ Note: File names must be relative to base directories!
 <source>Processing folder pair:</source>
 <target>Обробка пари папок:</target>
 
+<source>Target folder %x already existing.</source>
+<target>Цільова папка %x вже існує.</target>
+
 <source>Generating database...</source>
 <target>Створення бази даних...</target>
author	Daniel Wilhelm <daniel@wili.li>	2014-04-18 17:20:29 +0200
committer	Daniel Wilhelm <daniel@wili.li>	2014-04-18 17:20:29 +0200
commit	b8f13e45be884dc12884ebe8f3dcd9eecb23a106 (patch)
tree	22a6d8b96815d626061ff3e2d432c13078fca5c4 /BUILD/Languages
parent	5.4 (diff)
download	FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.tar.gz FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.tar.bz2 FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.zip