4.3

26 files changed, 5862 insertions, 4548 deletions

diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index fc37aac5..65887d4f 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>实时同步 - 自动同步</target>
 
-<source>Browse</source>
-<target>浏览</target>
-
-<source>Windows Error Code %x:</source>
-<target>Windows错误代码 %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux错误代码 %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>无效的命令行: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>解决符号链接出错:</target>
-
-<source>Show pop-up</source>
-<target>显示弹出对话框</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>在错误或警告时显示弹出对话框</target>
-
-<source>Ignore errors</source>
-<target>忽略错误</target>
-
-<source>Hide all error and warning messages</source>
-<target>隐藏所有错误与警告信息</target>
-
-<source>Exit instantly</source>
-<target>立即退出</target>
-
-<source>Abort synchronization immediately</source>
-<target>立即中止同步</target>
-
 <source>Select alternate comparison settings</source>
 <target>选择替换的比较设置</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>选择时间跨度</target>
 
+<source>Show pop-up</source>
+<target>显示弹出对话框</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>在错误或警告时显示弹出对话框</target>
+
+<source>Ignore errors</source>
+<target>忽略错误</target>
+
+<source>Hide all error and warning messages</source>
+<target>隐藏所有错误与警告信息</target>
+
+<source>Exit instantly</source>
+<target>立即退出</target>
+
+<source>Abort synchronization immediately</source>
+<target>立即中止同步</target>
+
+<source>Browse</source>
+<target>浏览</target>
+
+<source>Error reading from synchronization database:</source>
+<target>从同步数据库中读取时出错:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>向同步数据库中写入时出错:</target>
+
+<source>Invalid command line: %x</source>
+<target>无效的命令行: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Windows错误代码 %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Linux错误代码 %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>解决符号链接出错:</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -162,17 +168,14 @@
 <source>Comparison Result</source>
 <target>比较结果</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>不兼容的同步数据库格式:</target>
-
 <source>Initial synchronization:</source>
 <target>初始化同步:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>FreeFileSync数据库文件其中一个不存在:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>从同步数据库中读取时出错:</target>
+<source>Incompatible synchronization database format:</source>
+<target>不兼容的同步数据库格式:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>数据库文件没不共享一个公共的同步段</target>
@@ -197,12 +200,18 @@
 <pluralform>%x 秒</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>拖放</target>
+
 <source>Info</source>
 <target>信息</target>
 
 <source>Fatal Error</source>
 <target>致命错误</target>
 
+<source>Error reading file:</source>
+<target>读取文件出错:</target>
+
 <source>Scanning:</source>
 <target>扫描中:</target>
 
@@ -220,15 +229,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>无效的 FreeFileSync 配置文件!</target>
 
-<source>File does not exist:</source>
-<target>文件不存在:</target>
-
 <source>Error parsing configuration file:</source>
 <target>分析配置文件出错:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>移动到回收站出错:</target>
+
+<source>Could not load a required DLL:</source>
+<target>不能加载所需的动态连接库:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>使用卷影复制服务时出错!</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>不支持在WOW64上使用卷影复制. 请使用 FreeFileSync 64位版本.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>不能确定此文件的卷名称:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>卷名 %x 并非文件名 %y 的一部分!</target>
+
 <source>/sec</source>
 <target>/秒</target>
 
+<source>File does not exist:</source>
+<target>文件不存在:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>不能从如下XML节点读取数值:</target>
+
 <source>S&ave configuration...</source>
 <target>保存配置(&A)...</target>
 
@@ -321,138 +351,6 @@ The command line is executed each time:
 <source>A directory input field is empty.</source>
 <target>有一个目录输入字段是空的.</target>
 
-<source>Drag && drop</source>
-<target>拖放</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>不能初始化目录监视:</target>
-
-<source>Error when monitoring directories.</source>
-<target>监视目录时出错.</target>
-
-<source>Conversion error:</source>
-<target>转换错误:</target>
-
-<source>Error deleting file:</source>
-<target>删除文件出错:</target>
-
-<source>Error moving file:</source>
-<target>移动文件时出错:</target>
-
-<source>Target file already existing!</source>
-<target>目标文件已经存在!</target>
-
-<source>Error moving directory:</source>
-<target>移动目录时出错:</target>
-
-<source>Target directory already existing!</source>
-<target>目标目录已经存在!</target>
-
-<source>Error deleting directory:</source>
-<target>删除目录出错:</target>
-
-<source>Error changing modification time:</source>
-<target>改变修改时间时出错:</target>
-
-<source>Error loading library function:</source>
-<target>加载库函数出错:</target>
-
-<source>Error reading security context:</source>
-<target>读取安全上下文时出错:</target>
-
-<source>Error writing security context:</source>
-<target>写入安全上下文时出错:</target>
-
-<source>Error copying file permissions:</source>
-<target>复制文件权限时出错:</target>
-
-<source>Error creating directory:</source>
-<target>创建目录出错:</target>
-
-<source>Error copying symbolic link:</source>
-<target>复制符号链接时出错:</target>
-
-<source>Error copying file:</source>
-<target>复制文件出错:</target>
-
-<source>Error opening file:</source>
-<target>打开文件出错:</target>
-
-<source>Error writing file:</source>
-<target>写入文件出错:</target>
-
-<source>Error reading file:</source>
-<target>读取文件出错:</target>
-
-<source>Operation aborted!</source>
-<target>操作已取消!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>遍历目录时出现无限循环:</target>
-
-<source>Error traversing directory:</source>
-<target>遍历目录出错:</target>
-
-<source>Error setting privilege:</source>
-<target>设置权限时出错:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>移动到回收站出错:</target>
-
-<source>Could not load a required DLL:</source>
-<target>不能加载所需的动态连接库:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>向同步数据库中写入时出错:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>使用卷影复制服务时出错!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>不支持在WOW64上使用卷影复制. 请使用 FreeFileSync 64位版本.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>不能确定此文件的卷名称:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>卷名 %x 并非文件名 %y 的一部分!</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x 分</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x 小时</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x 天</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>不能从如下XML节点读取数值:</target>
-
 <source>Logging</source>
 <target>记录</target>
 
@@ -471,9 +369,6 @@ The command line is executed each time:
 <source>Batch execution</source>
 <target>批处理执行</target>
 
-<source>Log-messages:</source>
-<target>日志信息:</target>
-
 <source>Stop</source>
 <target>停止</target>
 
@@ -600,6 +495,24 @@ The command line is executed each time:
 <source>Total amount of data that will be transferred</source>
 <target>将被转移的总数据</target>
 
+<source>Operation:</source>
+<target>操作:</target>
+
+<source>Items found:</source>
+<target>已找到的元素:</target>
+
+<source>Items remaining:</source>
+<target>剩余的元素:</target>
+
+<source>Speed:</source>
+<target>速度:</target>
+
+<source>Time remaining:</source>
+<target>剩余时间:</target>
+
+<source>Time elapsed:</source>
+<target>已用时间:</target>
+
 <source>Batch job</source>
 <target>批处理作业</target>
 
@@ -648,32 +561,14 @@ The command line is executed each time:
 <source>&Cancel</source>
 <target>取消(&C)</target>
 
-<source>Operation:</source>
-<target>操作:</target>
-
-<source>Items found:</source>
-<target>已找到的元素:</target>
-
-<source>Items remaining:</source>
-<target>剩余的元素:</target>
-
-<source>Speed:</source>
-<target>速度:</target>
-
-<source>Time remaining:</source>
-<target>剩余时间:</target>
-
-<source>Time elapsed:</source>
-<target>已用时间:</target>
-
 <source>Select variant:</source>
 <target>选择变化的:</target>
 
 <source><Automatic></source>
 <target><自动></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>使用数据库来识别和传送两边的改变. 自动检测删除和冲突状态.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target></target>
 
 <source>Mirror ->></source>
 <target>镜像 ->></target>
@@ -900,22 +795,14 @@ Exclude: \stuff\temp\*
 <source>Copy locked files</source>
 <target>复制被锁定的文件</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-通过卷影复制服务复制共享或锁定的文件(需要管理员权限)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>通过卷影复制服务复制共享或锁定的文件(需要管理员权限)</target>
 
 <source>Copy file access permissions</source>
 <target>复制文件存取权限</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-转移文件和目录的权限(需要管理员权限)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>转移文件和目录的权限(需要管理员权限)</target>
 
 <source>Hidden dialogs:</source>
 <target>隐藏对话框:</target>
@@ -947,6 +834,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>&Find next</source>
 <target>查找下一个(&F)</target>
 
+<source>Operation aborted!</source>
+<target>操作已取消!</target>
+
 <source>Main bar</source>
 <target>主工具条</target>
 
@@ -1124,6 +1014,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>File list exported!</source>
 <target>文件清单已经导出!</target>
 
+<source>Error writing file:</source>
+<target>写入文件出错:</target>
+
 <source>Batch file created successfully!</source>
 <target>批处理文件创建成功!</target>
 
@@ -1219,9 +1112,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Filter: Single pair</source>
 <target>过滤器:单一的配对</target>
 
-<source>Ignore</source>
-<target>忽略</target>
-
 <source>Direct</source>
 <target>直接</target>
 
@@ -1283,6 +1173,102 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Move files into a time-stamped subdirectory</source>
 <target>移动文件到时间标记子目录</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x 分</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x 小时</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x 天</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>不能初始化目录监视:</target>
+
+<source>Error when monitoring directories.</source>
+<target>监视目录时出错.</target>
+
+<source>Conversion error:</source>
+<target>转换错误:</target>
+
+<source>Error deleting file:</source>
+<target>删除文件出错:</target>
+
+<source>Error moving file:</source>
+<target>移动文件时出错:</target>
+
+<source>Target file already existing!</source>
+<target>目标文件已经存在!</target>
+
+<source>Error moving directory:</source>
+<target>移动目录时出错:</target>
+
+<source>Target directory already existing!</source>
+<target>目标目录已经存在!</target>
+
+<source>Error deleting directory:</source>
+<target>删除目录出错:</target>
+
+<source>Error changing modification time:</source>
+<target>改变修改时间时出错:</target>
+
+<source>Error loading library function:</source>
+<target>加载库函数出错:</target>
+
+<source>Error reading security context:</source>
+<target>读取安全上下文时出错:</target>
+
+<source>Error writing security context:</source>
+<target>写入安全上下文时出错:</target>
+
+<source>Error copying file permissions:</source>
+<target>复制文件权限时出错:</target>
+
+<source>Error creating directory:</source>
+<target>创建目录出错:</target>
+
+<source>Error copying symbolic link:</source>
+<target>复制符号链接时出错:</target>
+
+<source>Error copying file:</source>
+<target>复制文件出错:</target>
+
+<source>Error opening file:</source>
+<target>打开文件出错:</target>
+
+<source>Error traversing directory:</source>
+<target>遍历目录出错:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>遍历目录时出现无限循环:</target>
+
+<source>Error setting privilege:</source>
+<target>设置权限时出错:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>在最后的同步之后两边均已改变!</target>
 
@@ -1313,9 +1299,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>目录有依赖性！在设立同步规则时请小心:</target>
 
-<source>Comparing content of files %x</source>
-<target>正在比较文件 %x 的内容</target>
-
 <source>Memory allocation failed!</source>
 <target>内存分配失败!</target>
 
@@ -1331,15 +1314,15 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>符号连接 %x 有相同的日期但目标不同!</target>
 
+<source>Comparing content of files %x</source>
+<target>正在比较文件 %x 的内容</target>
+
 <source>Comparing files by content failed.</source>
 <target>按文件内容比较失败.</target>
 
 <source>Generating file list...</source>
 <target>生成文件列表...</target>
 
-<source>Multiple...</source>
-<target>并联...</target>
-
 <source>Both sides are equal</source>
 <target>两侧相等</target>
 
@@ -1358,6 +1341,12 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Delete right file/folder</source>
 <target>删除右侧文件/文件夹</target>
 
+<source>Move file on left</source>
+<target></target>
+
+<source>Move file on right</source>
+<target></target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>从右侧覆盖左侧的文件/文件夹</target>
 
@@ -1373,6 +1362,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Copy file attributes only to right</source>
 <target>仅复制文件属性到右侧</target>
 
+<source>Multiple...</source>
+<target>并联...</target>
+
 <source>Deleting file %x</source>
 <target>正删除文件 %x</target>
 
diff --git a/BUILD/Languages/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng
index f872c6aa..380d2c9b 100644
--- a/BUILD/Languages/chinese_traditional.lng
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>即時同步 - 自動同步</target>
 
-<source>Browse</source>
-<target>瀏覽</target>
-
-<source>Windows Error Code %x:</source>
-<target>Windows 錯誤代碼 %x：</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux 錯誤代碼 %x：</target>
-
-<source>Invalid command line: %x</source>
-<target>無效的命令列：%x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>解析錯誤的符號連結：</target>
-
-<source>Show pop-up</source>
-<target>顯示彈出視窗</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>在彈出視窗上顯示錯誤或警告訊息</target>
-
-<source>Ignore errors</source>
-<target>忽略錯誤</target>
-
-<source>Hide all error and warning messages</source>
-<target>隱藏所有錯誤和警告訊息</target>
-
-<source>Exit instantly</source>
-<target>立即退出</target>
-
-<source>Abort synchronization immediately</source>
-<target>立即中止同步</target>
-
 <source>Select alternate comparison settings</source>
 <target>選擇替代的比對設定</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>選擇時間範圍</target>
 
+<source>Show pop-up</source>
+<target>顯示彈出視窗</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>在彈出視窗上顯示錯誤或警告訊息</target>
+
+<source>Ignore errors</source>
+<target>忽略錯誤</target>
+
+<source>Hide all error and warning messages</source>
+<target>隱藏所有錯誤和警告訊息</target>
+
+<source>Exit instantly</source>
+<target>立即退出</target>
+
+<source>Abort synchronization immediately</source>
+<target>立即中止同步</target>
+
+<source>Browse</source>
+<target>瀏覽</target>
+
+<source>Error reading from synchronization database:</source>
+<target>讀取同步資料庫錯誤：</target>
+
+<source>Error writing to synchronization database:</source>
+<target>寫入同步資料庫錯誤：</target>
+
+<source>Invalid command line: %x</source>
+<target>無效的命令列：%x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Windows 錯誤代碼 %x：</target>
+
+<source>Linux Error Code %x:</source>
+<target>Linux 錯誤代碼 %x：</target>
+
+<source>Error resolving symbolic link:</source>
+<target>解析錯誤的符號連結：</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -162,17 +168,14 @@
 <source>Comparison Result</source>
 <target>比對結果</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>同步資料庫格式不相容：</target>
-
 <source>Initial synchronization:</source>
 <target>初始化同步：</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>其中一個 FreeFileSync 資料庫檔案不存在：</target>
 
-<source>Error reading from synchronization database:</source>
-<target>讀取同步資料庫錯誤：</target>
+<source>Incompatible synchronization database format:</source>
+<target>同步資料庫格式不相容：</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>資料庫檔案不共享一個共同的同步連線：</target>
@@ -197,12 +200,18 @@
 <pluralform>%x 秒</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>拖放</target>
+
 <source>Info</source>
 <target>訊息</target>
 
 <source>Fatal Error</source>
 <target>嚴重錯誤</target>
 
+<source>Error reading file:</source>
+<target>讀取檔案錯誤：</target>
+
 <source>Scanning:</source>
 <target>正在掃瞄：</target>
 
@@ -220,15 +229,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>無效的 FreeFileSync 配置檔案！</target>
 
-<source>File does not exist:</source>
-<target>檔案不存在：</target>
-
 <source>Error parsing configuration file:</source>
 <target>分析配置檔案錯誤：</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>移動到資源回收筒錯誤：</target>
+
+<source>Could not load a required DLL:</source>
+<target>無法載入一個所需的DLL：</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>讀取卷影複製服務時錯誤！</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>不支援製作 WOW64 上的卷影副本。請使用 FreeFileSync 64位元版本。</target>
+
+<source>Could not determine volume name for file:</source>
+<target>無法判斷此檔案的卷標名稱：</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>卷名 %x 並非檔名 %y 的一部份！</target>
+
 <source>/sec</source>
 <target>/秒</target>
 
+<source>File does not exist:</source>
+<target>檔案不存在：</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>無法讀取 XML 之後節點的值：</target>
+
 <source>S&ave configuration...</source>
 <target>儲存配置(&A)...</target>
 
@@ -321,138 +351,6 @@ The command line is executed each time:
 <source>A directory input field is empty.</source>
 <target>目錄輸入的欄位為空</target>
 
-<source>Drag && drop</source>
-<target>拖放</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>無法初始化目錄監測：</target>
-
-<source>Error when monitoring directories.</source>
-<target>監測目錄錯誤。</target>
-
-<source>Conversion error:</source>
-<target>轉換錯誤：</target>
-
-<source>Error deleting file:</source>
-<target>刪除檔案錯誤：</target>
-
-<source>Error moving file:</source>
-<target>移動檔案錯誤：</target>
-
-<source>Target file already existing!</source>
-<target>目標檔案已存在！</target>
-
-<source>Error moving directory:</source>
-<target>移動目錄錯誤：</target>
-
-<source>Target directory already existing!</source>
-<target>目標目錄已存在！</target>
-
-<source>Error deleting directory:</source>
-<target>刪除目錄錯誤：</target>
-
-<source>Error changing modification time:</source>
-<target>變更修改時間錯誤：</target>
-
-<source>Error loading library function:</source>
-<target>載入函數庫錯誤：</target>
-
-<source>Error reading security context:</source>
-<target>讀取安全內文錯誤：</target>
-
-<source>Error writing security context:</source>
-<target>寫入安全性內容錯誤：</target>
-
-<source>Error copying file permissions:</source>
-<target>複製檔案權限錯誤：</target>
-
-<source>Error creating directory:</source>
-<target>新建目錄錯誤：</target>
-
-<source>Error copying symbolic link:</source>
-<target>複製符號連結錯誤：</target>
-
-<source>Error copying file:</source>
-<target>複製檔案錯誤：</target>
-
-<source>Error opening file:</source>
-<target>開啟檔案錯誤：</target>
-
-<source>Error writing file:</source>
-<target>寫入檔案錯誤：</target>
-
-<source>Error reading file:</source>
-<target>讀取檔案錯誤：</target>
-
-<source>Operation aborted!</source>
-<target>中止操作！</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>當遍歷目錄時無限循環：</target>
-
-<source>Error traversing directory:</source>
-<target>遍歷目錄錯誤：</target>
-
-<source>Error setting privilege:</source>
-<target>設定權限錯誤：</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>移動到資源回收筒錯誤：</target>
-
-<source>Could not load a required DLL:</source>
-<target>無法載入一個所需的DLL：</target>
-
-<source>Error writing to synchronization database:</source>
-<target>寫入同步資料庫錯誤：</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>讀取卷影複製服務時錯誤！</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>不支援製作 WOW64 上的卷影副本。請使用 FreeFileSync 64位元版本。</target>
-
-<source>Could not determine volume name for file:</source>
-<target>無法判斷此檔案的卷標名稱：</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>卷名 %x 並非檔名 %y 的一部份！</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x 分</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x 小時</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x 天</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>無法讀取 XML 之後節點的值：</target>
-
 <source>Logging</source>
 <target>日誌記錄</target>
 
@@ -471,9 +369,6 @@ The command line is executed each time:
 <source>Batch execution</source>
 <target>批次處理執行</target>
 
-<source>Log-messages:</source>
-<target>日誌訊息：</target>
-
 <source>Stop</source>
 <target>停止</target>
 
@@ -600,6 +495,24 @@ The command line is executed each time:
 <source>Total amount of data that will be transferred</source>
 <target>將要傳輸的全部資料量</target>
 
+<source>Operation:</source>
+<target>操作：</target>
+
+<source>Items found:</source>
+<target>尋找要素：</target>
+
+<source>Items remaining:</source>
+<target>剩餘要素：</target>
+
+<source>Speed:</source>
+<target>速度：</target>
+
+<source>Time remaining:</source>
+<target>剩餘時間：</target>
+
+<source>Time elapsed:</source>
+<target>經過時間：</target>
+
 <source>Batch job</source>
 <target>批次處理作業</target>
 
@@ -648,31 +561,13 @@ The command line is executed each time:
 <source>&Cancel</source>
 <target>取消(&C)</target>
 
-<source>Operation:</source>
-<target>操作：</target>
-
-<source>Items found:</source>
-<target>尋找要素：</target>
-
-<source>Items remaining:</source>
-<target>剩餘要素：</target>
-
-<source>Speed:</source>
-<target>速度：</target>
-
-<source>Time remaining:</source>
-<target>剩餘時間：</target>
-
-<source>Time elapsed:</source>
-<target>經過時間：</target>
-
 <source>Select variant:</source>
 <target>選擇變數：</target>
 
 <source><Automatic></source>
 <target><自動></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>對兩邊使用同一個資料庫的識別和傳送更改。自動檢測刪除和衝突部份。</target>
 
 <source>Mirror ->></source>
@@ -886,27 +781,19 @@ Exclude: \stuff\temp\*
 <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></target>
+<target>第一次將檔寫入到一個暫存 (*.ffs_tmp) 順便將它們重新命名。即使在嚴重錯誤的情況下，還可確保一致的狀態。</target>
 
 <source>Copy locked files</source>
 <target>複製被鎖定的檔案</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-複製共用或鎖定檔案使用使用卷影複製服務(需要管理員權限)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>複製共用或鎖定檔案使用使用卷影複製服務(需要管理員權限)</target>
 
 <source>Copy file access permissions</source>
 <target>複製檔案系統權限</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-傳輸檔案和目錄權限(需要管理員權限)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>傳輸檔案和目錄權限(需要管理員權限)</target>
 
 <source>Hidden dialogs:</source>
 <target>隱藏對話框：</target>
@@ -938,6 +825,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>&Find next</source>
 <target>找下一個(&F)</target>
 
+<source>Operation aborted!</source>
+<target>中止操作！</target>
+
 <source>Main bar</source>
 <target>主欄位</target>
 
@@ -978,16 +868,16 @@ Transfer file and directory permissions (Requires Administrator rights)
 <target>自動調整欄寬</target>
 
 <source>Icon size:</source>
-<target></target>
+<target>圖示大小：</target>
 
 <source>Small</source>
-<target></target>
+<target>小</target>
 
 <source>Medium</source>
-<target></target>
+<target>中</target>
 
 <source>Large</source>
-<target></target>
+<target>大</target>
 
 <source>Include all rows</source>
 <target>包括所有行</target>
@@ -1115,6 +1005,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>File list exported!</source>
 <target>檔案清單已匯出！</target>
 
+<source>Error writing file:</source>
+<target>寫入檔案錯誤：</target>
+
 <source>Batch file created successfully!</source>
 <target>批次檔新建成功！</target>
 
@@ -1131,7 +1024,7 @@ Transfer file and directory permissions (Requires Administrator rights)
 <pluralform>%x directories</pluralform>
 </source>
 <target>
-<pluralform>%x 目錄</pluralform>
+<pluralform>%x 個目錄</pluralform>
 </target>
 
 <source>
@@ -1139,7 +1032,7 @@ Transfer file and directory permissions (Requires Administrator rights)
 <pluralform>%x files</pluralform>
 </source>
 <target>
-<pluralform>%x 檔案</pluralform>
+<pluralform>%x 個檔案</pluralform>
 </target>
 
 <source>
@@ -1210,9 +1103,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Filter: Single pair</source>
 <target>篩選器：單對</target>
 
-<source>Ignore</source>
-<target>忽略</target>
-
 <source>Direct</source>
 <target>直接</target>
 
@@ -1274,6 +1164,102 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Move files into a time-stamped subdirectory</source>
 <target>移動檔案到一個時間標記的子目錄</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x 分</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x 小時</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x 天</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>無法初始化目錄監測：</target>
+
+<source>Error when monitoring directories.</source>
+<target>監測目錄錯誤。</target>
+
+<source>Conversion error:</source>
+<target>轉換錯誤：</target>
+
+<source>Error deleting file:</source>
+<target>刪除檔案錯誤：</target>
+
+<source>Error moving file:</source>
+<target>移動檔案錯誤：</target>
+
+<source>Target file already existing!</source>
+<target>目標檔案已存在！</target>
+
+<source>Error moving directory:</source>
+<target>移動目錄錯誤：</target>
+
+<source>Target directory already existing!</source>
+<target>目標目錄已存在！</target>
+
+<source>Error deleting directory:</source>
+<target>刪除目錄錯誤：</target>
+
+<source>Error changing modification time:</source>
+<target>變更修改時間錯誤：</target>
+
+<source>Error loading library function:</source>
+<target>載入函數庫錯誤：</target>
+
+<source>Error reading security context:</source>
+<target>讀取安全內文錯誤：</target>
+
+<source>Error writing security context:</source>
+<target>寫入安全性內容錯誤：</target>
+
+<source>Error copying file permissions:</source>
+<target>複製檔案權限錯誤：</target>
+
+<source>Error creating directory:</source>
+<target>新建目錄錯誤：</target>
+
+<source>Error copying symbolic link:</source>
+<target>複製符號連結錯誤：</target>
+
+<source>Error copying file:</source>
+<target>複製檔案錯誤：</target>
+
+<source>Error opening file:</source>
+<target>開啟檔案錯誤：</target>
+
+<source>Error traversing directory:</source>
+<target>遍歷目錄錯誤：</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>當遍歷目錄時無限循環：</target>
+
+<source>Error setting privilege:</source>
+<target>設定權限錯誤：</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>自上次同步後，兩邊均已更改過！</target>
 
@@ -1304,9 +1290,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>目錄有依靠性！請小心設定同步規則：</target>
 
-<source>Comparing content of files %x</source>
-<target>正在比對檔案内容的百分比 %x</target>
-
 <source>Memory allocation failed!</source>
 <target>記憶體分配失敗！</target>
 
@@ -1322,15 +1305,15 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>符號連結 %x 有相同日期但是不同目標！</target>
 
+<source>Comparing content of files %x</source>
+<target>正在比對檔案内容的百分比 %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>比對檔案內容失敗。</target>
 
 <source>Generating file list...</source>
 <target>產生檔案清單...</target>
 
-<source>Multiple...</source>
-<target>多個...</target>
-
 <source>Both sides are equal</source>
 <target>兩邊都相同</target>
 
@@ -1349,6 +1332,12 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Delete right file/folder</source>
 <target>刪除右邊檔案/資料夾</target>
 
+<source>Move file on left</source>
+<target>移動左邊的檔案</target>
+
+<source>Move file on right</source>
+<target>移動右邊的檔案</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>用適合檔案/資料夾覆蓋左邊檔案/資料夾</target>
 
@@ -1364,6 +1353,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Copy file attributes only to right</source>
 <target>只複製檔案屬性到右邊</target>
 
+<source>Multiple...</source>
+<target>多個...</target>
+
 <source>Deleting file %x</source>
 <target>正在刪除檔案 %x</target>
 
diff --git a/BUILD/Languages/croatian.lng b/BUILD/Languages/croatian.lng
new file mode 100644
index 00000000..cba3663a
--- /dev/null
+++ b/BUILD/Languages/croatian.lng
@@ -0,0 +1,1490 @@
+<header>
+	<language name>Hrvatski</language name>
+	<translator>Slavko Blažević</translator>
+	<locale>hr_HR</locale>
+	<flag file>croatia.png</flag file>
+	<plural forms>3</plural forms>
+	<plural definition>n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2</plural definition>
+</header>
+
+<source>Searching for directory %x...</source>
+<target>Tražim direktorij %x...</target>
+
+<source>Show in Explorer</source>
+<target>Prikaži u Exploreru</target>
+
+<source>Open with default application</source>
+<target>Otvori s zadanom aplikacijom</target>
+
+<source>Browse directory</source>
+<target>Odaberi direktorij</target>
+
+<source>RealtimeSync - Automated Synchronization</source>
+<target>RealtimeSync - Automatska Sinkronizacija</target>
+
+<source>Select alternate comparison settings</source>
+<target>Izaberite alternativne postavke usporedbe</target>
+
+<source>Select alternate synchronization settings</source>
+<target>Izaberite alternativne postavke sinkronizacije</target>
+
+<source>No filter selected</source>
+<target>Nijedan filter odabran</target>
+
+<source>Filter is active</source>
+<target>Filter je aktivan</target>
+
+<source>Remove alternate settings</source>
+<target>Ukloni alternativne postavke</target>
+
+<source>Clear filter settings</source>
+<target>Počisti postavke filtera</target>
+
+<source>Create a batch job</source>
+<target>Izradi batch zadatak</target>
+
+<source>Synchronization settings</source>
+<target>Postavke sinkronizacije</target>
+
+<source>Comparison settings</source>
+<target>Postavke usporedbe</target>
+
+<source>About</source>
+<target>O programu</target>
+
+<source>Error</source>
+<target>Greška</target>
+
+<source>Warning</source>
+<target>Oprez</target>
+
+<source>Question</source>
+<target>Pitanje</target>
+
+<source>Confirm</source>
+<target>Potvrdi</target>
+
+<source>Configure filter</source>
+<target>Konfiguriraj filter</target>
+
+<source>Customize columns</source>
+<target>Uredi stupce</target>
+
+<source>Global settings</source>
+<target>Globalne postavke</target>
+
+<source>Synchronization Preview</source>
+<target>Pregled sinkronizacije</target>
+
+<source>Find</source>
+<target>Pronađi</target>
+
+<source>Select time span</source>
+<target>Izaberite mjerni raspon</target>
+
+<source>Show pop-up</source>
+<target>Prikaži skočni prozor</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Prikaži skočni prozor pri greškama i upozorenjima</target>
+
+<source>Ignore errors</source>
+<target>Ignoriraj greške</target>
+
+<source>Hide all error and warning messages</source>
+<target>Sakrij sve greške i upozorenja</target>
+
+<source>Exit instantly</source>
+<target>Izađi trenutno</target>
+
+<source>Abort synchronization immediately</source>
+<target>Odmah prekini sinkronizaciju</target>
+
+<source>Browse</source>
+<target>Odaberi</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Greška pri čitanju iz sinkronizacijske baze:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Greška pri pisanju u sinkronizacijsku bazu:</target>
+
+<source>Invalid command line: %x</source>
+<target>Netočna naredba: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Windows greška %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Linux greška %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Pogreška pri otvaranju poveznice simbola:</target>
+
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
+<source>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
+</source>
+<target>
+<pluralform>%x Bajt</pluralform>
+<pluralform>%x Bajta</pluralform>
+<pluralform>%x Bajtova</pluralform>
+</target>
+
+<source><Symlink></source>
+<target><Poveznica simbola></target>
+
+<source><Directory></source>
+<target><Direktorij></target>
+
+<source>Size</source>
+<target>Veličina</target>
+
+<source>Date</source>
+<target>Datum</target>
+
+<source>Full path</source>
+<target>Puna putanja</target>
+
+<source>Filename</source>
+<target>Ime datoteke</target>
+
+<source>Relative path</source>
+<target>Relativna Putanja</target>
+
+<source>Directory</source>
+<target>Direktorij</target>
+
+<source>Extension</source>
+<target>Ekstenzija</target>
+
+<source>Comparison Result</source>
+<target>Rezultati usporedbe</target>
+
+<source>Initial synchronization:</source>
+<target>Početna sinkronizacija:</target>
+
+<source>One of the FreeFileSync database files is not yet existing:</source>
+<target>Jedna od FreeFileSync datoteka podatkovne baze još ne postoji:</target>
+
+<source>Incompatible synchronization database format:</source>
+<target>Nekompatibilan format sinkronizacijske podatkovne baze:</target>
+
+<source>Database files do not share a common synchronization session:</source>
+<target>Datoteke podatkovne baze ne dijele zajedničke sinkronizacijske sesije:</target>
+
+<source>An exception occurred!</source>
+<target>Dogodilo se izuzeće!</target>
+
+<source>Error reading file attributes:</source>
+<target>Greška pri čitanju atributa datoteke:</target>
+
+<source>Waiting while directory is locked (%x)...</source>
+<target>Čekam dok se direktorij zaključava (%x)...</target>
+
+<source>Error setting directory lock:</source>
+<target>Greška pri postavljanju zaključenja direktorija:</target>
+
+<source>
+<pluralform>1 sec</pluralform>
+<pluralform>%x sec</pluralform>
+</source>
+<target>
+<pluralform>%x sek</pluralform>
+<pluralform>%x sek</pluralform>
+<pluralform>%x sek</pluralform>
+</target>
+
+<source>Drag && drop</source>
+<target>Povuci && ispusti</target>
+
+<source>Info</source>
+<target>Info</target>
+
+<source>Fatal Error</source>
+<target>Kritična greška</target>
+
+<source>Error reading file:</source>
+<target>Greška pri čitanju datoteke:</target>
+
+<source>Scanning:</source>
+<target>Pretražujem:</target>
+
+<source>Encoding extended time information: %x</source>
+<target>:Spremam informacije o vremenu %x</target>
+
+<source>
+<pluralform>[1 Thread]</pluralform>
+<pluralform>[%x Threads]</pluralform>
+</source>
+<target>
+<pluralform>%x Stavka</pluralform>
+<pluralform>%x Stavke</pluralform>
+<pluralform>% Stavki</pluralform>
+</target>
+
+<source>Invalid FreeFileSync config file!</source>
+<target>Nevaljana FreeFileSync konfiguracijska datoteka!</target>
+
+<source>Error parsing configuration file:</source>
+<target>Greška pri raščlanjivanju datoteke postavki:</target>
+
+<source>Error moving to Recycle Bin:</source>
+<target>Greška pri premještanju u Koš za smeće:</target>
+
+<source>Could not load a required DLL:</source>
+<target>Nemože se pokrenuti potrebni DLL:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>Greška pri pristupu servisu particijskog kopiranja!</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>Stvaranje sjeničnih kopija na WOW63 nije podržano. Molimo koristite 64-bitnu FreeFileSync inačnicu.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Nemože se odrediti naziv particije za datoteku:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Naziv particije %x dio naziva datoteke %y!</target>
+
+<source>/sec</source>
+<target>/sek</target>
+
+<source>File does not exist:</source>
+<target>Datoteka ne postoji:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Nemogu pročitati vrijednosti iz slijedećih XML središta:</target>
+
+<source>S&ave configuration...</source>
+<target>&Spremi postavke...</target>
+
+<source>&Load configuration...</source>
+<target>&Uvezi postavke...</target>
+
+<source>&Quit</source>
+<target>&Izlaz</target>
+
+<source>&File</source>
+<target>&Datoteka</target>
+
+<source>&Content</source>
+<target>&Sadržaj</target>
+
+<source>&About...</source>
+<target>&O programu...</target>
+
+<source>&Help</source>
+<target>&Pomoć</target>
+
+<source>Usage:</source>
+<target>Uporaba:</target>
+
+<source>1. Select directories to monitor.</source>
+<target>1. Izaberite mape za nadziranje</target>
+
+<source>2. Enter a command line.</source>
+<target>2. Unesite naredbu.</target>
+
+<source>3. Press 'Start'.</source>
+<target>3. Pretisnite 'Start'.</target>
+
+<source>
+The command line is executed each time:
+- all directories become available (e.g. USB stick insert)
+- files within these directories or subdirectories are modified
+</source>
+<target>
+Naredba će biti izvršena kada:
+- sve mape postanu dostupne (npr. USB stick je umetnut)
+- datoteke unutar tih mapa ili podmapa budu mijenjane
+</target>
+
+<source>Directories to watch</source>
+<target>Mape za nadziranje</target>
+
+<source>Add folder</source>
+<target>Dodaj mapu</target>
+
+<source>Remove folder</source>
+<target>Ukloni mapu</target>
+
+<source>Select a folder</source>
+<target>Izaberite mapu</target>
+
+<source>Command line</source>
+<target>Naredbena linija</target>
+
+<source>Minimum Idle Time [seconds]</source>
+<target>Minimalno vrijeme pripravnosti [sekunde]</target>
+
+<source>Idle time between detection of last change and execution of command line in seconds</source>
+<target>Vrijeme pripravnosti između pronalaska zadnje promjene i izvršenja naredbe u sekundama</target>
+
+<source>Start</source>
+<target>Start</target>
+
+<source>(Build: %x)</source>
+<target>(Inačnica: %x)</target>
+
+<source>RealtimeSync configuration</source>
+<target>RealtimeSync postavke</target>
+
+<source>File already exists. Overwrite?</source>
+<target>Datoteka već postoji. Prepisati?</target>
+
+<source>&Restore</source>
+<target>&Vrati</target>
+
+<source>&Exit</source>
+<target>&Izlaz</target>
+
+<source>Monitoring active...</source>
+<target>Nadziranje aktivno...</target>
+
+<source>Waiting for missing directories...</source>
+<target>Čekam nedostajuće direktorije...</target>
+
+<source>A directory input field is empty.</source>
+<target>Upisno polje za direktorij je prazno.</target>
+
+<source>Logging</source>
+<target>Zapisivanje</target>
+
+<source>FreeFileSync batch file</source>
+<target>FreeFileSync batch datoteka</target>
+
+<source>FreeFileSync configuration</source>
+<target>FreeFileSync postavke</target>
+
+<source>FreeFileSync Batch Job</source>
+<target>FreeFileSync Batch zadatak</target>
+
+<source>Unable to create logfile!</source>
+<target>Nemogu napraviti zapisnik!</target>
+
+<source>Batch execution</source>
+<target>Batch izvršavanje</target>
+
+<source>Stop</source>
+<target>Zaustavi</target>
+
+<source>Total time:</source>
+<target>Ukupno vrijeme:</target>
+
+<source>Synchronization aborted!</source>
+<target>Sinkronizacija prekinuta!</target>
+
+<source>Synchronization completed with errors!</source>
+<target>Sinkronizacija završena s greškama!</target>
+
+<source>Synchronization completed successfully!</source>
+<target>Sinkronizacija uspješno završena!</target>
+
+<source>Press "Switch" to open FreeFileSync GUI mode.</source>
+<target>Pretisnite "Zamjena", da otvorite FreeFileSync GUI način.</target>
+
+<source>Switching to FreeFileSync GUI mode...</source>
+<target>Prelazim na FreeFileSync GUI način...</target>
+
+<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>Download now?</source>
+<target>Preuzeti sada?</target>
+
+<source>Information</source>
+<target>Informacija</target>
+
+<source>FreeFileSync is up to date!</source>
+<target>FreeFileSync je ažuriran!</target>
+
+<source>Do you want FreeFileSync to automatically check for updates every week?</source>
+<target>Dali želite da FreeFileSync automatski traži ažuriranja svaki tjedan?</target>
+
+<source>(Requires an Internet connection!)</source>
+<target>(Zahtjeva vezu na Internet!)</target>
+
+<source>1. &Compare</source>
+<target>1. &Usporedi</target>
+
+<source>2. &Synchronize...</source>
+<target>2. &Sinkroniziraj...</target>
+
+<source>S&witch view</source>
+<target>Pr&omjeni pogled</target>
+
+<source>&New</source>
+<target>&Novo</target>
+
+<source>&Program</source>
+<target>&Program</target>
+
+<source>&Language</source>
+<target>&Jezik</target>
+
+<source>&Global settings...</source>
+<target>&Globalne postavke...</target>
+
+<source>&Create batch job...</source>
+<target>&Izradi batch zadatak...</target>
+
+<source>&Export file list...</source>
+<target>&Izvoz liste datoteka...</target>
+
+<source>&Advanced</source>
+<target>&Napredno</target>
+
+<source>&Check for new version</source>
+<target>&Provjeri za novu verziju</target>
+
+<source>Compare</source>
+<target>Usporedi</target>
+
+<source>Compare both sides</source>
+<target>Usporedi obje strane</target>
+
+<source>&Abort</source>
+<target>&Odustani</target>
+
+<source>Synchronize...</source>
+<target>Sinkroniziraj...</target>
+
+<source>Start synchronization</source>
+<target>Započni sinkronizaciju</target>
+
+<source>Add folder pair</source>
+<target>Dodaj mapu</target>
+
+<source>Remove folder pair</source>
+<target>Odstrani mapu</target>
+
+<source>Swap sides</source>
+<target>Zamjeni strane</target>
+
+<source>Save current configuration to file</source>
+<target>Spremi sadašnje postavke u datoteku</target>
+
+<source>Load configuration from file</source>
+<target>Uvezi postavke iz datoteke</target>
+
+<source>Last used configurations (press DEL to remove from list)</source>
+<target>Zadnje korištene postavke (pretisite DEL za ukloniti s liste)</target>
+
+<source>Hide excluded items</source>
+<target>Sakrij isključene stavke</target>
+
+<source>Hide filtered or temporarily excluded files</source>
+<target>Sakrij filtrirane ili trenutno isključene datoteke</target>
+
+<source>Number of files and directories that will be created</source>
+<target>Broj datoteka i direktorija koji će biti napravljeni</target>
+
+<source>Number of files that will be overwritten</source>
+<target>Broj datoteka koje će biti prepisane</target>
+
+<source>Number of files and directories that will be deleted</source>
+<target>Broj datoteka i direktorija koji će biti izbrisani</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>Items found:</source>
+<target>Pronađene stavke:</target>
+
+<source>Items remaining:</source>
+<target>Preostale stavke:</target>
+
+<source>Speed:</source>
+<target>Brzina:</target>
+
+<source>Time remaining:</source>
+<target>Vremena preostalo:</target>
+
+<source>Time elapsed:</source>
+<target>Vremena prošlo:</target>
+
+<source>Batch job</source>
+<target>Batch zadatak</target>
+
+<source>Create a batch file for automated synchronization. To start in batch mode simply double-click the file or execute via command line: FreeFileSync.exe <ffs_batch file>. This can also be scheduled in your operating system's task planner.</source>
+<target>Napravite batch datoteku za automatsku sinkronizaciju. Da bi započeli batch mod dvostruki-klik na fajl ili izvršite pomoću komandne linije: FreeFileSync.exe <ffs_batch datoteka>. Ovo se također može zadati u planeru operacijskog sustava.</target>
+
+<source>Help</source>
+<target>Pomoć</target>
+
+<source>Filter files</source>
+<target>Filtriraj datoteke</target>
+
+<source>Error handling</source>
+<target>Greška pri obradi</target>
+
+<source>Left</source>
+<target>Lijevo</target>
+
+<source>Right</source>
+<target>Desno</target>
+
+<source>Overview</source>
+<target>Pregled</target>
+
+<source>Status feedback</source>
+<target>Status veze</target>
+
+<source>Run minimized</source>
+<target>Pokreni minimizirano</target>
+
+<source>Maximum number of logfiles:</source>
+<target>Maksimalan broj izvješća:</target>
+
+<source>Select logfile directory:</source>
+<target>Odaberite direktorij izvješća:</target>
+
+<source>Batch settings</source>
+<target>Batch postavke</target>
+
+<source>&Save</source>
+<target>&Spremi</target>
+
+<source>&Load</source>
+<target>&Uvezi</target>
+
+<source>&Cancel</source>
+<target>&Odustani</target>
+
+<source>Select variant:</source>
+<target>Izaberite varijantu:</target>
+
+<source><Automatic></source>
+<target><Automatski></target>
+
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Identificiraj i izvedi promjene na obje strane koristeći bazu podataka. Brisanja, preimenovanja i sukobi se automatski detektiraju</target>
+
+<source>Mirror ->></source>
+<target>Zrcalno ->></target>
+
+<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
+<target>Zrcalna pričuva lijeve mape. Desna mapa je uređena da bi bila jednaka lijevom folderu nakon sinkronizacije.</target>
+
+<source>Update -></source>
+<target>Ažuriraj -></target>
+
+<source>Copy new or updated files to right folder.</source>
+<target>Kopiraj nove ili ažurirane datoteke u desnu mapu.</target>
+
+<source>Custom</source>
+<target>Uobičajeno</target>
+
+<source>Configure your own synchronization rules.</source>
+<target>Konfigurirajte vaša vlastita sinkronizacijska pravila.</target>
+
+<source>Deletion handling</source>
+<target>Upravljanje pri brisanju</target>
+
+<source>&OK</source>
+<target>&U redu</target>
+
+<source>Configuration</source>
+<target>Postavke</target>
+
+<source>Category</source>
+<target>Kategorija</target>
+
+<source>Action</source>
+<target>Radnja</target>
+
+<source>File/folder exists on left side only</source>
+<target>Datoteka/mapa postoji samo na lijevoj strani</target>
+
+<source>File/folder exists on right side only</source>
+<target>Datoteka/mapa postoji samo na desnoj strani</target>
+
+<source>Left file is newer</source>
+<target>Lijeva datoteka je novija</target>
+
+<source>Right file is newer</source>
+<target>Desna datoteka je novija</target>
+
+<source>Files have different content</source>
+<target>Datoteke imaju različit sadržaj</target>
+
+<source>Conflict/file cannot be categorized</source>
+<target>Konflikt/datoteka ne more biti kategorizirana</target>
+
+<source>Compare by...</source>
+<target>Usporedi prema...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Datoteke se smatraju jednake ako su im
+     - vrijeme zadnje promjene i datum
+     - veličina datoteke
+jednaki
+</target>
+
+<source>File time and size</source>
+<target>Vrijeme i veličina datoteke</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Datoteke se smatraju jednake ako im je
+     - sadržaj datoteke
+jednak
+</target>
+
+<source>File content</source>
+<target>Sadržaj datoteke</target>
+
+<source>Symbolic Link handling</source>
+<target>Upravljanje simboličnim poveznicama</target>
+
+<source>Synchronizing...</source>
+<target>Sinkroniziram...</target>
+
+<source>Items processed:</source>
+<target>Obrađeni elementi:</target>
+
+<source>&Pause</source>
+<target>&Pauziraj</target>
+
+<source>Source code written in C++ utilizing:</source>
+<target>Izvorni kod napisan u C++ uz korištenje:</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Zahvale za prijevod FreeFileSync idu:</target>
+
+<source>Feedback and suggestions are welcome at:</source>
+<target>Povratne informacije i prijedlozi su dobrodošli na:</target>
+
+<source>FreeFileSync at Sourceforge</source>
+<target>FreeFileSync na Sourceforge</target>
+
+<source>Homepage</source>
+<target>Početna stranica</target>
+
+<source>If you like FFS</source>
+<target>Ako volite FFS</target>
+
+<source>Donate with PayPal</source>
+<target>Doniraj s PayPal</target>
+
+<source>Email</source>
+<target>Email</target>
+
+<source>Report translation error</source>
+<target>Prijavi grešku u prijevodu</target>
+
+<source>Published under the GNU General Public License:</source>
+<target>Objavljeno pod licencom GNU General Public:</target>
+
+<source>Ignore subsequent errors</source>
+<target>Ignoriraj naknadne 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>&Retry</source>
+<target>&Ponovi</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>Delete on both sides</source>
+<target>Izbriši na obje strane</target>
+
+<source>Delete on both sides even if the file is selected on one side only</source>
+<target>Izbriši na obje strane iako je označena datoteka samo na jednoj strani</target>
+
+<source>Use Recycle Bin</source>
+<target>Uporabi Koš za smeće</target>
+
+<source>
+Only files/directories that match all filter settings will be selected for synchronization.
+Note: The name filter must be specified relative(!) to main synchronization directories.
+</source>
+<target>
+Samo datoteke/direktorije koji odgovaraju svim filterskim postavkama će biti odabrane za sinkronizaciju.
+Napomena: Ime filtra mora biti određeno relativno(!) prema glavnim sinkronizacijskim direktorijima.
+</target>
+
+<source>Hints:</source>
+<target>Savjeti:</target>
+
+<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
+<target>1. Unesite relativno ime datoteke ili naziva direktorija odvojeno ';' ili novim redom.</target>
+
+<source>2. Use wildcard characters '*' and '?'.</source>
+<target>2. Uporabite znakove poput '*' ili '?'.</target>
+
+<source>3. Exclude files directly on main grid via context menu.</source>
+<target>3. Isključite datoteke neposredno na glavnoj mreži s kontekstnog menija.</target>
+
+<source>Example</source>
+<target>Primjer</target>
+
+<source>
+Include: *.doc;*.zip;*.exe
+Exclude: \stuff\temp\*
+</source>
+<target>
+Uključi: *.doc;*.zip;*.exe
+Isključi: \stuff\temp\*
+</target>
+
+<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
+<target>Sinkroniziraj sve .doc, .zip i .exe datoteke, izuzev svega iz podmape "temp".</target>
+
+<source>Include</source>
+<target>Uključi</target>
+
+<source>Exclude</source>
+<target>Isključi</target>
+
+<source>Minimum file size</source>
+<target>Minimalna veličina datoteke</target>
+
+<source>Maximum file size</source>
+<target>Maksimalna veličina datoteke</target>
+
+<source>&Default</source>
+<target>&Zadano</target>
+
+<source>Move column up</source>
+<target>Premakni stupac gore</target>
+
+<source>Move column down</source>
+<target>Premakni stupac dolje</target>
+
+<source>Transactional file copy</source>
+<target>Transakcijsko kopiranje datoteke</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>Zapiši u privremenu datoteku (*.ffs_tmp) najprije a onda ju preimenuj. Ovo garantira nepromjenjivost čak u slučaju kritične greške.</target>
+
+<source>Copy locked files</source>
+<target>Kopiraj zaključane datoteke</target>
+
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Kopiraj zajedničke ili zaključane datoteke koristeći Volume Shadow Copy Servis(Zahtjeva Administratorske ovlasti)</target>
+
+<source>Copy file access permissions</source>
+<target>Kopiraj datotečna dopuštenja</target>
+
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Prebaci datotečna dopuštenja (Zahtjeva Administratorske ovlasti)</target>
+
+<source>Hidden dialogs:</source>
+<target>Skriveni prozori:</target>
+
+<source>Reset</source>
+<target>Resetiraj</target>
+
+<source>Show hidden dialogs</source>
+<target>Prikaži skrivene prozore</target>
+
+<source>External applications</source>
+<target>Vanjske aplikacije</target>
+
+<source>Description</source>
+<target>Opis</target>
+
+<source>Variant</source>
+<target>Način</target>
+
+<source>Statistics</source>
+<target>Statistika</target>
+
+<source>Find what:</source>
+<target>Nađi što</target>
+
+<source>Match case</source>
+<target>Poklopi se</target>
+
+<source>&Find next</source>
+<target>&Nađi slijedeće</target>
+
+<source>Operation aborted!</source>
+<target>Operacija otkazana!</target>
+
+<source>Main bar</source>
+<target>Glavna traka</target>
+
+<source>Folder pairs</source>
+<target>Par mape</target>
+
+<source>Select view</source>
+<target>Izaberite pogled</target>
+
+<source>Set direction:</source>
+<target>Odaberi smijer:</target>
+
+<source>Exclude temporarily</source>
+<target>Trenutno izključi</target>
+
+<source>Include temporarily</source>
+<target>Trenutno uključi</target>
+
+<source>Exclude via filter:</source>
+<target>Isključi preko filtra:</target>
+
+<source><multiple selection></source>
+<target><višestruki odabir></target>
+
+<source>D-Click</source>
+<target>D-Klik</target>
+
+<source>Delete</source>
+<target>Izbriši</target>
+
+<source>Customize...</source>
+<target>Prilagodi...</target>
+
+<source>Select time span...</source>
+<target>Izaberite vremenski raspon...</target>
+
+<source>Auto-adjust columns</source>
+<target>Samo-prilagodi stupce</target>
+
+<source>Icon size:</source>
+<target>Veličina Ikone</target>
+
+<source>Small</source>
+<target>Malo</target>
+
+<source>Medium</source>
+<target>Srednje</target>
+
+<source>Large</source>
+<target>Veliko</target>
+
+<source>Include all rows</source>
+<target>Uključi sve redove</target>
+
+<source>Exclude all rows</source>
+<target>Isključi sve redove</target>
+
+<source>Reset view</source>
+<target>Resetiraj pogled</target>
+
+<source>Show "%x"</source>
+<target>Prikaži "%x"</target>
+
+<source><Last session></source>
+<target><Zadnja sesija></target>
+
+<source>Configuration saved!</source>
+<target>Postavke spremljene!</target>
+
+<source>Save changes to current configuration?</source>
+<target>Spremiti promjene na trenutne postavke?</target>
+
+<source>Configuration loaded!</source>
+<target>Postavke učitane!</target>
+
+<source>Folder Comparison and Synchronization</source>
+<target>Usporedba i sinkronizacija mapa</target>
+
+<source>Hide files that exist on left side only</source>
+<target>Sakrij datoteke koje postoje samo na lijevoj strani</target>
+
+<source>Show files that exist on left side only</source>
+<target>Prikaži datoteke koje postoje samo na lijevoj strani</target>
+
+<source>Hide files that exist on right side only</source>
+<target>Sakrij datoteke koje koje postoje samo na desnoj strani</target>
+
+<source>Show files that exist on right side only</source>
+<target>Prikaži datoteke koje postoje samo na desnoj strani</target>
+
+<source>Hide files that are newer on left</source>
+<target>Sakrij datoteke koje su novije lijevo</target>
+
+<source>Show files that are newer on left</source>
+<target>Prikaži datoteke koje su novije lijevo</target>
+
+<source>Hide files that are newer on right</source>
+<target>Skrij datoteke koje su novije desno</target>
+
+<source>Show files that are newer on right</source>
+<target>Prikaži datoteke koje su novije desno</target>
+
+<source>Hide files that are equal</source>
+<target>Skrij jednake datoteke</target>
+
+<source>Show files that are equal</source>
+<target>Prikaži jednake datoteke</target>
+
+<source>Hide files that are different</source>
+<target>Sakrij datoteke koje su različite</target>
+
+<source>Show files that are different</source>
+<target>Prikaži datoteke koje su različite</target>
+
+<source>Hide conflicts</source>
+<target>Sakrij sukobe</target>
+
+<source>Show conflicts</source>
+<target>Prikaži spore</target>
+
+<source>Hide files that will be created on the left side</source>
+<target>Sakrij datoteke koje će biti napravljene na lijevoj strani</target>
+
+<source>Show files that will be created on the left side</source>
+<target>Prikaži datoteke koje će biti napravljene na lijevoj strani</target>
+
+<source>Hide files that will be created on the right side</source>
+<target>Sakrij datoteke koje će biti napravljene na desnoj strani</target>
+
+<source>Show files that will be created on the right side</source>
+<target>Prikaži datoteke koje će biti napravljene na desnoj strani</target>
+
+<source>Hide files that will be deleted on the left side</source>
+<target>Sakrij datoteke koje će biti izbrisane na lijevoj strani</target>
+
+<source>Show files that will be deleted on the left side</source>
+<target>Prikaži datoteke koje će biti izbrisane na lijevoj strani</target>
+
+<source>Hide files that will be deleted on the right side</source>
+<target>Skrij datoteke koje će biti izbrisane na desnoj strani</target>
+
+<source>Show files that will be deleted on the right side</source>
+<target>Prikaži datoteke koje će biti izbrisane na desnoj strani</target>
+
+<source>Hide files that will be overwritten on left side</source>
+<target>Skrij datoteke koje će biti prepisane na lijevoj strani</target>
+
+<source>Show files that will be overwritten on left side</source>
+<target>Prikaži datoteke koje će biti prepisane na lijevoj strani</target>
+
+<source>Hide files that will be overwritten on right side</source>
+<target>Skrij datoteke koje će biti prepisane na desnoj strani</target>
+
+<source>Show files that will be overwritten on right side</source>
+<target>Prikaži datoteke koje će biti prepisane na desnoj strani</target>
+
+<source>Hide files that won't be copied</source>
+<target>Sakrij datoteke koje neće biti kopirane</target>
+
+<source>Show files that won't be copied</source>
+<target>Prikaži datoteke koje neće biti kopirane</target>
+
+<source>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>
+
+<source>Legend</source>
+<target>Legenda</target>
+
+<source>File list exported!</source>
+<target>Datotečna lista izvezena!</target>
+
+<source>Error writing file:</source>
+<target>Napaka pri pisanju datoteke:</target>
+
+<source>Batch file created successfully!</source>
+<target>Batch datoteka uspješno izrađena!</target>
+
+<source>
+<pluralform>Object deleted successfully!</pluralform>
+<pluralform>%x objects deleted successfully!</pluralform>
+</source>
+<target>
+<pluralform>%x Objekt uspješno izbrisan!</pluralform>
+<pluralform>%x objekta uspješno izbrisana!</pluralform>
+<pluralform>%x objekata uspješno izbrisano!</pluralform>
+</target>
+
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>%x direktorij</pluralform>
+<pluralform>%x direktorija</pluralform>
+<pluralform>%x direktorija</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>%x datoteka</pluralform>
+<pluralform>%x datoteke</pluralform>
+<pluralform>%x datoteka</pluralform>
+</target>
+
+<source>
+<pluralform>%x of 1 row in view</pluralform>
+<pluralform>%x of %y rows in view</pluralform>
+</source>
+<target>
+<pluralform>%x od %y red u prikazu</pluralform>
+<pluralform>%x od %y reda u prikazu</pluralform>
+<pluralform>%x od %y redova u prikazu</pluralform>
+</target>
+
+<source>Scanning...</source>
+<target>Pregledajem...</target>
+
+<source>Comparing content...</source>
+<target>Uspoređujem sadržaj...</target>
+
+<source>Paused</source>
+<target>Pauzirano</target>
+
+<source>Aborted</source>
+<target>Prekinuto</target>
+
+<source>Completed</source>
+<target>Završeno</target>
+
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Prekid zahtjevan: čekam da se trenutna akcija završi...</target>
+
+<source>Continue</source>
+<target>Nastavi</target>
+
+<source>Pause</source>
+<target>Pauziraj</target>
+
+<source>Cannot find %x</source>
+<target>Nemogu pronać %x</target>
+
+<source>Inactive</source>
+<target>Neaktivno</target>
+
+<source>Last x hours</source>
+<target>Zadnjih x sati</target>
+
+<source>Today</source>
+<target>Danas</target>
+
+<source>This week</source>
+<target>Ovaj tjedan</target>
+
+<source>This month</source>
+<target>Ovaj mjesec</target>
+
+<source>This year</source>
+<target>Ove godine</target>
+
+<source>Byte</source>
+<target>Bajt</target>
+
+<source>KB</source>
+<target>KB</target>
+
+<source>MB</source>
+<target>MB</target>
+
+<source>Filter: All pairs</source>
+<target>Filtriraj: Sve parove</target>
+
+<source>Filter: Single pair</source>
+<target>Filtriraj: Sam par</target>
+
+<source>Direct</source>
+<target>Neposredno</target>
+
+<source>Follow</source>
+<target>Slijedi</target>
+
+<source>Copy NTFS permissions</source>
+<target>Kopiraj NTFS dopuštenja</target>
+
+<source>Integrate external applications into context menu. The following macros are available:</source>
+<target>Integriraj vanjske aplikacije u kontekstni meni. Sljedeći makroi su dostupni:</target>
+
+<source>- full file or directory name</source>
+<target>- puno ime datoteke ili direktorija</target>
+
+<source>- directory part only</source>
+<target>- samo dio direktorija</target>
+
+<source>- Other side's counterpart to %name</source>
+<target>- Duplikat s druge strane k %name</target>
+
+<source>- Other side's counterpart to %dir</source>
+<target>- Duplikat s druge strane k %dir</target>
+
+<source>Restore all hidden dialogs?</source>
+<target>Vrati sve skrivene prozore?</target>
+
+<source>
+<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Dali zaista želite prebaciti navedeni %x objekt u Koš za smeće?</pluralform>
+<pluralform>Dali zaista želite prebaciti navedena %x objekta u Koš za smeće?</pluralform>
+<pluralform>Dali zaista želite prebaciti navedenih %x objekata u Koš za smeće?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following object?</pluralform>
+<pluralform>Do you really want to delete the following %x objects?</pluralform>
+</source>
+<target>
+<pluralform>Dali zaista želite izbrisati navedeni %x objekt?</pluralform>
+<pluralform>Dali zaista želite izbrisati navedena %x objekta?</pluralform>
+<pluralform>Dali zaista želite izbrisati navedenih %x objekata?</pluralform>
+</target>
+
+<source>Leave as unresolved conflict</source>
+<target>Ostavi kao neriješeni sukob</target>
+
+<source>Delete permanently</source>
+<target>Trajno izbriši</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Trajno izbriši ili prepiši datoteke</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Koristi Koš za smeće pri brisanju ili prepisivanju datoteka</target>
+
+<source>Versioning</source>
+<target>Verzija</target>
+
+<source>Move files into a time-stamped subdirectory</source>
+<target>Premjesti datoteke u vremenski-označen podfolder</target>
+
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x min</pluralform>
+<pluralform>%x min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x sat</pluralform>
+<pluralform>%x sata</pluralform>
+<pluralform>%x sati</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x dan</pluralform>
+<pluralform>%x dana</pluralform>
+<pluralform>%x dana</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Ne mogu započeti nadziranje direktorija:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Greška pri nadziranju direktorija.</target>
+
+<source>Conversion error:</source>
+<target>Greška pri pretvorbi:</target>
+
+<source>Error deleting file:</source>
+<target>Greška pri brisanju datoteke:</target>
+
+<source>Error moving file:</source>
+<target>Greška pri premještanju datoteke:</target>
+
+<source>Target file already existing!</source>
+<target>Ciljna datoteka već postoji!</target>
+
+<source>Error moving directory:</source>
+<target>Greška pri premještanju direktorija:</target>
+
+<source>Target directory already existing!</source>
+<target>Ciljni direktorij već postoji!</target>
+
+<source>Error deleting directory:</source>
+<target>Greška pri brisanju direktorija:</target>
+
+<source>Error changing modification time:</source>
+<target>Greška pri promjeni vremena izmjene:</target>
+
+<source>Error loading library function:</source>
+<target>Greška pri zadavanju funkcije iz knjižnice:</target>
+
+<source>Error reading security context:</source>
+<target>Greška pri čitanju zaštićenog sadržaja:</target>
+
+<source>Error writing security context:</source>
+<target>Greška pri pisanju zaštićenog sadržaja:</target>
+
+<source>Error copying file permissions:</source>
+<target>Greška pri kopiranju datotečnih dopuštenja:</target>
+
+<source>Error creating directory:</source>
+<target>Greška pri izradi direktorija:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Greška pri kopiranju poveznice simbola:</target>
+
+<source>Error copying file:</source>
+<target>Greška pri kopiranju datoteke:</target>
+
+<source>Error opening file:</source>
+<target>Greška pri otvaranju datoteke:</target>
+
+<source>Error traversing directory:</source>
+<target>Greška pri prelasku direktorija:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Beskonačna petlja pri prelasku direktorija:</target>
+
+<source>Error setting privilege:</source>
+<target>Greška pri postavljanju dopuštenja:</target>
+
+<source>Both sides have changed since last synchronization!</source>
+<target>Obje su strane promjenjene od posljednje sinkronizacije!</target>
+
+<source>Cannot determine sync-direction:</source>
+<target>Ne mogu odrediti smijer sinkronizacije.</target>
+
+<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>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
+<target>Postavljam zadani sinkronizacijski smijer: Stare datoteke će biti prepisane novim datotekama.</target>
+
+<source>The file does not contain a valid configuration:</source>
+<target>Datoteka ne sadrži ispravne postavke:</target>
+
+<source>You can ignore this error to consider the directory as empty.</source>
+<target>Možete ignorirati ovu grešku uzimajući datoteku kao praznu .</target>
+
+<source>Directory does not exist:</source>
+<target>Direktorij ne postoji:</target>
+
+<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
+<target>Direktoriji su u ovisnosti! Budite oprezni pri postavljanju sinkronizacijskih pravila:</target>
+
+<source>Memory allocation failed!</source>
+<target>Neuspješno dodjeljivanje memorije!</target>
+
+<source>File %x has an invalid date!</source>
+<target>Datoteka %x ima nevaljan datum!</target>
+
+<source>Conflict detected:</source>
+<target>Sukob pronađen:</target>
+
+<source>Files %x have the same date but a different size!</source>
+<target>Datoteke %x imaju isti datum ali drugačiju veličinu!</target>
+
+<source>Symlinks %x have the same date but a different target!</source>
+<target>Simbolične poveznice %x imaju isti datum ali drugačiji cilj!</target>
+
+<source>Comparing content of files %x</source>
+<target>Uspoređujem sadržaj datoteka %x</target>
+
+<source>Comparing files by content failed.</source>
+<target>Usporedba datoteka prema sadržaju nije uspjela.</target>
+
+<source>Generating file list...</source>
+<target>Generiram listu datoteka...</target>
+
+<source>Both sides are equal</source>
+<target>Obje strane su jednake</target>
+
+<source>Files/folders differ in attributes only</source>
+<target>Datoteke/mape se razlikuju samo u atributima</target>
+
+<source>Copy new file/folder to left</source>
+<target>Kopiraj novu datoteku/mapu na lijevo</target>
+
+<source>Copy new file/folder to right</source>
+<target>Kopiraj novu datoteku/mapu na desno</target>
+
+<source>Delete left file/folder</source>
+<target>Izbriši lijevu datoteku/mapu</target>
+
+<source>Delete right file/folder</source>
+<target>Izbriši desnu datoteku/mapu</target>
+
+<source>Move file on left</source>
+<target>Premjesti datoteku lijevo</target>
+
+<source>Move file on right</source>
+<target>Premjest datoteku desno</target>
+
+<source>Overwrite left file/folder with right one</source>
+<target>Prepiši lijevu datoteku/mapu s onom sa desne strane</target>
+
+<source>Overwrite right file/folder with left one</source>
+<target>Prepiši desnu datoteku/mapu s onom sa lijeve strane</target>
+
+<source>Do nothing</source>
+<target>Ne radi ništa</target>
+
+<source>Copy file attributes only to left</source>
+<target>Kopiraj atribute datoteke samo na levo</target>
+
+<source>Copy file attributes only to right</source>
+<target>Kopiraj atribute datoteke samo na desno</target>
+
+<source>Multiple...</source>
+<target>Mnogostruko...</target>
+
+<source>Deleting file %x</source>
+<target>Brisanje datoteke %x</target>
+
+<source>Deleting folder %x</source>
+<target>Brisanje mape %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Brisanje simboličnih poveznica %x</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Premještam datoteku %x u Koš za smeće</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Premještam mapu %x u Koš za smeće</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Premještam simboličnu poveznicu %x u Koš za smeće</target>
+
+<source>Moving file %x to %y</source>
+<target>Premještam datoteku %x u %y</target>
+
+<source>Moving folder %x to %y</source>
+<target>Premještam mapu %x u %y</target>
+
+<source>Moving symbolic link %x to %y</source>
+<target>Premještam simboličnu poveznicu %x u %y</target>
+
+<source>Creating file %x</source>
+<target>Izrađujem datoteku %x</target>
+
+<source>Creating symbolic link %x</source>
+<target>Izrađujem simboličnu poveznicu %x</target>
+
+<source>Creating folder %x</source>
+<target>Izrađujem mapu %x</target>
+
+<source>Overwriting file %x</source>
+<target>Prepisujem datoteku %x</target>
+
+<source>Overwriting symbolic link %x</source>
+<target>Prepisujem simboličnu poveznicu %x</target>
+
+<source>Verifying file %x</source>
+<target>Provjeravam datoteku %x</target>
+
+<source>Updating attributes of %x</source>
+<target>Obnavljam atribute od %x</target>
+
+<source>Target directory name must not be empty!</source>
+<target>Ime ciljnog direktorija ne smije biti prazno!</target>
+
+<source>User-defined directory for deletion was not specified!</source>
+<target>Korisnički definiran direktorij za brisanje nije definiran!</target>
+
+<source>Source directory does not exist anymore:</source>
+<target>Izvorni direktorij više ne postoji:</target>
+
+<source>Unresolved conflicts existing!</source>
+<target>Nerješivi sukob postoji!</target>
+
+<source>You can ignore conflicts and continue synchronization.</source>
+<target>Možete ignorirati sukob i nastaviti s sinkronizacijom.</target>
+
+<source>Significant difference detected:</source>
+<target>Značajna razlika opažena:</target>
+
+<source>More than 50% of the total number of files will be copied or deleted!</source>
+<target>Više od 50% od ukupnog broja datoteka će biti kopirano ili izbrisano!</target>
+
+<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>Free disk space available:</source>
+<target>Prostor na disku dostupan:</target>
+
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Koš za smeće nije dostupan za navedene putanje! Umjesto toga datoteke će biti trajno izbrisane:</target>
+
+<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
+<target>Direktorij će biti mjenjan koji je dio više parova mapa! Molimo pogledajte postavke sinkronizacije!</target>
+
+<source>Processing folder pair:</source>
+<target>Obrađujem parove mapa:</target>
+
+<source>Generating database...</source>
+<target>Izrađujem bazu podataka...</target>
+
+<source>Nothing to synchronize according to configuration!</source>
+<target>Po trenutnim postavkama nema ništa za sinkroniziranje!</target>
+
+<source>Error copying locked file %x!</source>
+<target>Greška pri kopiranju zaključane datoteke %x!</target>
+
+<source>Data verification error: Source and target file have different content!</source>
+<target>Greška pri provjeravanju podataka: Izvorna i ciljna datoteka imaju različit sadržaj!</target>
+
diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng
index d3dd805e..fb72c119 100644
--- a/BUILD/Languages/czech.lng
+++ b/BUILD/Languages/czech.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatická synchronizace</target>
 
-<source>Browse</source>
-<target>Procházet</target>
-
-<source>Windows Error Code %x:</source>
-<target>Chybový kód Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Chybový kód Linux %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>Neplatný příkaz: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>Chyba odkazu zástupce:</target>
-
-<source>Show pop-up</source>
-<target>Zobrazit okno</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Zobrazit hlášení při chybě nebo varování</target>
-
-<source>Ignore errors</source>
-<target>Přeskočit chyby</target>
-
-<source>Hide all error and warning messages</source>
-<target>Skrýt všechny chyby a varování</target>
-
-<source>Exit instantly</source>
-<target>Ukončit ihned</target>
-
-<source>Abort synchronization immediately</source>
-<target>Přerušit synchronizaci ihned</target>
-
 <source>Select alternate comparison settings</source>
 <target>Změnit nastavení porovnání</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>Časové rozmezí</target>
 
+<source>Show pop-up</source>
+<target>Zobrazit okno</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Zobrazit hlášení při chybě nebo varování</target>
+
+<source>Ignore errors</source>
+<target>Přeskočit chyby</target>
+
+<source>Hide all error and warning messages</source>
+<target>Skrýt všechny chyby a varování</target>
+
+<source>Exit instantly</source>
+<target>Ukončit ihned</target>
+
+<source>Abort synchronization immediately</source>
+<target>Přerušit synchronizaci ihned</target>
+
+<source>Browse</source>
+<target>Procházet</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Chyba čtení synchronizační databáze:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Chyba zápisu synchronizační databáze:</target>
+
+<source>Invalid command line: %x</source>
+<target>Neplatný příkaz: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Chybový kód Windows %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Chybový kód Linux %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Chyba odkazu zástupce:</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -164,17 +170,14 @@
 <source>Comparison Result</source>
 <target>Výsledek porovnání</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Chyba formátu synchronizační databáze:</target>
-
 <source>Initial synchronization:</source>
 <target>Prvotní synchronizace:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>Některý z databázových souborů FreeFileSync neexistuje:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Chyba čtení synchronizační databáze:</target>
+<source>Incompatible synchronization database format:</source>
+<target>Chyba formátu synchronizační databáze:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>Databázové soubory nejsou navzájem komplementární</target>
@@ -201,12 +204,18 @@
 <pluralform>%x sekund</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Drag && Drop</target>
+
 <source>Info</source>
 <target>Info</target>
 
 <source>Fatal Error</source>
 <target>Závažná chyba</target>
 
+<source>Error reading file:</source>
+<target>Chyba čtení souboru:</target>
+
 <source>Scanning:</source>
 <target>Zpracováváno:</target>
 
@@ -226,15 +235,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Chybný konfigurační soubor FreeFileSync!</target>
 
-<source>File does not exist:</source>
-<target>Soubor neexistuje:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Chyba zpracování konfigurace:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Chyba přesunu do Koše:</target>
+
+<source>Could not load a required DLL:</source>
+<target>Nelze načíst požadovanou knihovnu DLL:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>Chyba přístupu ke službě Volume Shadow Copy Service!</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>Vytváření stínových kopií na WOW64 není podporováno. Prosím použijte 64 bitovou verzi FreeFileSync.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Není možné zjistit jméno jednotky souboru:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Disk %x není součástí jména souboru %y!</target>
+
 <source>/sec</source>
 <target>/s</target>
 
+<source>File does not exist:</source>
+<target>Soubor neexistuje:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Nelze načíst hodnoty následujících XML elementy:</target>
+
 <source>S&ave configuration...</source>
 <target>&Uložení konfigurace...</target>
 
@@ -327,144 +357,6 @@ Příkazová řádka je spuštěna pokaždé když:
 <source>A directory input field is empty.</source>
 <target>Není zadán vstupní adresář.</target>
 
-<source>Drag && drop</source>
-<target>Drag && Drop</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>Nelze nastavit monitorování adresáře:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Chyba při sledování adresářů.</target>
-
-<source>Conversion error:</source>
-<target>Chyba konverze:</target>
-
-<source>Error deleting file:</source>
-<target>Chyba mazání souboru:</target>
-
-<source>Error moving file:</source>
-<target>Chyba přesouvání souboru:</target>
-
-<source>Target file already existing!</source>
-<target>Cílový soubor již existuje!</target>
-
-<source>Error moving directory:</source>
-<target>Chyba přesouvání adresáře:</target>
-
-<source>Target directory already existing!</source>
-<target>Cílový adresář již existuje!</target>
-
-<source>Error deleting directory:</source>
-<target>Chyba mazání adresáře:</target>
-
-<source>Error changing modification time:</source>
-<target>Chyba nastavení času změny:</target>
-
-<source>Error loading library function:</source>
-<target>Chyba načtení knihovny funkcí:</target>
-
-<source>Error reading security context:</source>
-<target>Chyba při čtení přístupových práv:</target>
-
-<source>Error writing security context:</source>
-<target>Chyba při zápisu přístupových práv:</target>
-
-<source>Error copying file permissions:</source>
-<target>Chyba kopírování oprávnění souborů:</target>
-
-<source>Error creating directory:</source>
-<target>Chyba vytvoření adresáře:</target>
-
-<source>Error copying symbolic link:</source>
-<target>Chyba kopírování zástupce:</target>
-
-<source>Error copying file:</source>
-<target>Chyba kopírování souboru:</target>
-
-<source>Error opening file:</source>
-<target>Chyba otevření souboru:</target>
-
-<source>Error writing file:</source>
-<target>Chyba zápisu souboru:</target>
-
-<source>Error reading file:</source>
-<target>Chyba čtení souboru:</target>
-
-<source>Operation aborted!</source>
-<target>Operace zrušena!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Zacyklení při procházení adresáře:</target>
-
-<source>Error traversing directory:</source>
-<target>Chyba procházení adresáře:</target>
-
-<source>Error setting privilege:</source>
-<target>Chyba nastavení práv:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Chyba přesunu do Koše:</target>
-
-<source>Could not load a required DLL:</source>
-<target>Nelze načíst požadovanou knihovnu DLL:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Chyba zápisu synchronizační databáze:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Chyba přístupu ke službě Volume Shadow Copy Service!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Vytváření stínových kopií na WOW64 není podporováno. Prosím použijte 64 bitovou verzi FreeFileSync.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>Není možné zjistit jméno jednotky souboru:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>Disk %x není součástí jména souboru %y!</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 minuta</pluralform>
-<pluralform>%x minuty</pluralform>
-<pluralform>%x minut</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 hodina</pluralform>
-<pluralform>%x hodiny</pluralform>
-<pluralform>%x hodin</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 den</pluralform>
-<pluralform>%x dny</pluralform>
-<pluralform>%x dnů</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>Nelze načíst hodnoty následujících XML elementy:</target>
-
 <source>Logging</source>
 <target>Zaznamenávání</target>
 
@@ -483,9 +375,6 @@ Příkazová řádka je spuštěna pokaždé když:
 <source>Batch execution</source>
 <target>Spuštění dávky</target>
 
-<source>Log-messages:</source>
-<target>Záznamy:</target>
-
 <source>Stop</source>
 <target>Stop</target>
 
@@ -612,6 +501,24 @@ Příkazová řádka je spuštěna pokaždé když:
 <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>Items found:</source>
+<target>Nalezeno položek:</target>
+
+<source>Items remaining:</source>
+<target>Zbývá položek:</target>
+
+<source>Speed:</source>
+<target>Rychlost:</target>
+
+<source>Time remaining:</source>
+<target>Zbývající čas:</target>
+
+<source>Time elapsed:</source>
+<target>Uplynulý čas:</target>
+
 <source>Batch job</source>
 <target>Dávkový soubor</target>
 
@@ -660,32 +567,14 @@ Příkazová řádka je spuštěna pokaždé když:
 <source>&Cancel</source>
 <target>&Zrušit</target>
 
-<source>Operation:</source>
-<target>Operace:</target>
-
-<source>Items found:</source>
-<target>Nalezeno položek:</target>
-
-<source>Items remaining:</source>
-<target>Zbývá položek:</target>
-
-<source>Speed:</source>
-<target>Rychlost:</target>
-
-<source>Time remaining:</source>
-<target>Zbývající čas:</target>
-
-<source>Time elapsed:</source>
-<target>Uplynulý čas:</target>
-
 <source>Select variant:</source>
 <target>Vyberte variantu:</target>
 
 <source><Automatic></source>
 <target><- Automaticky -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Rozpoznat a provést změny na obou stranách pomocí databáze. Odstraněné soubory a konflikty budou detekovány automaticky.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Rozpoznat a provést změny na obou stranách pomocí databáze. Odstraněné nebo přejmenované soubory a konflikty budou detekovány automaticky.</target>
 
 <source>Mirror ->></source>
 <target>Zrcadlení ->></target>
@@ -907,27 +796,19 @@ Vynechat: \někde\něco\*
 <target>Bezpečné kopírování souborů</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></target>
+<target>Kopíruje data nejprve do pomocného souboru (*.ffs_tmp) a poté teprve soubor přejmenuje. Tento postup zajišťuje bezpečné chování i v případě chyby během přenosu</target>
 
 <source>Copy locked files</source>
 <target>Kopírovat zamčené soubory</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Kopírovat sdílené nebo zamčené soubory pomocí Volume Shadow Copy Service (Vyžaduje administrátorské oprávnění)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Kopírovat sdílené nebo zamčené soubory pomocí Volume Shadow Copy Service (Vyžaduje administrátorské oprávnění)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopírovat přístupová oprávnění k souborům</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Přenést přístupová oprávnění souborů a adresářů (Vyžaduje administrátorké oprávnění)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Přenést přístupová oprávnění souborů a adresářů (Vyžaduje administrátorké oprávnění)</target>
 
 <source>Hidden dialogs:</source>
 <target>Skryté dialogy:</target>
@@ -959,6 +840,9 @@ Přenést přístupová oprávnění souborů a adresářů (Vyžaduje administr
 <source>&Find next</source>
 <target>&Najít další</target>
 
+<source>Operation aborted!</source>
+<target>Operace zrušena!</target>
+
 <source>Main bar</source>
 <target>Hlavní lišta</target>
 
@@ -999,16 +883,16 @@ Přenést přístupová oprávnění souborů a adresářů (Vyžaduje administr
 <target>Automaticky přizpůsobit šířku</target>
 
 <source>Icon size:</source>
-<target></target>
+<target>Velikost ikon:</target>
 
 <source>Small</source>
-<target></target>
+<target>Malé</target>
 
 <source>Medium</source>
-<target></target>
+<target>Střední</target>
 
 <source>Large</source>
-<target></target>
+<target>Velké</target>
 
 <source>Include all rows</source>
 <target>Použít všechny řádky</target>
@@ -1136,6 +1020,9 @@ Přenést přístupová oprávnění souborů a adresářů (Vyžaduje administr
 <source>File list exported!</source>
 <target>Seznam souborů exportován!</target>
 
+<source>Error writing file:</source>
+<target>Chyba zápisu souboru:</target>
+
 <source>Batch file created successfully!</source>
 <target>Dávka úspěšně vytvořena!</target>
 
@@ -1239,9 +1126,6 @@ Přenést přístupová oprávnění souborů a adresářů (Vyžaduje administr
 <source>Filter: Single pair</source>
 <target>Filtr: Jeden pár</target>
 
-<source>Ignore</source>
-<target>Přeskočit</target>
-
 <source>Direct</source>
 <target>Zachovat</target>
 
@@ -1307,6 +1191,108 @@ Přenést přístupová oprávnění souborů a adresářů (Vyžaduje administr
 <source>Move files into a time-stamped subdirectory</source>
 <target>Přesunout soubory do časově označeného podadresáře</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 minuta</pluralform>
+<pluralform>%x minuty</pluralform>
+<pluralform>%x minut</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 hodina</pluralform>
+<pluralform>%x hodiny</pluralform>
+<pluralform>%x hodin</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 den</pluralform>
+<pluralform>%x dny</pluralform>
+<pluralform>%x dnů</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Nelze nastavit monitorování adresáře:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Chyba při sledování adresářů.</target>
+
+<source>Conversion error:</source>
+<target>Chyba konverze:</target>
+
+<source>Error deleting file:</source>
+<target>Chyba mazání souboru:</target>
+
+<source>Error moving file:</source>
+<target>Chyba přesouvání souboru:</target>
+
+<source>Target file already existing!</source>
+<target>Cílový soubor již existuje!</target>
+
+<source>Error moving directory:</source>
+<target>Chyba přesouvání adresáře:</target>
+
+<source>Target directory already existing!</source>
+<target>Cílový adresář již existuje!</target>
+
+<source>Error deleting directory:</source>
+<target>Chyba mazání adresáře:</target>
+
+<source>Error changing modification time:</source>
+<target>Chyba nastavení času změny:</target>
+
+<source>Error loading library function:</source>
+<target>Chyba načtení knihovny funkcí:</target>
+
+<source>Error reading security context:</source>
+<target>Chyba při čtení přístupových práv:</target>
+
+<source>Error writing security context:</source>
+<target>Chyba při zápisu přístupových práv:</target>
+
+<source>Error copying file permissions:</source>
+<target>Chyba kopírování oprávnění souborů:</target>
+
+<source>Error creating directory:</source>
+<target>Chyba vytvoření adresáře:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Chyba kopírování zástupce:</target>
+
+<source>Error copying file:</source>
+<target>Chyba kopírování souboru:</target>
+
+<source>Error opening file:</source>
+<target>Chyba otevření souboru:</target>
+
+<source>Error traversing directory:</source>
+<target>Chyba procházení adresáře:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Zacyklení při procházení adresáře:</target>
+
+<source>Error setting privilege:</source>
+<target>Chyba nastavení práv:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>Došlo ke změně obou stran od poslední synchronizace!</target>
 
@@ -1337,9 +1323,6 @@ Přenést přístupová oprávnění souborů a adresářů (Vyžaduje administr
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Adresáře jsou závislé! Buďte opatrní s definicí synchronizačních pravidel:</target>
 
-<source>Comparing content of files %x</source>
-<target>Porovnávání obsahu souborů %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Chyba přidělení paměti!</target>
 
@@ -1355,15 +1338,15 @@ Přenést přístupová oprávnění souborů a adresářů (Vyžaduje administr
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Symbolický odkaz %x má stejné datum ale jiný cíl!</target>
 
+<source>Comparing content of files %x</source>
+<target>Porovnávání obsahu souborů %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>Porovnání obsahu souborů se nezdařilo.</target>
 
 <source>Generating file list...</source>
 <target>Vytváření seznamu souborů...</target>
 
-<source>Multiple...</source>
-<target>Různé...</target>
-
 <source>Both sides are equal</source>
 <target>Obě strany jsou shodné</target>
 
@@ -1382,6 +1365,12 @@ Přenést přístupová oprávnění souborů a adresářů (Vyžaduje administr
 <source>Delete right file/folder</source>
 <target>Smazat soubor/adresáře z prava</target>
 
+<source>Move file on left</source>
+<target>Přesunout soubor nalevo</target>
+
+<source>Move file on right</source>
+<target>Přesunout soubor napravo</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Přepsat levý soubor/adresář tím z prava</target>
 
@@ -1397,6 +1386,9 @@ Přenést přístupová oprávnění souborů a adresářů (Vyžaduje administr
 <source>Copy file attributes only to right</source>
 <target>Kopírovat vlastnosti souboru pouze do prava</target>
 
+<source>Multiple...</source>
+<target>Různé...</target>
+
 <source>Deleting file %x</source>
 <target>Mazání souboru %x</target>
 
diff --git a/BUILD/Languages/danish.lng b/BUILD/Languages/danish.lng
index d13de994..cc3d8536 100644
--- a/BUILD/Languages/danish.lng
+++ b/BUILD/Languages/danish.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSynk - Automatisk Synkronisering</target>
 
-<source>Browse</source>
-<target>Gennemse</target>
-
-<source>Windows Error Code %x:</source>
-<target>Windows Fejl kode %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux Fejl kode %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>Ugyldig kommando: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>Fejl i at finde link:</target>
-
-<source>Show pop-up</source>
-<target>Vis pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Vis pop-up ved fejl eller advarsler</target>
-
-<source>Ignore errors</source>
-<target>Ignorer fejl</target>
-
-<source>Hide all error and warning messages</source>
-<target>Skjul beskeder om fejl og advarsler</target>
-
-<source>Exit instantly</source>
-<target>Afslut med det samme</target>
-
-<source>Abort synchronization immediately</source>
-<target>Abort synkronisering med det samme</target>
-
 <source>Select alternate comparison settings</source>
 <target>Vælg alternative sammenlignings indstillinger</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>Vælg tids område</target>
 
+<source>Show pop-up</source>
+<target>Vis pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Vis pop-up ved fejl eller advarsler</target>
+
+<source>Ignore errors</source>
+<target>Ignorer fejl</target>
+
+<source>Hide all error and warning messages</source>
+<target>Skjul beskeder om fejl og advarsler</target>
+
+<source>Exit instantly</source>
+<target>Afslut med det samme</target>
+
+<source>Abort synchronization immediately</source>
+<target>Abort synkronisering med det samme</target>
+
+<source>Browse</source>
+<target>Gennemse</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Fejl i læsning fra synkroniserings databasen:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Fejl i skrivning til synkroniserings databasen:</target>
+
+<source>Invalid command line: %x</source>
+<target>Ugyldig kommando: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Windows Fejl kode %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Linux Fejl kode %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Fejl i at finde link:</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -163,17 +169,14 @@
 <source>Comparison Result</source>
 <target>Sammenlignings Resultat</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Ukompatibelt synkroniserings database format:</target>
-
 <source>Initial synchronization:</source>
 <target>Indledende synkronisering:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>En af FreeFileSync database filerne findes ikke endnu:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Fejl i læsning fra synkroniserings databasen:</target>
+<source>Incompatible synchronization database format:</source>
+<target>Ukompatibelt synkroniserings database format:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>Database filer deler ikke en fælles synkroniserings session</target>
@@ -199,12 +202,18 @@
 <pluralform>%x sek</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Træk && slip</target>
+
 <source>Info</source>
 <target>Info</target>
 
 <source>Fatal Error</source>
 <target>Uoprettelig Fejl</target>
 
+<source>Error reading file:</source>
+<target>Fejl i læsning af fil:</target>
+
 <source>Scanning:</source>
 <target>Skanner:</target>
 
@@ -223,15 +232,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Ugyldig FreeFileSync config fil!</target>
 
-<source>File does not exist:</source>
-<target>Filen findes ikke:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Fejl i at lave konfigurations filen:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Fejl i at flytte til skraldespand:</target>
+
+<source>Could not load a required DLL:</source>
+<target>Kunne ikke hente en krævet DLL:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>Fejl i adgang til Enhedens Kopi Service</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>At lave spejl kopier af WOW64 er ikke understøttet. Brug venligst FreeFileSync 64-bit version.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Kunne ikke finde drev navn til filen:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Drev navn %x ikke en del af filnavn %y!</target>
+
 <source>/sec</source>
 <target>/sek</target>
 
+<source>File does not exist:</source>
+<target>Filen findes ikke:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Kunne ikke læse værdierne for følgende XML punkter:</target>
+
 <source>S&ave configuration...</source>
 <target>G&em konfiguration...</target>
 
@@ -324,141 +354,6 @@ Kommando linjen bliver afviklet hver gang:
 <source>A directory input field is empty.</source>
 <target>Et biblioteks felt er tomt.</target>
 
-<source>Drag && drop</source>
-<target>Træk && slip</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>Kunne ikke initialiserer biblioteks overvågningen:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Fejl i overvågning af biblioteker.</target>
-
-<source>Conversion error:</source>
-<target>Konverterings fejl:</target>
-
-<source>Error deleting file:</source>
-<target>Fejl i sletning af fil:</target>
-
-<source>Error moving file:</source>
-<target>Fejl i flytning af fil:</target>
-
-<source>Target file already existing!</source>
-<target>Filen findes i forvejen!</target>
-
-<source>Error moving directory:</source>
-<target>Fejl i flytning af bibliotek:</target>
-
-<source>Target directory already existing!</source>
-<target>Bibliotek findes i forvejen!</target>
-
-<source>Error deleting directory:</source>
-<target>Fejl i sletning af bibliotek:</target>
-
-<source>Error changing modification time:</source>
-<target>Fejl i ændring af modificerings tiden:</target>
-
-<source>Error loading library function:</source>
-<target>Fejl i biblioteks funktionen:</target>
-
-<source>Error reading security context:</source>
-<target>Fejl i læsning af sikkerhedstilladelser:</target>
-
-<source>Error writing security context:</source>
-<target>Fejl i skrivning af sikkerhedstilladelser:</target>
-
-<source>Error copying file permissions:</source>
-<target>Fejl i kopiering af filtilladelser:</target>
-
-<source>Error creating directory:</source>
-<target>Fejl i oprettelse af bibliotek:</target>
-
-<source>Error copying symbolic link:</source>
-<target>Fejl i kopiering af link:</target>
-
-<source>Error copying file:</source>
-<target>Fejl i kopiering af fil:</target>
-
-<source>Error opening file:</source>
-<target>Fejl i åbning af fil:</target>
-
-<source>Error writing file:</source>
-<target>Fejl i at skrive fil:</target>
-
-<source>Error reading file:</source>
-<target>Fejl i læsning af fil:</target>
-
-<source>Operation aborted!</source>
-<target>Operation afbrudt!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Uendelig løkke ved gennemgang af bibliotek:</target>
-
-<source>Error traversing directory:</source>
-<target>Fejl i gennemgang af bibliotek:</target>
-
-<source>Error setting privilege:</source>
-<target>Fejl i at sætte privilegier:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Fejl i at flytte til skraldespand:</target>
-
-<source>Could not load a required DLL:</source>
-<target>Kunne ikke hente en krævet DLL:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Fejl i skrivning til synkroniserings databasen:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Fejl i adgang til Enhedens Kopi Service</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>At lave spejl kopier af WOW64 er ikke understøttet. Brug venligst FreeFileSync 64-bit version.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>Kunne ikke finde drev navn til filen:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>Drev navn %x ikke en del af filnavn %y!</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 timer</pluralform>
-<pluralform>%x timer</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 dag</pluralform>
-<pluralform>%x dage</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>Kunne ikke læse værdierne for følgende XML punkter:</target>
-
 <source>Logging</source>
 <target>Logger</target>
 
@@ -477,9 +372,6 @@ Kommando linjen bliver afviklet hver gang:
 <source>Batch execution</source>
 <target>Batch afvikling</target>
 
-<source>Log-messages:</source>
-<target>Log-beskeder:</target>
-
 <source>Stop</source>
 <target>Stop</target>
 
@@ -606,6 +498,24 @@ Kommando linjen bliver afviklet hver gang:
 <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>Items found:</source>
+<target>Enheder fundet:</target>
+
+<source>Items remaining:</source>
+<target>Enheder tilbage:</target>
+
+<source>Speed:</source>
+<target>Hastighed:</target>
+
+<source>Time remaining:</source>
+<target>Tid tilbage:</target>
+
+<source>Time elapsed:</source>
+<target>Tid gået:</target>
+
 <source>Batch job</source>
 <target>Batch job</target>
 
@@ -654,32 +564,14 @@ Kommando linjen bliver afviklet hver gang:
 <source>&Cancel</source>
 <target>&Anuller</target>
 
-<source>Operation:</source>
-<target>Igang:</target>
-
-<source>Items found:</source>
-<target>Enheder fundet:</target>
-
-<source>Items remaining:</source>
-<target>Enheder tilbage:</target>
-
-<source>Speed:</source>
-<target>Hastighed:</target>
-
-<source>Time remaining:</source>
-<target>Tid tilbage:</target>
-
-<source>Time elapsed:</source>
-<target>Tid gået:</target>
-
 <source>Select variant:</source>
 <target>Vælg variant:</target>
 
 <source><Automatic></source>
 <target><Automatisk></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Indentifiser og udbred ændringer på begge sider via. database. Sletninger og konflikter opdages automatisk.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>find ændringer på begge sider via. database. Sletninger, omdøbninger og konflikter bliver automatisk fundet.</target>
 
 <source>Mirror ->></source>
 <target>Spejl ->></target>
@@ -901,27 +793,19 @@ Udeluk: \ting\temp\*
 <target>Transaktionel fil kopiering</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></target>
+<target>Skriv til en midlertidig fil (*.ffs_tmp) først så omdøb den. Dette garanterer sikkerheden selv ved en kritisk fejl.</target>
 
 <source>Copy locked files</source>
 <target>Kopier låste filer</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Kopier delte eller låste filer ved hjælp af Drev Kopi Servicen (Kræver Administrator rettigheder)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Kopier delte eller låste filer ved hjælp af Drev Kopi Servicen (Kræver Administrator rettigheder)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopier fil adgangs tilladelser</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Overfør fil og biblioteks tilladelser (Kræver Administrator rettigheder)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Overfør fil og biblioteks tilladelser (Kræver Administrator rettigheder)</target>
 
 <source>Hidden dialogs:</source>
 <target>Skjulte dialoger:</target>
@@ -953,6 +837,9 @@ Overfør fil og biblioteks tilladelser (Kræver Administrator rettigheder)
 <source>&Find next</source>
 <target>&Find næste</target>
 
+<source>Operation aborted!</source>
+<target>Operation afbrudt!</target>
+
 <source>Main bar</source>
 <target>Hoved værktøjslinjen</target>
 
@@ -993,16 +880,16 @@ Overfør fil og biblioteks tilladelser (Kræver Administrator rettigheder)
 <target>Auto-juster kolonner</target>
 
 <source>Icon size:</source>
-<target></target>
+<target>Ikon størrelse:</target>
 
 <source>Small</source>
-<target></target>
+<target>Lille</target>
 
 <source>Medium</source>
-<target></target>
+<target>Mellem</target>
 
 <source>Large</source>
-<target></target>
+<target>Stor</target>
 
 <source>Include all rows</source>
 <target>Inkluder alle rækker</target>
@@ -1130,6 +1017,9 @@ Overfør fil og biblioteks tilladelser (Kræver Administrator rettigheder)
 <source>File list exported!</source>
 <target>Fil listen er eksporteret!</target>
 
+<source>Error writing file:</source>
+<target>Fejl i at skrive fil:</target>
+
 <source>Batch file created successfully!</source>
 <target>Batch fil oprettet!</target>
 
@@ -1229,9 +1119,6 @@ Overfør fil og biblioteks tilladelser (Kræver Administrator rettigheder)
 <source>Filter: Single pair</source>
 <target>Filter: Par</target>
 
-<source>Ignore</source>
-<target>Ignorer</target>
-
 <source>Direct</source>
 <target>Direkte</target>
 
@@ -1295,6 +1182,105 @@ Overfør fil og biblioteks tilladelser (Kræver Administrator rettigheder)
 <source>Move files into a time-stamped subdirectory</source>
 <target>Flyt filer til et datomærket underbibliotek</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 timer</pluralform>
+<pluralform>%x timer</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 dag</pluralform>
+<pluralform>%x dage</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Kunne ikke initialiserer biblioteks overvågningen:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Fejl i overvågning af biblioteker.</target>
+
+<source>Conversion error:</source>
+<target>Konverterings fejl:</target>
+
+<source>Error deleting file:</source>
+<target>Fejl i sletning af fil:</target>
+
+<source>Error moving file:</source>
+<target>Fejl i flytning af fil:</target>
+
+<source>Target file already existing!</source>
+<target>Filen findes i forvejen!</target>
+
+<source>Error moving directory:</source>
+<target>Fejl i flytning af bibliotek:</target>
+
+<source>Target directory already existing!</source>
+<target>Bibliotek findes i forvejen!</target>
+
+<source>Error deleting directory:</source>
+<target>Fejl i sletning af bibliotek:</target>
+
+<source>Error changing modification time:</source>
+<target>Fejl i ændring af modificerings tiden:</target>
+
+<source>Error loading library function:</source>
+<target>Fejl i biblioteks funktionen:</target>
+
+<source>Error reading security context:</source>
+<target>Fejl i læsning af sikkerhedstilladelser:</target>
+
+<source>Error writing security context:</source>
+<target>Fejl i skrivning af sikkerhedstilladelser:</target>
+
+<source>Error copying file permissions:</source>
+<target>Fejl i kopiering af filtilladelser:</target>
+
+<source>Error creating directory:</source>
+<target>Fejl i oprettelse af bibliotek:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Fejl i kopiering af link:</target>
+
+<source>Error copying file:</source>
+<target>Fejl i kopiering af fil:</target>
+
+<source>Error opening file:</source>
+<target>Fejl i åbning af fil:</target>
+
+<source>Error traversing directory:</source>
+<target>Fejl i gennemgang af bibliotek:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Uendelig løkke ved gennemgang af bibliotek:</target>
+
+<source>Error setting privilege:</source>
+<target>Fejl i at sætte privilegier:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>Begge sider er ændret siden sidste synkronisering!</target>
 
@@ -1325,9 +1311,6 @@ Overfør fil og biblioteks tilladelser (Kræver Administrator rettigheder)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Biblioteker er afhængige! Vær forsigtig når du laver synkroniserings reglerne:</target>
 
-<source>Comparing content of files %x</source>
-<target>Sammenligner indhold af filer %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Hukommelses fejl!</target>
 
@@ -1343,15 +1326,15 @@ Overfør fil og biblioteks tilladelser (Kræver Administrator rettigheder)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Links %x har den samme dato men forskellige destinationerl!</target>
 
+<source>Comparing content of files %x</source>
+<target>Sammenligner indhold af filer %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>Fejl i sammenligning af filernes indhold.</target>
 
 <source>Generating file list...</source>
 <target>Laver fil liste...</target>
 
-<source>Multiple...</source>
-<target>Flere...</target>
-
 <source>Both sides are equal</source>
 <target>Begge sider er ens</target>
 
@@ -1370,6 +1353,12 @@ Overfør fil og biblioteks tilladelser (Kræver Administrator rettigheder)
 <source>Delete right file/folder</source>
 <target>Slet højre fil/mappe</target>
 
+<source>Move file on left</source>
+<target>Flyt filen til venstre</target>
+
+<source>Move file on right</source>
+<target>flyt filen til højre</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Overskriv venstre fil/mappe med højre</target>
 
@@ -1385,6 +1374,9 @@ Overfør fil og biblioteks tilladelser (Kræver Administrator rettigheder)
 <source>Copy file attributes only to right</source>
 <target>Kopiere fil attributter kun til højre</target>
 
+<source>Multiple...</source>
+<target>Flere...</target>
+
 <source>Deleting file %x</source>
 <target>Sletter fil %x</target>
 
diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng
index 17519715..8c9d8a33 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Geautomatiseerde Synchronisatie</target>
 
-<source>Browse</source>
-<target>Verkennen</target>
-
-<source>Windows Error Code %x:</source>
-<target>Windows Fout Code %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux Fout Code %x:</target>
-
-<source>Invalid command line: %x</source>
-<target></target>
-
-<source>Error resolving symbolic link:</source>
-<target>Fout tijdens opzoeken van symbolische koppeling:</target>
-
-<source>Show pop-up</source>
-<target></target>
-
-<source>Show pop-up on errors or warnings</source>
-<target></target>
-
-<source>Ignore errors</source>
-<target>Negeer foutmeldingen</target>
-
-<source>Hide all error and warning messages</source>
-<target>Verberg alle fout- en waarschuwingsberichten</target>
-
-<source>Exit instantly</source>
-<target>Sluit meteen af</target>
-
-<source>Abort synchronization immediately</source>
-<target>Stop synchronisatie onmiddelijk</target>
-
 <source>Select alternate comparison settings</source>
 <target></target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target></target>
 
+<source>Show pop-up</source>
+<target></target>
+
+<source>Show pop-up on errors or warnings</source>
+<target></target>
+
+<source>Ignore errors</source>
+<target>Negeer foutmeldingen</target>
+
+<source>Hide all error and warning messages</source>
+<target>Verberg alle fout- en waarschuwingsberichten</target>
+
+<source>Exit instantly</source>
+<target>Sluit meteen af</target>
+
+<source>Abort synchronization immediately</source>
+<target>Stop synchronisatie onmiddelijk</target>
+
+<source>Browse</source>
+<target>Verkennen</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Fout tijdens uitlezen van synchronisatie-database:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Fout tijdens schrijven naar synchronisatie-database:</target>
+
+<source>Invalid command line: %x</source>
+<target></target>
+
+<source>Windows Error Code %x:</source>
+<target>Windows Fout Code %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Linux Fout Code %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Fout tijdens opzoeken van symbolische koppeling:</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -163,17 +169,14 @@
 <source>Comparison Result</source>
 <target>Resultaat vergelijken</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Opmaak van synchronisatie-database komt niet overeen:</target>
-
 <source>Initial synchronization:</source>
 <target>Initiële  synchronisatie:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>Eén van de FreeFileSync database bestanden bestaat nog niet:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Fout tijdens uitlezen van synchronisatie-database:</target>
+<source>Incompatible synchronization database format:</source>
+<target>Opmaak van synchronisatie-database komt niet overeen:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target></target>
@@ -199,12 +202,18 @@
 <pluralform>%x sec</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Drag en drop</target>
+
 <source>Info</source>
 <target>Info</target>
 
 <source>Fatal Error</source>
 <target>Fatale fout</target>
 
+<source>Error reading file:</source>
+<target>Fout tijdens lezen van bestand:</target>
+
 <source>Scanning:</source>
 <target>Doorzoekt:</target>
 
@@ -220,15 +229,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Foutief FreeFileSync configuratiebestand!</target>
 
-<source>File does not exist:</source>
-<target>Bestand bestaat niet:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Fout tijdens verwerking configuratiebestand:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Fout tijdens verplaatsen naar prullenbak:</target>
+
+<source>Could not load a required DLL:</source>
+<target>Kon een benodigde DLL niet laden:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target></target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>Het aanmaken van schaduwkopieën op WOW64 wordt niet ondersteund. Gebruik alstublieft de 64-bit versie van FreeFileSync.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Kon de schijfnaam niet vaststellen van bestand:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Schijfnaam %x maakt geen deel uit van bestandsnaam %y!</target>
+
 <source>/sec</source>
 <target>/sec</target>
 
+<source>File does not exist:</source>
+<target>Bestand bestaat niet:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Kon geen waarden inlezen voor de volgende XML punten:</target>
+
 <source>S&ave configuration...</source>
 <target>Sl&a configuratie op...</target>
 
@@ -321,141 +351,6 @@ De opdrachtregel wordt telkens uitgevoerd indien:
 <source>A directory input field is empty.</source>
 <target>Een tekstveld over de map is leeg.</target>
 
-<source>Drag && drop</source>
-<target>Drag en drop</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>Initaliseren van map-observatie niet mogelijk:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Fout tijdens observeren van mappen.</target>
-
-<source>Conversion error:</source>
-<target>Converteer fout:</target>
-
-<source>Error deleting file:</source>
-<target>Fout tijdens verwijderen van bestand:</target>
-
-<source>Error moving file:</source>
-<target>Fout tijdens verplaatsen van bestand:</target>
-
-<source>Target file already existing!</source>
-<target>Doelbestand bestaat al!</target>
-
-<source>Error moving directory:</source>
-<target>Fout tijdens verplaatsen van map:</target>
-
-<source>Target directory already existing!</source>
-<target>Doelmap bestaat al!</target>
-
-<source>Error deleting directory:</source>
-<target>Fout tijdens het verwijderen van map:</target>
-
-<source>Error changing modification time:</source>
-<target>Fout tijdens aanpassing van de wijzigingstijd:</target>
-
-<source>Error loading library function:</source>
-<target>Fout tijdens laden van bibliotheek functie:</target>
-
-<source>Error reading security context:</source>
-<target>Fout tijdens lezen van beveiligingscontext:</target>
-
-<source>Error writing security context:</source>
-<target>Fout tijdens schrijven van beveiligingscontext:</target>
-
-<source>Error copying file permissions:</source>
-<target>Fout tijdens kopiëren van bestandspermissies:</target>
-
-<source>Error creating directory:</source>
-<target>Fout tijdens het aanmaken van map:</target>
-
-<source>Error copying symbolic link:</source>
-<target>Fout tijdens kopiëren van symbolische koppeling:</target>
-
-<source>Error copying file:</source>
-<target>Fout tijdens kopiëren van bestand:</target>
-
-<source>Error opening file:</source>
-<target>Fout tijdens openen van bestand:</target>
-
-<source>Error writing file:</source>
-<target>Fout tijdens schrijven van bestand:</target>
-
-<source>Error reading file:</source>
-<target>Fout tijdens lezen van bestand:</target>
-
-<source>Operation aborted!</source>
-<target>Bewerking afgebroken!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Oneindige lus bij het doorlopen van map:</target>
-
-<source>Error traversing directory:</source>
-<target>Fout tijdens doorzoeken van map:</target>
-
-<source>Error setting privilege:</source>
-<target>Fout tijdens instellen van privileges:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Fout tijdens verplaatsen naar prullenbak:</target>
-
-<source>Could not load a required DLL:</source>
-<target>Kon een benodigde DLL niet laden:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Fout tijdens schrijven naar synchronisatie-database:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target></target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Het aanmaken van schaduwkopieën op WOW64 wordt niet ondersteund. Gebruik alstublieft de 64-bit versie van FreeFileSync.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>Kon de schijfnaam niet vaststellen van bestand:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>Schijfnaam %x maakt geen deel uit van bestandsnaam %y!</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 uur</pluralform>
-<pluralform>%x uren</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 dag</pluralform>
-<pluralform>%x dagen</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>Kon geen waarden inlezen voor de volgende XML punten:</target>
-
 <source>Logging</source>
 <target>Loggen</target>
 
@@ -474,9 +369,6 @@ De opdrachtregel wordt telkens uitgevoerd indien:
 <source>Batch execution</source>
 <target>Taak uitvoeren</target>
 
-<source>Log-messages:</source>
-<target>Logberichten:</target>
-
 <source>Stop</source>
 <target>Stop</target>
 
@@ -603,6 +495,24 @@ De opdrachtregel wordt telkens uitgevoerd indien:
 <source>Total amount of data that will be transferred</source>
 <target>Totale hoeveelheid data die verplaatst wordt</target>
 
+<source>Operation:</source>
+<target>Bewerking:</target>
+
+<source>Items found:</source>
+<target>Onderdelen gevonden:</target>
+
+<source>Items remaining:</source>
+<target>Onderdelen te gaan:</target>
+
+<source>Speed:</source>
+<target>Snelheid:</target>
+
+<source>Time remaining:</source>
+<target>Benodigde tijd:</target>
+
+<source>Time elapsed:</source>
+<target>Verstreken tijd:</target>
+
 <source>Batch job</source>
 <target>Taaklijst</target>
 
@@ -651,32 +561,14 @@ De opdrachtregel wordt telkens uitgevoerd indien:
 <source>&Cancel</source>
 <target>&Annuleren</target>
 
-<source>Operation:</source>
-<target>Bewerking:</target>
-
-<source>Items found:</source>
-<target>Onderdelen gevonden:</target>
-
-<source>Items remaining:</source>
-<target>Onderdelen te gaan:</target>
-
-<source>Speed:</source>
-<target>Snelheid:</target>
-
-<source>Time remaining:</source>
-<target>Benodigde tijd:</target>
-
-<source>Time elapsed:</source>
-<target>Verstreken tijd:</target>
-
 <source>Select variant:</source>
 <target>Selecteer een variant:</target>
 
 <source><Automatic></source>
 <target><Automatisch></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Identificeer en verwerk veranderingen aan beide zijdes dmv een database. Verwijderingen en conflicten worden automatisch gedetecteerd.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target></target>
 
 <source>Mirror ->></source>
 <target>Spiegelen ->></target>
@@ -898,22 +790,14 @@ Uitsluiten: \stuff\temp\*
 <source>Copy locked files</source>
 <target>Kopieer vergrendelde bestanden</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Kopieer gedeelde of vergrendelde bestanden met Volume Shadow Copy Service (Vereist Administrator rechten)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Kopieer gedeelde of vergrendelde bestanden met Volume Shadow Copy Service (Vereist Administrator rechten)</target>
 
 <source>Copy file access permissions</source>
 <target></target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Zet bestand en map permissies over (Vereist Administrator rechten)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Zet bestand en map permissies over (Vereist Administrator rechten)</target>
 
 <source>Hidden dialogs:</source>
 <target>Verborgen dialogen:</target>
@@ -945,6 +829,9 @@ Zet bestand en map permissies over (Vereist Administrator rechten)
 <source>&Find next</source>
 <target>&Vind volgende</target>
 
+<source>Operation aborted!</source>
+<target>Bewerking afgebroken!</target>
+
 <source>Main bar</source>
 <target>Hoofdbalk</target>
 
@@ -1122,6 +1009,9 @@ Zet bestand en map permissies over (Vereist Administrator rechten)
 <source>File list exported!</source>
 <target>Bestandslijst geëxporteerd!</target>
 
+<source>Error writing file:</source>
+<target>Fout tijdens schrijven van bestand:</target>
+
 <source>Batch file created successfully!</source>
 <target>Taakbestand is succesvol aangemaakt!</target>
 
@@ -1221,9 +1111,6 @@ Zet bestand en map permissies over (Vereist Administrator rechten)
 <source>Filter: Single pair</source>
 <target>Filter: Enkel paar</target>
 
-<source>Ignore</source>
-<target>Negeer</target>
-
 <source>Direct</source>
 <target>Direct</target>
 
@@ -1287,6 +1174,105 @@ Zet bestand en map permissies over (Vereist Administrator rechten)
 <source>Move files into a time-stamped subdirectory</source>
 <target>Verplaats de bestanden naar een tijd-gemarkeerde submap</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 uur</pluralform>
+<pluralform>%x uren</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 dag</pluralform>
+<pluralform>%x dagen</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Initaliseren van map-observatie niet mogelijk:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Fout tijdens observeren van mappen.</target>
+
+<source>Conversion error:</source>
+<target>Converteer fout:</target>
+
+<source>Error deleting file:</source>
+<target>Fout tijdens verwijderen van bestand:</target>
+
+<source>Error moving file:</source>
+<target>Fout tijdens verplaatsen van bestand:</target>
+
+<source>Target file already existing!</source>
+<target>Doelbestand bestaat al!</target>
+
+<source>Error moving directory:</source>
+<target>Fout tijdens verplaatsen van map:</target>
+
+<source>Target directory already existing!</source>
+<target>Doelmap bestaat al!</target>
+
+<source>Error deleting directory:</source>
+<target>Fout tijdens het verwijderen van map:</target>
+
+<source>Error changing modification time:</source>
+<target>Fout tijdens aanpassing van de wijzigingstijd:</target>
+
+<source>Error loading library function:</source>
+<target>Fout tijdens laden van bibliotheek functie:</target>
+
+<source>Error reading security context:</source>
+<target>Fout tijdens lezen van beveiligingscontext:</target>
+
+<source>Error writing security context:</source>
+<target>Fout tijdens schrijven van beveiligingscontext:</target>
+
+<source>Error copying file permissions:</source>
+<target>Fout tijdens kopiëren van bestandspermissies:</target>
+
+<source>Error creating directory:</source>
+<target>Fout tijdens het aanmaken van map:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Fout tijdens kopiëren van symbolische koppeling:</target>
+
+<source>Error copying file:</source>
+<target>Fout tijdens kopiëren van bestand:</target>
+
+<source>Error opening file:</source>
+<target>Fout tijdens openen van bestand:</target>
+
+<source>Error traversing directory:</source>
+<target>Fout tijdens doorzoeken van map:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Oneindige lus bij het doorlopen van map:</target>
+
+<source>Error setting privilege:</source>
+<target>Fout tijdens instellen van privileges:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>Beide zijdes zijn veranderd sinds de laatste synchronisatie!</target>
 
@@ -1317,9 +1303,6 @@ Zet bestand en map permissies over (Vereist Administrator rechten)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Mappen zijn afhankelijk van elkaar! Wees voorzichtig met het maken van synchronisatieregels:</target>
 
-<source>Comparing content of files %x</source>
-<target>De inhoud van %x bestanden wordt vergeleken</target>
-
 <source>Memory allocation failed!</source>
 <target>RAM geheugen error!</target>
 
@@ -1335,15 +1318,15 @@ Zet bestand en map permissies over (Vereist Administrator rechten)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Symbolische koppeling %x heeft dezelfde datum maar een ander doel!</target>
 
+<source>Comparing content of files %x</source>
+<target>De inhoud van %x bestanden wordt vergeleken</target>
+
 <source>Comparing files by content failed.</source>
 <target>Bestand-inhoudvergelijking mislukt.</target>
 
 <source>Generating file list...</source>
 <target>Genereren van bestandslijst...</target>
 
-<source>Multiple...</source>
-<target>Meerdere...</target>
-
 <source>Both sides are equal</source>
 <target>Beide kanten zijn gelijk</target>
 
@@ -1362,6 +1345,12 @@ Zet bestand en map permissies over (Vereist Administrator rechten)
 <source>Delete right file/folder</source>
 <target>Verwijder rechter bestand/map</target>
 
+<source>Move file on left</source>
+<target></target>
+
+<source>Move file on right</source>
+<target></target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Overschrijf linker bestand/map met de rechter</target>
 
@@ -1377,6 +1366,9 @@ Zet bestand en map permissies over (Vereist Administrator rechten)
 <source>Copy file attributes only to right</source>
 <target>Kopieer bestandsattributen allen naar rechts</target>
 
+<source>Multiple...</source>
+<target>Meerdere...</target>
+
 <source>Deleting file %x</source>
 <target>Verwijderen van bestand %x</target>
 
diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index a562a229..bea82597 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automated Synchronisation</target>
 
-<source>Browse</source>
-<target>Browse</target>
-
-<source>Windows Error Code %x:</source>
-<target>Windows Error Code %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux Error Code %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>Invalid command line: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>Error resolving symbolic link:</target>
-
-<source>Show pop-up</source>
-<target>Show pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Show pop-up on errors or warnings</target>
-
-<source>Ignore errors</source>
-<target>Ignore errors</target>
-
-<source>Hide all error and warning messages</source>
-<target>Hide all error and warning messages</target>
-
-<source>Exit instantly</source>
-<target>Exit instantly</target>
-
-<source>Abort synchronization immediately</source>
-<target>Abort synchronisation immediately</target>
-
 <source>Select alternate comparison settings</source>
 <target>Select alternate comparison settings</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>Select time span</target>
 
+<source>Show pop-up</source>
+<target>Show pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Show pop-up on errors or warnings</target>
+
+<source>Ignore errors</source>
+<target>Ignore errors</target>
+
+<source>Hide all error and warning messages</source>
+<target>Hide all error and warning messages</target>
+
+<source>Exit instantly</source>
+<target>Exit instantly</target>
+
+<source>Abort synchronization immediately</source>
+<target>Abort synchronisation immediately</target>
+
+<source>Browse</source>
+<target>Browse</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Error reading from synchronisation database:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Error writing to synchronisation database:</target>
+
+<source>Invalid command line: %x</source>
+<target>Invalid command line: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Windows Error Code %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Linux Error Code %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Error resolving symbolic link:</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -163,17 +169,14 @@
 <source>Comparison Result</source>
 <target>Comparison Result</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Incompatible synchronisation database format:</target>
-
 <source>Initial synchronization:</source>
 <target>Initial synchronisation:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>One of the FreeFileSync database files is not yet existing:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Error reading from synchronisation database:</target>
+<source>Incompatible synchronization database format:</source>
+<target>Incompatible synchronisation database format:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>Database files do not share a common synchronisation session:</target>
@@ -199,12 +202,18 @@
 <pluralform>%x sec</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Drag && drop</target>
+
 <source>Info</source>
 <target>Info</target>
 
 <source>Fatal Error</source>
 <target>Fatal Error</target>
 
+<source>Error reading file:</source>
+<target>Error reading file:</target>
+
 <source>Scanning:</source>
 <target>Scanning:</target>
 
@@ -223,15 +232,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Invalid FreeFileSync config file!</target>
 
-<source>File does not exist:</source>
-<target>File does not exist:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Error parsing configuration file:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Error moving to Recycle Bin:</target>
+
+<source>Could not load a required DLL:</source>
+<target>Could not load a required DLL:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>Error accessing Volume Shadow Copy Service!</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Could not determine volume name for file:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Volume name %x not part of filename %y!</target>
+
 <source>/sec</source>
 <target>/sec</target>
 
+<source>File does not exist:</source>
+<target>File does not exist:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Could not read values for the following XML nodes:</target>
+
 <source>S&ave configuration...</source>
 <target>S&ave configuration...</target>
 
@@ -324,141 +354,6 @@ The command line is executed each time:
 <source>A directory input field is empty.</source>
 <target>A directory input field is empty.</target>
 
-<source>Drag && drop</source>
-<target>Drag && drop</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>Could not initialise directory monitoring:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Error when monitoring directories.</target>
-
-<source>Conversion error:</source>
-<target>Conversion error:</target>
-
-<source>Error deleting file:</source>
-<target>Error deleting file:</target>
-
-<source>Error moving file:</source>
-<target>Error moving file:</target>
-
-<source>Target file already existing!</source>
-<target>Target file already existing!</target>
-
-<source>Error moving directory:</source>
-<target>Error moving directory:</target>
-
-<source>Target directory already existing!</source>
-<target>Target directory already existing!</target>
-
-<source>Error deleting directory:</source>
-<target>Error deleting directory:</target>
-
-<source>Error changing modification time:</source>
-<target>Error changing modification time:</target>
-
-<source>Error loading library function:</source>
-<target>Error loading library function:</target>
-
-<source>Error reading security context:</source>
-<target>Error reading security context:</target>
-
-<source>Error writing security context:</source>
-<target>Error writing security context:</target>
-
-<source>Error copying file permissions:</source>
-<target>Error copying file permissions:</target>
-
-<source>Error creating directory:</source>
-<target>Error creating directory:</target>
-
-<source>Error copying symbolic link:</source>
-<target>Error copying symbolic link:</target>
-
-<source>Error copying file:</source>
-<target>Error copying file:</target>
-
-<source>Error opening file:</source>
-<target>Error opening file:</target>
-
-<source>Error writing file:</source>
-<target>Error writing file:</target>
-
-<source>Error reading file:</source>
-<target>Error reading file:</target>
-
-<source>Operation aborted!</source>
-<target>Operation aborted!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Endless loop when traversing directory:</target>
-
-<source>Error traversing directory:</source>
-<target>Error traversing directory:</target>
-
-<source>Error setting privilege:</source>
-<target>Error setting privilege:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Error moving to Recycle Bin:</target>
-
-<source>Could not load a required DLL:</source>
-<target>Could not load a required DLL:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Error writing to synchronisation database:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Error accessing Volume Shadow Copy Service!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>Could not determine volume name for file:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>Volume name %x not part of filename %y!</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>Could not read values for the following XML nodes:</target>
-
 <source>Logging</source>
 <target>Logging</target>
 
@@ -477,9 +372,6 @@ The command line is executed each time:
 <source>Batch execution</source>
 <target>Batch execution</target>
 
-<source>Log-messages:</source>
-<target>Log-messages:</target>
-
 <source>Stop</source>
 <target>Stop</target>
 
@@ -606,6 +498,24 @@ The command line is executed each time:
 <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>Items found:</source>
+<target>Elements found:</target>
+
+<source>Items remaining:</source>
+<target>Elements remaining:</target>
+
+<source>Speed:</source>
+<target>Speed:</target>
+
+<source>Time remaining:</source>
+<target>Time remaining:</target>
+
+<source>Time elapsed:</source>
+<target>Time elapsed:</target>
+
 <source>Batch job</source>
 <target>Batch job</target>
 
@@ -654,32 +564,14 @@ The command line is executed each time:
 <source>&Cancel</source>
 <target>&Cancel</target>
 
-<source>Operation:</source>
-<target>Operation:</target>
-
-<source>Items found:</source>
-<target>Elements found:</target>
-
-<source>Items remaining:</source>
-<target>Elements remaining:</target>
-
-<source>Speed:</source>
-<target>Speed:</target>
-
-<source>Time remaining:</source>
-<target>Time remaining:</target>
-
-<source>Time elapsed:</source>
-<target>Time elapsed:</target>
-
 <source>Select variant:</source>
 <target>Select variant:</target>
 
 <source><Automatic></source>
 <target><Automatic></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</target>
 
 <source>Mirror ->></source>
 <target>Mirror ->></target>
@@ -901,27 +793,19 @@ Exclude: \stuff\temp\*
 <target>Transactional file copy</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></target>
+<target>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</target>
 
 <source>Copy locked files</source>
 <target>Copy locked files</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</target>
 
 <source>Copy file access permissions</source>
 <target>Copy file access permissions</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Transfer file and directory permissions (Requires Administrator rights)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Transfer file and directory permissions (Requires Administrator rights)</target>
 
 <source>Hidden dialogs:</source>
 <target>Hidden dialogues:</target>
@@ -953,6 +837,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>&Find next</source>
 <target>&Find next</target>
 
+<source>Operation aborted!</source>
+<target>Operation aborted!</target>
+
 <source>Main bar</source>
 <target>Main bar</target>
 
@@ -993,16 +880,16 @@ Transfer file and directory permissions (Requires Administrator rights)
 <target>Auto-adjust columns</target>
 
 <source>Icon size:</source>
-<target></target>
+<target>Icon size:</target>
 
 <source>Small</source>
-<target></target>
+<target>Small</target>
 
 <source>Medium</source>
-<target></target>
+<target>Medium</target>
 
 <source>Large</source>
-<target></target>
+<target>Large</target>
 
 <source>Include all rows</source>
 <target>Include all rows</target>
@@ -1130,6 +1017,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>File list exported!</source>
 <target>File list exported!</target>
 
+<source>Error writing file:</source>
+<target>Error writing file:</target>
+
 <source>Batch file created successfully!</source>
 <target>Batch file created successfully!</target>
 
@@ -1229,9 +1119,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Filter: Single pair</source>
 <target>Filter: Single pair</target>
 
-<source>Ignore</source>
-<target>Ignore</target>
-
 <source>Direct</source>
 <target>Direct</target>
 
@@ -1295,6 +1182,105 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Move files into a time-stamped subdirectory</source>
 <target>Move files into a time-stamped subdirectory</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Could not initialise directory monitoring:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Error when monitoring directories.</target>
+
+<source>Conversion error:</source>
+<target>Conversion error:</target>
+
+<source>Error deleting file:</source>
+<target>Error deleting file:</target>
+
+<source>Error moving file:</source>
+<target>Error moving file:</target>
+
+<source>Target file already existing!</source>
+<target>Target file already existing!</target>
+
+<source>Error moving directory:</source>
+<target>Error moving directory:</target>
+
+<source>Target directory already existing!</source>
+<target>Target directory already existing!</target>
+
+<source>Error deleting directory:</source>
+<target>Error deleting directory:</target>
+
+<source>Error changing modification time:</source>
+<target>Error changing modification time:</target>
+
+<source>Error loading library function:</source>
+<target>Error loading library function:</target>
+
+<source>Error reading security context:</source>
+<target>Error reading security context:</target>
+
+<source>Error writing security context:</source>
+<target>Error writing security context:</target>
+
+<source>Error copying file permissions:</source>
+<target>Error copying file permissions:</target>
+
+<source>Error creating directory:</source>
+<target>Error creating directory:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Error copying symbolic link:</target>
+
+<source>Error copying file:</source>
+<target>Error copying file:</target>
+
+<source>Error opening file:</source>
+<target>Error opening file:</target>
+
+<source>Error traversing directory:</source>
+<target>Error traversing directory:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Endless loop when traversing directory:</target>
+
+<source>Error setting privilege:</source>
+<target>Error setting privilege:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>Both sides have changed since last synchronisation!</target>
 
@@ -1325,9 +1311,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Directories are dependent! Be careful when setting up synchronisation rules:</target>
 
-<source>Comparing content of files %x</source>
-<target>Comparing content of files %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Memory allocation failed!</target>
 
@@ -1343,15 +1326,15 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Symlinks %x have the same date but a different target!</target>
 
+<source>Comparing content of files %x</source>
+<target>Comparing content of files %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>Comparing files by content failed.</target>
 
 <source>Generating file list...</source>
 <target>Generating file list...</target>
 
-<source>Multiple...</source>
-<target>Multiple...</target>
-
 <source>Both sides are equal</source>
 <target>Both sides are equal</target>
 
@@ -1370,6 +1353,12 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Delete right file/folder</source>
 <target>Delete right file/folder</target>
 
+<source>Move file on left</source>
+<target>Move file on left</target>
+
+<source>Move file on right</source>
+<target>Move file on right</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Overwrite left file/folder with right one</target>
 
@@ -1385,6 +1374,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Copy file attributes only to right</source>
 <target>Copy file attributes only to right</target>
 
+<source>Multiple...</source>
+<target>Multiple...</target>
+
 <source>Deleting file %x</source>
 <target>Deleting file %x</target>
 
diff --git a/BUILD/Languages/finnish.lng b/BUILD/Languages/finnish.lng
index 8b2012f6..942fbc33 100644
--- a/BUILD/Languages/finnish.lng
+++ b/BUILD/Languages/finnish.lng
@@ -169,15 +169,15 @@
 <source>Comparison Result</source>
 <target>Vertailun tulos</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Täsmäytyksen tietokannan muoto on virheellinen:</target>
-
 <source>Initial synchronization:</source>
 <target>Ensi täsmäytys:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>Jokin FreeFileSynk tietokannan tiedostoista puuttuu vielä:</target>
 
+<source>Incompatible synchronization database format:</source>
+<target>Täsmäytyksen tietokannan muoto on virheellinen:</target>
+
 <source>Database files do not share a common synchronization session:</source>
 <target>Kannan tiedostot ovat eri sessioista:</target>
 
@@ -232,9 +232,6 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Virheellinen FreeFileSync asetustiedosto!</target>
 
-<source>File does not exist:</source>
-<target>Tiedosto puuttuu:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Virhe jäsentäessä asetustiedostoa:</target>
 
@@ -259,6 +256,9 @@
 <source>/sec</source>
 <target>/s</target>
 
+<source>File does not exist:</source>
+<target>Tiedosto puuttuu:</target>
+
 <source>Could not read values for the following XML nodes:</source>
 <target>Tietoja lukeminen epäonnistui, XML jäsen:</target>
 
@@ -372,9 +372,6 @@ Komento suoritetaan kun:
 <source>Batch execution</source>
 <target>Eräajon suoritus</target>
 
-<source>Log-messages:</source>
-<target>Lokin viestit:</target>
-
 <source>Stop</source>
 <target>Seis</target>
 
@@ -501,6 +498,24 @@ Komento suoritetaan kun:
 <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>Items found:</source>
+<target>Osia löytyi:</target>
+
+<source>Items remaining:</source>
+<target>Osia jäljellä:</target>
+
+<source>Speed:</source>
+<target>Nopeus:</target>
+
+<source>Time remaining:</source>
+<target>Aikaa jäljellä:</target>
+
+<source>Time elapsed:</source>
+<target>Kulunut aika:</target>
+
 <source>Batch job</source>
 <target>Eräajo</target>
 
@@ -549,32 +564,14 @@ Komento suoritetaan kun:
 <source>&Cancel</source>
 <target>&Lopeta</target>
 
-<source>Operation:</source>
-<target>Toiminto:</target>
-
-<source>Items found:</source>
-<target>Osia löytyi:</target>
-
-<source>Items remaining:</source>
-<target>Osia jäljellä:</target>
-
-<source>Speed:</source>
-<target>Nopeus:</target>
-
-<source>Time remaining:</source>
-<target>Aikaa jäljellä:</target>
-
-<source>Time elapsed:</source>
-<target>Kulunut aika:</target>
-
 <source>Select variant:</source>
 <target>Valitse vaihtoehto:</target>
 
 <source><Automatic></source>
 <target><- Automaattinen -></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Tunnista ja monista muutokset molemmilla puolilla tietokannalla. Poistot ja ristiriidat hoidetaan automaattisesti.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target></target>
 
 <source>Mirror ->></source>
 <target>Peilaava ->></target>
@@ -801,22 +798,14 @@ Sulje pois: \stuff\temp\*
 <source>Copy locked files</source>
 <target>Kopioi lukitut tiedostot</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Kopioi jaetut/lukitut tiedostot Volume Shadow Copy prosessilla (Vaatii Järjestelmävalvojan oikeuksia)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Kopioi jaetut/lukitut tiedostot Volume Shadow Copy prosessilla (Vaatii Järjestelmävalvojan oikeuksia)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopioi tiedoston käyttöoikeuksia</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Siirrä tiedosto- ja hakemisto-oikeuksia (Vaatii Järjestelmävalvojan oikeuksia)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Siirrä tiedosto- ja hakemisto-oikeuksia (Vaatii Järjestelmävalvojan oikeuksia)</target>
 
 <source>Hidden dialogs:</source>
 <target>Piilotetut ikkunat:</target>
@@ -1130,9 +1119,6 @@ Siirrä tiedosto- ja hakemisto-oikeuksia (Vaatii Järjestelmävalvojan oikeuksia
 <source>Filter: Single pair</source>
 <target>Suodata: Yksi pari</target>
 
-<source>Ignore</source>
-<target>Sivuta</target>
-
 <source>Direct</source>
 <target>Suoraan</target>
 
@@ -1286,12 +1272,12 @@ Siirrä tiedosto- ja hakemisto-oikeuksia (Vaatii Järjestelmävalvojan oikeuksia
 <source>Error opening file:</source>
 <target>Virhe avatessa tiedostoa:</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Suorita hakemiston läpikulku jatkuvana:</target>
-
 <source>Error traversing directory:</source>
 <target>Virhe hakemistoa läpikäydessä:</target>
 
+<source>Endless loop when traversing directory:</source>
+<target>Suorita hakemiston läpikulku jatkuvana:</target>
+
 <source>Error setting privilege:</source>
 <target>Virhe, asettaessa oikeuksia:</target>
 
@@ -1325,9 +1311,6 @@ Siirrä tiedosto- ja hakemisto-oikeuksia (Vaatii Järjestelmävalvojan oikeuksia
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Hakemistot riippuvuussuhteessa! Aseta täsmäyssääntöjä varovasti:</target>
 
-<source>Comparing content of files %x</source>
-<target>Vertaa tiedostojen %x tietosisältöä</target>
-
 <source>Memory allocation failed!</source>
 <target>Muistin varaus epäonnistui!</target>
 
@@ -1343,15 +1326,15 @@ Siirrä tiedosto- ja hakemisto-oikeuksia (Vaatii Järjestelmävalvojan oikeuksia
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Pikakuvakkeilla %x on sama päiväys mutta kohde on toinen!</target>
 
+<source>Comparing content of files %x</source>
+<target>Vertaa tiedostojen %x tietosisältöä</target>
+
 <source>Comparing files by content failed.</source>
 <target>Tietosisällön vertailu epäonnistui.</target>
 
 <source>Generating file list...</source>
 <target>Luodaan tiedostolista...</target>
 
-<source>Multiple...</source>
-<target>Moninkertainen...</target>
-
 <source>Both sides are equal</source>
 <target>Puolet ovat denttiset</target>
 
@@ -1370,6 +1353,12 @@ Siirrä tiedosto- ja hakemisto-oikeuksia (Vaatii Järjestelmävalvojan oikeuksia
 <source>Delete right file/folder</source>
 <target>Poista tiedosto/hakemisto oikealta</target>
 
+<source>Move file on left</source>
+<target></target>
+
+<source>Move file on right</source>
+<target></target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Ylikirjoita oikea tiedosto/hakemista vasemanpuolisella</target>
 
@@ -1385,6 +1374,9 @@ Siirrä tiedosto- ja hakemisto-oikeuksia (Vaatii Järjestelmävalvojan oikeuksia
 <source>Copy file attributes only to right</source>
 <target>Monista tiedosto-ominaisuudet oikealle</target>
 
+<source>Multiple...</source>
+<target>Moninkertainen...</target>
+
 <source>Deleting file %x</source>
 <target>Poista tiedosto %x</target>
 
diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng
index 0fc97f8c..c81fa341 100644
--- a/BUILD/Languages/french.lng
+++ b/BUILD/Languages/french.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Synchronisation Automatisée</target>
 
-<source>Browse</source>
-<target>Parcourir</target>
-
-<source>Windows Error Code %x:</source>
-<target>Code erreur Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Code erreur Linux %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>Ligne de commande incorrecte : %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>Erreur lors de la résolution du lien symbolique :</target>
-
-<source>Show pop-up</source>
-<target>Montrer les boîtes de dialogue</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Montrer les messages d'avertissement ou d'erreur</target>
-
-<source>Ignore errors</source>
-<target>Ignorer les erreurs</target>
-
-<source>Hide all error and warning messages</source>
-<target>Masquer tous les messages d'erreurs et les avertissements</target>
-
-<source>Exit instantly</source>
-<target>Sortie immédiate</target>
-
-<source>Abort synchronization immediately</source>
-<target>Abandon immédiat de la synchronisation</target>
-
 <source>Select alternate comparison settings</source>
 <target>Choisir d'autres paramètres de comparaison</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>choisir un intervalle de temps</target>
 
+<source>Show pop-up</source>
+<target>Montrer les boîtes de dialogue</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Montrer les messages d'avertissement ou d'erreur</target>
+
+<source>Ignore errors</source>
+<target>Ignorer les erreurs</target>
+
+<source>Hide all error and warning messages</source>
+<target>Masquer tous les messages d'erreurs et les avertissements</target>
+
+<source>Exit instantly</source>
+<target>Sortie immédiate</target>
+
+<source>Abort synchronization immediately</source>
+<target>Abandon immédiat de la synchronisation</target>
+
+<source>Browse</source>
+<target>Parcourir</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Erreur lors de la lecture de la base de données de synchro :</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Erreur lors de l'écriture de la base de données de synchro :</target>
+
+<source>Invalid command line: %x</source>
+<target>Ligne de commande incorrecte : %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Code erreur Windows %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Code erreur Linux %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Erreur lors de la résolution du lien symbolique :</target>
+
 <source>%x MB</source>
 <target>%x Mo</target>
 
@@ -163,17 +169,14 @@
 <source>Comparison Result</source>
 <target>Résultat de la comparaison</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Format de la base de données de synchro incompatible :</target>
-
 <source>Initial synchronization:</source>
 <target>Première synchronisation :</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>L'un des fichiers de la base de données FreeFileSync n'existe plus :</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Erreur lors de la lecture de la base de données de synchro :</target>
+<source>Incompatible synchronization database format:</source>
+<target>Format de la base de données de synchro incompatible :</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>Les fichiers de la base de données ne font pas partie de la même session de synchronisation</target>
@@ -199,12 +202,18 @@
 <pluralform>%x sec</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Glisser && Déposer</target>
+
 <source>Info</source>
 <target>Info</target>
 
 <source>Fatal Error</source>
 <target>Erreur Fatale</target>
 
+<source>Error reading file:</source>
+<target>Erreur lors de la lecture du fichier :</target>
+
 <source>Scanning:</source>
 <target>Lecture en cours :</target>
 
@@ -223,15 +232,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Fichier de configuration FreeFileSync invalide !</target>
 
-<source>File does not exist:</source>
-<target>Le fichier n'existe pas :</target>
-
 <source>Error parsing configuration file:</source>
 <target>Erreur lors de l'analyse du fichier de configuration :</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Erreur lors du déplacement dans la Corbeille :</target>
+
+<source>Could not load a required DLL:</source>
+<target>Impossible de charger une DLL :</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>Erreur lors de l'accès au Volume Shadow Copy Service !</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>La copie en tâche de fond sur WOW64 n'est pas possible. Utilisez pour cela la version 64 bits de FreeFileSync.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Impossible de trouver le nom de volume pour le fichier :</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Le nom de volume %x ne fait pas partie du nom de fichier %y !</target>
+
 <source>/sec</source>
 <target>/sec</target>
 
+<source>File does not exist:</source>
+<target>Le fichier n'existe pas :</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Impossible de lire les valeurs des noeuds XML suivants :</target>
+
 <source>S&ave configuration...</source>
 <target>S&auvegarder la configuration...</target>
 
@@ -324,141 +354,6 @@ La ligne de commande est exécutée chaque fois que :
 <source>A directory input field is empty.</source>
 <target>Un champ répertoire est vide</target>
 
-<source>Drag && drop</source>
-<target>Glisser && Déposer</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>Impossible d'initialiser la surveillance des dossiers :</target>
-
-<source>Error when monitoring directories.</source>
-<target>Erreur lors de la surveillance des répertoires.</target>
-
-<source>Conversion error:</source>
-<target>Erreur de conversion :</target>
-
-<source>Error deleting file:</source>
-<target>Erreur lors de la suppression d'un fichier :</target>
-
-<source>Error moving file:</source>
-<target>Erreur lors du déplacement du fichier :</target>
-
-<source>Target file already existing!</source>
-<target>Le fichier de destination existe déjà !</target>
-
-<source>Error moving directory:</source>
-<target>Erreur lors du déplacement du répertoire :</target>
-
-<source>Target directory already existing!</source>
-<target>Le répertoire de destination existe déjà !</target>
-
-<source>Error deleting directory:</source>
-<target>Erreur lors de la suppression d'un répertoire :</target>
-
-<source>Error changing modification time:</source>
-<target>Erreur lors du changement de la date de modification :</target>
-
-<source>Error loading library function:</source>
-<target>Erreur lors du chargement de la bibliothèque de fonctions :</target>
-
-<source>Error reading security context:</source>
-<target>Erreur de lecture du contexte de sécurité:</target>
-
-<source>Error writing security context:</source>
-<target>Erreur d'écriture du contexte de sécurité:</target>
-
-<source>Error copying file permissions:</source>
-<target>Erreur lors de la copie des attributs système</target>
-
-<source>Error creating directory:</source>
-<target>Erreur lors de la création d'un répertoire :</target>
-
-<source>Error copying symbolic link:</source>
-<target>Erreur lors de la copie du lien symbolique :</target>
-
-<source>Error copying file:</source>
-<target>Erreur lors de la copie du fichier :</target>
-
-<source>Error opening file:</source>
-<target>Erreur lors de l'ouverture du fichier :</target>
-
-<source>Error writing file:</source>
-<target>Erreur lors de l'écriture du fichier :</target>
-
-<source>Error reading file:</source>
-<target>Erreur lors de la lecture du fichier :</target>
-
-<source>Operation aborted!</source>
-<target>Opération abandonnée !</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Boucle sans fin lors du parcours du répertoire :</target>
-
-<source>Error traversing directory:</source>
-<target>Erreur lors du parcours du répertoire :</target>
-
-<source>Error setting privilege:</source>
-<target>Erreur de paramétrage de privilège</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Erreur lors du déplacement dans la Corbeille :</target>
-
-<source>Could not load a required DLL:</source>
-<target>Impossible de charger une DLL :</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Erreur lors de l'écriture de la base de données de synchro :</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Erreur lors de l'accès au Volume Shadow Copy Service !</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>La copie en tâche de fond sur WOW64 n'est pas possible. Utilisez pour cela la version 64 bits de FreeFileSync.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>Impossible de trouver le nom de volume pour le fichier :</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>Le nom de volume %x ne fait pas partie du nom de fichier %y !</target>
-
-<source>%x TB</source>
-<target>%x To</target>
-
-<source>%x PB</source>
-<target>%x Po</target>
-
-<source>%x%</source>
-<target>%x %</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x heure</pluralform>
-<pluralform>%x heures</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x jour</pluralform>
-<pluralform>%x jours</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>Impossible de lire les valeurs des noeuds XML suivants :</target>
-
 <source>Logging</source>
 <target>Connexion</target>
 
@@ -477,9 +372,6 @@ La ligne de commande est exécutée chaque fois que :
 <source>Batch execution</source>
 <target>Exécution du traitement batch</target>
 
-<source>Log-messages:</source>
-<target>Messages log :</target>
-
 <source>Stop</source>
 <target>Arrêt</target>
 
@@ -606,6 +498,24 @@ La ligne de commande est exécutée chaque fois que :
 <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>Items found:</source>
+<target>Elements trouvés :</target>
+
+<source>Items remaining:</source>
+<target>Elements restants :</target>
+
+<source>Speed:</source>
+<target>Vitesse :</target>
+
+<source>Time remaining:</source>
+<target>Temps restant :</target>
+
+<source>Time elapsed:</source>
+<target>Temps écoulé :</target>
+
 <source>Batch job</source>
 <target>Fichier de commandes</target>
 
@@ -654,32 +564,14 @@ La ligne de commande est exécutée chaque fois que :
 <source>&Cancel</source>
 <target>&Annuler</target>
 
-<source>Operation:</source>
-<target>Opération :</target>
-
-<source>Items found:</source>
-<target>Elements trouvés :</target>
-
-<source>Items remaining:</source>
-<target>Elements restants :</target>
-
-<source>Speed:</source>
-<target>Vitesse :</target>
-
-<source>Time remaining:</source>
-<target>Temps restant :</target>
-
-<source>Time elapsed:</source>
-<target>Temps écoulé :</target>
-
 <source>Select variant:</source>
 <target>Choisissez une variante :</target>
 
 <source><Automatic></source>
 <target><Automatique></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Identifier et propager les modifications des deux côtés en utilisant une base de données. Les suppressions et les conflits sont détectés automatiquement.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target></target>
 
 <source>Mirror ->></source>
 <target>Miroir ->></target>
@@ -906,22 +798,14 @@ Exclude: \stuff\temp\*
 <source>Copy locked files</source>
 <target>Copier les fichiers verrouillés</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-La copie des fichiers partagés ou verrouillés nécessite le Service Volume Shadow Copy (avec les droits administrateur)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>La copie des fichiers partagés ou verrouillés nécessite le Service Volume Shadow Copy (avec les droits administrateur)</target>
 
 <source>Copy file access permissions</source>
 <target>Copie des droits d'accès aux fichiers</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Transfert des attributs système des fichiers et des répertoires (avec les droits administrateur)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Transfert des attributs système des fichiers et des répertoires (avec les droits administrateur)</target>
 
 <source>Hidden dialogs:</source>
 <target>Boîtes de dialogue masquées :</target>
@@ -953,6 +837,9 @@ Transfert des attributs système des fichiers et des répertoires (avec les droi
 <source>&Find next</source>
 <target>&Chercher le suivant</target>
 
+<source>Operation aborted!</source>
+<target>Opération abandonnée !</target>
+
 <source>Main bar</source>
 <target>Barre principale</target>
 
@@ -1130,6 +1017,9 @@ Transfert des attributs système des fichiers et des répertoires (avec les droi
 <source>File list exported!</source>
 <target>Liste des fichiers exportée !</target>
 
+<source>Error writing file:</source>
+<target>Erreur lors de l'écriture du fichier :</target>
+
 <source>Batch file created successfully!</source>
 <target>Fichier de traitement batch créé avec succès !</target>
 
@@ -1229,9 +1119,6 @@ Transfert des attributs système des fichiers et des répertoires (avec les droi
 <source>Filter: Single pair</source>
 <target>Filtre : Une seule paire</target>
 
-<source>Ignore</source>
-<target>Ignorer</target>
-
 <source>Direct</source>
 <target>Direct</target>
 
@@ -1295,6 +1182,105 @@ Transfert des attributs système des fichiers et des répertoires (avec les droi
 <source>Move files into a time-stamped subdirectory</source>
 <target>Déplacer les fichiers vers un sous-répertoire daté</target>
 
+<source>%x TB</source>
+<target>%x To</target>
+
+<source>%x PB</source>
+<target>%x Po</target>
+
+<source>%x%</source>
+<target>%x %</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x heure</pluralform>
+<pluralform>%x heures</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x jour</pluralform>
+<pluralform>%x jours</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Impossible d'initialiser la surveillance des dossiers :</target>
+
+<source>Error when monitoring directories.</source>
+<target>Erreur lors de la surveillance des répertoires.</target>
+
+<source>Conversion error:</source>
+<target>Erreur de conversion :</target>
+
+<source>Error deleting file:</source>
+<target>Erreur lors de la suppression d'un fichier :</target>
+
+<source>Error moving file:</source>
+<target>Erreur lors du déplacement du fichier :</target>
+
+<source>Target file already existing!</source>
+<target>Le fichier de destination existe déjà !</target>
+
+<source>Error moving directory:</source>
+<target>Erreur lors du déplacement du répertoire :</target>
+
+<source>Target directory already existing!</source>
+<target>Le répertoire de destination existe déjà !</target>
+
+<source>Error deleting directory:</source>
+<target>Erreur lors de la suppression d'un répertoire :</target>
+
+<source>Error changing modification time:</source>
+<target>Erreur lors du changement de la date de modification :</target>
+
+<source>Error loading library function:</source>
+<target>Erreur lors du chargement de la bibliothèque de fonctions :</target>
+
+<source>Error reading security context:</source>
+<target>Erreur de lecture du contexte de sécurité:</target>
+
+<source>Error writing security context:</source>
+<target>Erreur d'écriture du contexte de sécurité:</target>
+
+<source>Error copying file permissions:</source>
+<target>Erreur lors de la copie des attributs système</target>
+
+<source>Error creating directory:</source>
+<target>Erreur lors de la création d'un répertoire :</target>
+
+<source>Error copying symbolic link:</source>
+<target>Erreur lors de la copie du lien symbolique :</target>
+
+<source>Error copying file:</source>
+<target>Erreur lors de la copie du fichier :</target>
+
+<source>Error opening file:</source>
+<target>Erreur lors de l'ouverture du fichier :</target>
+
+<source>Error traversing directory:</source>
+<target>Erreur lors du parcours du répertoire :</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Boucle sans fin lors du parcours du répertoire :</target>
+
+<source>Error setting privilege:</source>
+<target>Erreur de paramétrage de privilège</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>Les deux côtés ont changé depuis la dernière synchronisation !</target>
 
@@ -1325,9 +1311,6 @@ Transfert des attributs système des fichiers et des répertoires (avec les droi
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Les répertoires sont imbriqués ! Attention à la mise à jour des règles de synchronisation :</target>
 
-<source>Comparing content of files %x</source>
-<target>Comparaison du contenu des fichiers %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Erreur d'allocation de mémoire!</target>
 
@@ -1343,15 +1326,15 @@ Transfert des attributs système des fichiers et des répertoires (avec les droi
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Le lien symbolique %x a la même date mais une destination différente !</target>
 
+<source>Comparing content of files %x</source>
+<target>Comparaison du contenu des fichiers %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>La comparaison des fichiers par leur contenu a échoué.</target>
 
 <source>Generating file list...</source>
 <target>Génération de la liste des fichiers...</target>
 
-<source>Multiple...</source>
-<target>Multiple...</target>
-
 <source>Both sides are equal</source>
 <target>Les deux cotés sont identiques</target>
 
@@ -1370,6 +1353,12 @@ Transfert des attributs système des fichiers et des répertoires (avec les droi
 <source>Delete right file/folder</source>
 <target>Supprimer les fichiers/dossiers de droite</target>
 
+<source>Move file on left</source>
+<target></target>
+
+<source>Move file on right</source>
+<target></target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Remplacer le fichier/dossier de gauche avec celui de droite</target>
 
@@ -1385,6 +1374,9 @@ Transfert des attributs système des fichiers et des répertoires (avec les droi
 <source>Copy file attributes only to right</source>
 <target>Copier seulement les attributs du fichier à droite</target>
 
+<source>Multiple...</source>
+<target>Multiple...</target>
+
 <source>Deleting file %x</source>
 <target>Suppression du fichier %x</target>
 
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index 78c9ee8f..3b260354 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -169,15 +169,15 @@
 <source>Comparison Result</source>
 <target>Ergebnis des Vergleichs</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Inkompatibles Datenbankformat:</target>
-
 <source>Initial synchronization:</source>
 <target>Erstmalige Synchronisation:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>Eine der FreeFileSync Datenbankdateien existiert noch nicht:</target>
 
+<source>Incompatible synchronization database format:</source>
+<target>Inkompatibles Datenbankformat:</target>
+
 <source>Database files do not share a common synchronization session:</source>
 <target>Die Datenbankdateien enthalten keine gemeinsame Synchronisationssitzung:</target>
 
@@ -372,9 +372,6 @@ Die Befehlszeile wird ausgeführt wenn:
 <source>Batch execution</source>
 <target>Batchlauf</target>
 
-<source>Log-messages:</source>
-<target>Meldungen:</target>
-
 <source>Stop</source>
 <target>Stop</target>
 
@@ -501,6 +498,24 @@ Die Befehlszeile wird ausgeführt wenn:
 <source>Total amount of data that will be transferred</source>
 <target>Gesamtmenge der zu übertragenden Daten</target>
 
+<source>Operation:</source>
+<target>Vorgang:</target>
+
+<source>Items found:</source>
+<target>Gefundene Elemente:</target>
+
+<source>Items remaining:</source>
+<target>Verbleibende Elemente:</target>
+
+<source>Speed:</source>
+<target>Geschwindigkeit:</target>
+
+<source>Time remaining:</source>
+<target>Verbleibende Zeit:</target>
+
+<source>Time elapsed:</source>
+<target>Vergangene Zeit:</target>
+
 <source>Batch job</source>
 <target>Batch-Job</target>
 
@@ -549,32 +564,14 @@ Die Befehlszeile wird ausgeführt wenn:
 <source>&Cancel</source>
 <target>&Abbrechen</target>
 
-<source>Operation:</source>
-<target>Vorgang:</target>
-
-<source>Items found:</source>
-<target>Gefundene Elemente:</target>
-
-<source>Items remaining:</source>
-<target>Verbleibende Elemente:</target>
-
-<source>Speed:</source>
-<target>Geschwindigkeit:</target>
-
-<source>Time remaining:</source>
-<target>Verbleibende Zeit:</target>
-
-<source>Time elapsed:</source>
-<target>Vergangene Zeit:</target>
-
 <source>Select variant:</source>
 <target>Variante auswählen:</target>
 
 <source><Automatic></source>
 <target><Automatik></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Identifiziere und propagiere Änderungen auf beiden Seiten mit Hilfe einer Datenbank. Löschungen und Konflikte werden automatisch erkannt.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Identifiziere und propagiere Änderungen auf beiden Seiten mit Hilfe einer Datenbank. Löschungen, Umbenennungen und Konflikte werden automatisch erkannt.</target>
 
 <source>Mirror ->></source>
 <target>Spiegeln ->></target>
@@ -1122,9 +1119,6 @@ Ausschließen: \stuff\temp\*
 <source>Filter: Single pair</source>
 <target>Filter: Einzelnes Verzeichnispaar</target>
 
-<source>Ignore</source>
-<target>Ignorieren</target>
-
 <source>Direct</source>
 <target>Direkt</target>
 
@@ -1278,12 +1272,12 @@ Ausschließen: \stuff\temp\*
 <source>Error opening file:</source>
 <target>Fehler beim Öffnen der Datei:</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Endlosschleife beim Lesen des Verzeichnisses:</target>
-
 <source>Error traversing directory:</source>
 <target>Fehler beim Durchsuchen des Verzeichnisses:</target>
 
+<source>Endless loop when traversing directory:</source>
+<target>Endlosschleife beim Lesen des Verzeichnisses:</target>
+
 <source>Error setting privilege:</source>
 <target>Fehler beim Setzen des Privilegs:</target>
 
@@ -1317,9 +1311,6 @@ Ausschließen: \stuff\temp\*
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Die Verzeichnisse sind voneinander abhängig! Achtung beim Festlegen der Synchronisationseinstellungen:</target>
 
-<source>Comparing content of files %x</source>
-<target>Vergleiche Inhalt der Dateien %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Speicherallokation fehlgeschlagen!</target>
 
@@ -1335,15 +1326,15 @@ Ausschließen: \stuff\temp\*
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Die Symbolischen Links %x haben dasselbe Datum, aber ein unterschiedliches Ziel!</target>
 
+<source>Comparing content of files %x</source>
+<target>Vergleiche Inhalt der Dateien %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>Vergleich nach Dateiinhalt ist fehlgeschlagen.</target>
 
 <source>Generating file list...</source>
 <target>Erzeuge Dateiliste...</target>
 
-<source>Multiple...</source>
-<target>Verschiedene...</target>
-
 <source>Both sides are equal</source>
 <target>Beide Seiten sind gleich</target>
 
@@ -1362,6 +1353,12 @@ Ausschließen: \stuff\temp\*
 <source>Delete right file/folder</source>
 <target>Lösche rechte Datei</target>
 
+<source>Move file on left</source>
+<target>Verschiebe linke Datei</target>
+
+<source>Move file on right</source>
+<target>Verschiebe rechte Datei</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Überschreibe linke Datei mit rechter</target>
 
@@ -1377,6 +1374,9 @@ Ausschließen: \stuff\temp\*
 <source>Copy file attributes only to right</source>
 <target>Kopiere nur die Dateiattribute nach rechts</target>
 
+<source>Multiple...</source>
+<target>Verschiedene...</target>
+
 <source>Deleting file %x</source>
 <target>Lösche Datei %x</target>
 
diff --git a/BUILD/Languages/greek.lng b/BUILD/Languages/greek.lng
index c3a9a44a..1b883921 100644
--- a/BUILD/Languages/greek.lng
+++ b/BUILD/Languages/greek.lng
@@ -169,15 +169,15 @@
 <source>Comparison Result</source>
 <target>Αποτέλεσμα της σύγκρισης</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Η μορφή της βάσης δεδομένων συγχρονισμού δεν είναι συμβατή:</target>
-
 <source>Initial synchronization:</source>
 <target>Αρχικός συγχρονισμός:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>Μια από τις βάσεις δεδομένων του FreeFileSync δεν υπάρχει ακόμα:</target>
 
+<source>Incompatible synchronization database format:</source>
+<target>Η μορφή της βάσης δεδομένων συγχρονισμού δεν είναι συμβατή:</target>
+
 <source>Database files do not share a common synchronization session:</source>
 <target>Οι βάσεις δεδομένων δεν έχουν δημιουργηθεί από τον ίδιο συγχρονισμό:</target>
 
@@ -206,7 +206,7 @@
 <target>Μεταφορά && Απόθεση</target>
 
 <source>Info</source>
-<target>Πληροφορίες</target>
+<target>Πληροφορία</target>
 
 <source>Fatal Error</source>
 <target>Σημαντικό Σφάλμα</target>
@@ -372,9 +372,6 @@ The command line is executed each time:
 <source>Batch execution</source>
 <target>Εκτέλεση δέσμης ενεργειών</target>
 
-<source>Log-messages:</source>
-<target>Αποθηκευμένα μηνύματα:</target>
-
 <source>Stop</source>
 <target>Λήξη</target>
 
@@ -501,6 +498,24 @@ The command line is executed each time:
 <source>Total amount of data that will be transferred</source>
 <target>Συνολικός όγκος δεδομένων που θα μεταφερθούν</target>
 
+<source>Operation:</source>
+<target>Λειτουργία:</target>
+
+<source>Items found:</source>
+<target>Βρέθηκαν στοιχεία:</target>
+
+<source>Items remaining:</source>
+<target>Περισσεύουν στοιχεία:</target>
+
+<source>Speed:</source>
+<target>Ταχύτητα:</target>
+
+<source>Time remaining:</source>
+<target>Απομένει χρόνος:</target>
+
+<source>Time elapsed:</source>
+<target>Πέρασε χρόνος:</target>
+
 <source>Batch job</source>
 <target>Δέσμη ενεργειών</target>
 
@@ -549,32 +564,14 @@ The command line is executed each time:
 <source>&Cancel</source>
 <target>&Άκυρο</target>
 
-<source>Operation:</source>
-<target>Λειτουργία:</target>
-
-<source>Items found:</source>
-<target>Βρέθηκαν στοιχεία:</target>
-
-<source>Items remaining:</source>
-<target>Περισσεύουν στοιχεία:</target>
-
-<source>Speed:</source>
-<target>Ταχύτητα:</target>
-
-<source>Time remaining:</source>
-<target>Απομένει χρόνος:</target>
-
-<source>Time elapsed:</source>
-<target>Πέρασε χρόνος:</target>
-
 <source>Select variant:</source>
 <target>Επιλέξτε μια μέθοδο:</target>
 
 <source><Automatic></source>
 <target><Αυτόματα></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Ανίχνευση και εφαρμογή των αλλαγών και στις δυο πλευρές με τη χρήση βάσης δεδομένων. Διαγραφές και διενέξεις ανιχνεύονται αυτόματα.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Αναγνώριση και αναπαραγωγή των αλλαγών και στις δύο πλευρές με τη χρήση μιας βάσης δεδομένων. Διαγραφές, μετονομασίες και διενέξεις ανιχνεύονται αυτόματα.</target>
 
 <source>Mirror ->></source>
 <target>Κατοπτρισμός ->></target>
@@ -1122,9 +1119,6 @@ Exclude: \stuff\temp\*
 <source>Filter: Single pair</source>
 <target>Φίλτρο: Ένα ζεύγος</target>
 
-<source>Ignore</source>
-<target>Παράβλεψη</target>
-
 <source>Direct</source>
 <target>Ως δεσμό</target>
 
@@ -1278,12 +1272,12 @@ Exclude: \stuff\temp\*
 <source>Error opening file:</source>
 <target>Σφάλμα κατά το άνοιγμα του αρχείου:</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Ατέρμονος βρόχος κατά την την ανάλυση του υποκαταλόγου:</target>
-
 <source>Error traversing directory:</source>
 <target>Σφάλμα κατά την ανάλυση του υποκαταλόγου:</target>
 
+<source>Endless loop when traversing directory:</source>
+<target>Ατέρμονος βρόχος κατά την την ανάλυση του υποκαταλόγου:</target>
+
 <source>Error setting privilege:</source>
 <target>Σφάλμα κατά τον ορισμό δικαιωμάτων:</target>
 
@@ -1317,9 +1311,6 @@ Exclude: \stuff\temp\*
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Οι υποκατάλογοι είναι εξαρτώμενοι. Προσοχή κατά την εισαγωγή των κανόνων συγχρονισμού:</target>
 
-<source>Comparing content of files %x</source>
-<target>Σύγκριση του περιεχομένου των αρχείων %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Η δέσμευση χώρου μνήμης απέτυχε!</target>
 
@@ -1335,15 +1326,15 @@ Exclude: \stuff\temp\*
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Οι συμβολικοί δεσμοί %x έχουν την ίδια ημερομηνία αλλά διαφορετικό προορισμό!</target>
 
+<source>Comparing content of files %x</source>
+<target>Σύγκριση του περιεχομένου των αρχείων %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>Η σύγκριση του περιεχομένου των αρχείων απέτυχε.</target>
 
 <source>Generating file list...</source>
 <target>Δημιουργία καταλόγου αρχείων...</target>
 
-<source>Multiple...</source>
-<target>Πολλαπλές ρυθμίσεις...</target>
-
 <source>Both sides are equal</source>
 <target>Οι δυο πλευρές είναι ίδιες</target>
 
@@ -1362,6 +1353,12 @@ Exclude: \stuff\temp\*
 <source>Delete right file/folder</source>
 <target>Διαγραφή του αρχείου/υποκαταλόγου στα δεξιά</target>
 
+<source>Move file on left</source>
+<target>Μεταφορά του αρχείου που βρίσκεται αριστερά</target>
+
+<source>Move file on right</source>
+<target>Μεταφορά του αρχείου που βρίσκεται δεξιά</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Αντικατάσταση του αρχείου/υποκαταλόγου στα αριστερά από το(ν) αντίστοιχο στα δεξιά</target>
 
@@ -1377,6 +1374,9 @@ Exclude: \stuff\temp\*
 <source>Copy file attributes only to right</source>
 <target>Αντιγραφή μόνο των χαρακτηριστικών του αρχείου στα δεξιά</target>
 
+<source>Multiple...</source>
+<target>Πολλαπλές ρυθμίσεις...</target>
+
 <source>Deleting file %x</source>
 <target>Διαγραφή του αρχείου %x</target>
 
diff --git a/BUILD/Languages/hebrew.lng b/BUILD/Languages/hebrew.lng
index 40b6721a..b15dfc56 100644
--- a/BUILD/Languages/hebrew.lng
+++ b/BUILD/Languages/hebrew.lng
@@ -2,7 +2,7 @@
 	<language name>עברית</language name>
 	<translator>nitnit</translator>
 	<locale>he_IL</locale>
-	<flag file>isreal.png</flag file>
+	<flag file>israel.png</flag file>
 	<plural forms>2</plural forms>
 	<plural definition>n == 1 ? 0 : 1</plural definition>
 </header>
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - סינכרון  אוטומטי</target>
 
-<source>Browse</source>
-<target>עיין</target>
-
-<source>Windows Error Code %x:</source>
-<target>קוד שגיאת חלונות %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>קוד שגיאת לינוקס %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>שורת פקודה בלתי חוקית: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>שגיאה בפענוח קישור סימבולי (Symbolic Link)</target>
-
-<source>Show pop-up</source>
-<target>הראה חלונות מוקפצים</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>הראה חלונות מוקפצים עבור שגיאות או אזהרות</target>
-
-<source>Ignore errors</source>
-<target>התעלם מטעויות</target>
-
-<source>Hide all error and warning messages</source>
-<target>הסתר את כל הודעות ההזהרה והשגיאה</target>
-
-<source>Exit instantly</source>
-<target>צא מידית</target>
-
-<source>Abort synchronization immediately</source>
-<target>הפסק סנכרון מידית</target>
-
 <source>Select alternate comparison settings</source>
 <target>בחר הגדרות השוואה חליפיות</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>בחר תחום זמן</target>
 
+<source>Show pop-up</source>
+<target>הראה חלונות מוקפצים</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>הראה חלונות מוקפצים עבור שגיאות או אזהרות</target>
+
+<source>Ignore errors</source>
+<target>התעלם מטעויות</target>
+
+<source>Hide all error and warning messages</source>
+<target>הסתר את כל הודעות ההזהרה והשגיאה</target>
+
+<source>Exit instantly</source>
+<target>צא מידית</target>
+
+<source>Abort synchronization immediately</source>
+<target>הפסק סנכרון מידית</target>
+
+<source>Browse</source>
+<target>עיין</target>
+
+<source>Error reading from synchronization database:</source>
+<target>שגיאה בקריאה מבסיס הנתונים של הסנכרון:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>שגיאה ברישום לבסיס נתוני סנכרון:</target>
+
+<source>Invalid command line: %x</source>
+<target>שורת פקודה בלתי חוקית: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>קוד שגיאת חלונות %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>קוד שגיאת לינוקס %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>שגיאה בפענוח קישור סימבולי (Symbolic Link)</target>
+
 <source>%x MB</source>
 <target>%x מגה בייט</target>
 
@@ -163,17 +169,14 @@
 <source>Comparison Result</source>
 <target>תוצאות ההשוואה</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>מסד נתונים של הסנכרון לא תואם:</target>
-
 <source>Initial synchronization:</source>
 <target>סנכרון ראשוני:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>אחד מקובצי בסיס הנתונים הבא עדיין לא קיים</target>
 
-<source>Error reading from synchronization database:</source>
-<target>שגיאה בקריאה מבסיס הנתונים של הסנכרון:</target>
+<source>Incompatible synchronization database format:</source>
+<target>מסד נתונים של הסנכרון לא תואם:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>קבצי בסיס הנתונים אינם חולקים ארוע סנכרון משותף:</target>
@@ -199,12 +202,18 @@
 <pluralform>%x שניות</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>גרור והשלך</target>
+
 <source>Info</source>
 <target>מידע</target>
 
 <source>Fatal Error</source>
 <target>שגיאה פטלית</target>
 
+<source>Error reading file:</source>
+<target>שגיאה בקריאת קובץ:</target>
+
 <source>Scanning:</source>
 <target>סורק:</target>
 
@@ -223,15 +232,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>קובץ תצורה בלתי חוקי!</target>
 
-<source>File does not exist:</source>
-<target>קובץ לא קיים:</target>
-
 <source>Error parsing configuration file:</source>
 <target>שגיאה בניתוח קובץ תצורה:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>שגיאה בהעברה לסל המיחזור:</target>
+
+<source>Could not load a required DLL:</source>
+<target>:נדרש DLL לא יכל לטעון</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>שגיאה בגישה לשרות Volume Shadow Copy Service</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>לא נתמכת בגרסה זאת אנא התקן גרסה 64 WOW64 העתקת צל ב</target>
+
+<source>Could not determine volume name for file:</source>
+<target>לא יכול לקבוע שם כרך לקובץ:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>כנונן %x לא בנתיב של קובץ %y!</target>
+
 <source>/sec</source>
 <target>/שנ</target>
 
+<source>File does not exist:</source>
+<target>קובץ לא קיים:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>XML לא יכול לקרא ערכים מצמתי :</target>
+
 <source>S&ave configuration...</source>
 <target>&שמור תצורה...</target>
 
@@ -324,141 +354,6 @@ The command line is executed each time:
 <source>A directory input field is empty.</source>
 <target>שדה כניסת מחיצה ריק.</target>
 
-<source>Drag && drop</source>
-<target>גרור והשלך</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>לא יכול לאתחל ניטור מחיצה:</target>
-
-<source>Error when monitoring directories.</source>
-<target>שגיאה בזמן ניטור מחיצות.</target>
-
-<source>Conversion error:</source>
-<target>שגיאה בהסבה:</target>
-
-<source>Error deleting file:</source>
-<target>שגיאה במחיקת קובץ:</target>
-
-<source>Error moving file:</source>
-<target>שגיאה בהעברת קובץ:</target>
-
-<source>Target file already existing!</source>
-<target>קובץ מטרה כבר קיים!</target>
-
-<source>Error moving directory:</source>
-<target>שגיאה בהעברת מחיצה:</target>
-
-<source>Target directory already existing!</source>
-<target>מחיצת מטרה כבר קיימת!</target>
-
-<source>Error deleting directory:</source>
-<target>שגיאה במחיקת מחיצה:</target>
-
-<source>Error changing modification time:</source>
-<target>שגיאה בשינוי זמן:</target>
-
-<source>Error loading library function:</source>
-<target>שגיאה בטעינת ספרית פונקציות:</target>
-
-<source>Error reading security context:</source>
-<target>שגיאה בכתיבת הקשר בטיחות:</target>
-
-<source>Error writing security context:</source>
-<target>שגיאה בכתיבת הקשר בטיחות:</target>
-
-<source>Error copying file permissions:</source>
-<target>שגיאה בהעתקת הרשאות קובץ:</target>
-
-<source>Error creating directory:</source>
-<target>שגיאה ביצירת מחיצה:</target>
-
-<source>Error copying symbolic link:</source>
-<target>שגיאה בהעתקת קישור :</target>
-
-<source>Error copying file:</source>
-<target>שגיאה בהעתקת קובץ:</target>
-
-<source>Error opening file:</source>
-<target>שגיאה בפתיחת קובץ:</target>
-
-<source>Error writing file:</source>
-<target>שגיאה בכתיבת קובץ:</target>
-
-<source>Error reading file:</source>
-<target>שגיאה בקריאת קובץ:</target>
-
-<source>Operation aborted!</source>
-<target>הפעולה בוטלה!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>נוצרת לולאה אינסופית בחצית מחיצות</target>
-
-<source>Error traversing directory:</source>
-<target>שגיאה בהצלבת מחיצות</target>
-
-<source>Error setting privilege:</source>
-<target>שגיאה בהשמת פריווילגיה</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>שגיאה בהעברה לסל המיחזור:</target>
-
-<source>Could not load a required DLL:</source>
-<target>:נדרש DLL לא יכל לטעון</target>
-
-<source>Error writing to synchronization database:</source>
-<target>שגיאה ברישום לבסיס נתוני סנכרון:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>שגיאה בגישה לשרות Volume Shadow Copy Service</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>לא נתמכת בגרסה זאת אנא התקן גרסה 64 WOW64 העתקת צל ב</target>
-
-<source>Could not determine volume name for file:</source>
-<target>לא יכול לקבוע שם כרך לקובץ:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>כנונן %x לא בנתיב של קובץ %y!</target>
-
-<source>%x TB</source>
-<target>%x טרה בייט</target>
-
-<source>%x PB</source>
-<target>%x פטה בייט</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 דקה</pluralform>
-<pluralform>%x דקות</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 שעה</pluralform>
-<pluralform>%x שעות</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 יום</pluralform>
-<pluralform>%x ימים</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>XML לא יכול לקרא ערכים מצמתי :</target>
-
 <source>Logging</source>
 <target>רישום ביומן</target>
 
@@ -477,9 +372,6 @@ The command line is executed each time:
 <source>Batch execution</source>
 <target>פעולת אצווה</target>
 
-<source>Log-messages:</source>
-<target>הודעת יומן:</target>
-
 <source>Stop</source>
 <target>עצור</target>
 
@@ -606,6 +498,24 @@ The command line is executed each time:
 <source>Total amount of data that will be transferred</source>
 <target>סך הכל נתונים להעברה</target>
 
+<source>Operation:</source>
+<target>פעולה:</target>
+
+<source>Items found:</source>
+<target>אלמנטים נמצאו:</target>
+
+<source>Items remaining:</source>
+<target>אלמנתים נותרו:</target>
+
+<source>Speed:</source>
+<target>מהירות:</target>
+
+<source>Time remaining:</source>
+<target>זמן נותר:</target>
+
+<source>Time elapsed:</source>
+<target>זמן עבר:</target>
+
 <source>Batch job</source>
 <target>עבודת אצווה</target>
 
@@ -654,32 +564,14 @@ The command line is executed each time:
 <source>&Cancel</source>
 <target>&בטל</target>
 
-<source>Operation:</source>
-<target>פעולה:</target>
-
-<source>Items found:</source>
-<target>אלמנטים נמצאו:</target>
-
-<source>Items remaining:</source>
-<target>אלמנתים נותרו:</target>
-
-<source>Speed:</source>
-<target>מהירות:</target>
-
-<source>Time remaining:</source>
-<target>זמן נותר:</target>
-
-<source>Time elapsed:</source>
-<target>זמן עבר:</target>
-
 <source>Select variant:</source>
 <target>בחר משתנה:</target>
 
 <source><Automatic></source>
 <target><אוטומטי></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>זהה והפץ שינויים בשני הצדדים בעזרת בסיס נתונים. מחיקות וקונפליקטים מזוהים באופן אוטומטי.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>זהה והפץ שינויים בשני הצדדים באמצעות שימוש בבסיס נתונים. מחיקות, שינויי שמות וסתירות מתגלים באופן אוטומטי.</target>
 
 <source>Mirror ->></source>
 <target><<- מראה</target>
@@ -901,27 +793,19 @@ Exclude: \stuff\temp\*
 <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></target>
+<target>רשום לקובץ זמני (*.ffs_tmp) תחילה ושנה שם. פעולה זו מבטיחה עקביות המצב גם במקרה של שגיאה חמורה.</target>
 
 <source>Copy locked files</source>
 <target>העתק קבצים נעולים</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-העתק קבצים בשיתוף או נעולים באמצעות שרות Volume Shadow Copy Service (דורש הרשאות מנהל מערכת)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>העתק קבצים בשיתוף או נעולים באמצעות שרות Volume Shadow Copy Service (דורש הרשאות מנהל מערכת)</target>
 
 <source>Copy file access permissions</source>
 <target>העתק הרשאות גישה של הקובץ</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-העבר הרשאות קבצים ומחיצות (דורש הרשאות מנהל מערכת)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>העבר הרשאות קבצים ומחיצות (דורש הרשאות מנהל מערכת)</target>
 
 <source>Hidden dialogs:</source>
 <target>דיאלוגים מוסתרים:</target>
@@ -953,6 +837,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>&Find next</source>
 <target>&מצא הבא</target>
 
+<source>Operation aborted!</source>
+<target>הפעולה בוטלה!</target>
+
 <source>Main bar</source>
 <target>סרגל ראשי</target>
 
@@ -993,16 +880,16 @@ Transfer file and directory permissions (Requires Administrator rights)
 <target>עימוד אוטומטי</target>
 
 <source>Icon size:</source>
-<target></target>
+<target>גודל סמל:</target>
 
 <source>Small</source>
-<target></target>
+<target>קטן</target>
 
 <source>Medium</source>
-<target></target>
+<target>בינוני</target>
 
 <source>Large</source>
-<target></target>
+<target>גדול</target>
 
 <source>Include all rows</source>
 <target>כלול את כל השורות</target>
@@ -1130,6 +1017,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>File list exported!</source>
 <target>רשימת קבצים יוצאה!</target>
 
+<source>Error writing file:</source>
+<target>שגיאה בכתיבת קובץ:</target>
+
 <source>Batch file created successfully!</source>
 <target>קובץ אצווה נוצר בהצלחה!</target>
 
@@ -1229,9 +1119,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Filter: Single pair</source>
 <target>זוג אחד :מסונן</target>
 
-<source>Ignore</source>
-<target>התעלם</target>
-
 <source>Direct</source>
 <target>כוון</target>
 
@@ -1295,6 +1182,105 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Move files into a time-stamped subdirectory</source>
 <target>העבר קבצים לתוך מחיצות עם שם המכיל טביעת זמן ותאריך</target>
 
+<source>%x TB</source>
+<target>%x טרה בייט</target>
+
+<source>%x PB</source>
+<target>%x פטה בייט</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 דקה</pluralform>
+<pluralform>%x דקות</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 שעה</pluralform>
+<pluralform>%x שעות</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 יום</pluralform>
+<pluralform>%x ימים</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>לא יכול לאתחל ניטור מחיצה:</target>
+
+<source>Error when monitoring directories.</source>
+<target>שגיאה בזמן ניטור מחיצות.</target>
+
+<source>Conversion error:</source>
+<target>שגיאה בהסבה:</target>
+
+<source>Error deleting file:</source>
+<target>שגיאה במחיקת קובץ:</target>
+
+<source>Error moving file:</source>
+<target>שגיאה בהעברת קובץ:</target>
+
+<source>Target file already existing!</source>
+<target>קובץ מטרה כבר קיים!</target>
+
+<source>Error moving directory:</source>
+<target>שגיאה בהעברת מחיצה:</target>
+
+<source>Target directory already existing!</source>
+<target>מחיצת מטרה כבר קיימת!</target>
+
+<source>Error deleting directory:</source>
+<target>שגיאה במחיקת מחיצה:</target>
+
+<source>Error changing modification time:</source>
+<target>שגיאה בשינוי זמן:</target>
+
+<source>Error loading library function:</source>
+<target>שגיאה בטעינת ספרית פונקציות:</target>
+
+<source>Error reading security context:</source>
+<target>שגיאה בכתיבת הקשר בטיחות:</target>
+
+<source>Error writing security context:</source>
+<target>שגיאה בכתיבת הקשר בטיחות:</target>
+
+<source>Error copying file permissions:</source>
+<target>שגיאה בהעתקת הרשאות קובץ:</target>
+
+<source>Error creating directory:</source>
+<target>שגיאה ביצירת מחיצה:</target>
+
+<source>Error copying symbolic link:</source>
+<target>שגיאה בהעתקת קישור :</target>
+
+<source>Error copying file:</source>
+<target>שגיאה בהעתקת קובץ:</target>
+
+<source>Error opening file:</source>
+<target>שגיאה בפתיחת קובץ:</target>
+
+<source>Error traversing directory:</source>
+<target>שגיאה בהצלבת מחיצות</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>נוצרת לולאה אינסופית בחצית מחיצות</target>
+
+<source>Error setting privilege:</source>
+<target>שגיאה בהשמת פריווילגיה</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>שני הצדדים שונו מאז הסנכרון האחרון!</target>
 
@@ -1325,9 +1311,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>מחיצות תלויות! זהירות בהגדרת כללי סנכרון:</target>
 
-<source>Comparing content of files %x</source>
-<target>השווה תכולה של קבצים %x</target>
-
 <source>Memory allocation failed!</source>
 <target>הקצאת זכרון נכשלה!</target>
 
@@ -1343,15 +1326,15 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>קשור סימבולי %x בעל תאריך זהה אך מטרה שונה!</target>
 
+<source>Comparing content of files %x</source>
+<target>השווה תכולה של קבצים %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>השוואת קבצים באמצעות תכולה נכשלה.</target>
 
 <source>Generating file list...</source>
 <target>מייצר רשימת קבצים...</target>
 
-<source>Multiple...</source>
-<target>הכפל...</target>
-
 <source>Both sides are equal</source>
 <target>שני הצדדים שווים</target>
 
@@ -1370,6 +1353,12 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Delete right file/folder</source>
 <target>מחק קובץ\מחיצה בצד ימין</target>
 
+<source>Move file on left</source>
+<target>העבר קובץ בצד שמאל</target>
+
+<source>Move file on right</source>
+<target>העבר קובץ בצד ימין</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>העתק ודרוס קובץ\מחיצה מימין לשמאל</target>
 
@@ -1385,6 +1374,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Copy file attributes only to right</source>
 <target>העתק תכונות קובץ בלבד משמאל לימין</target>
 
+<source>Multiple...</source>
+<target>הכפל...</target>
+
 <source>Deleting file %x</source>
 <target>מוחק קובץ %x</target>
 
diff --git a/BUILD/Languages/hungarian.lng b/BUILD/Languages/hungarian.lng
index b5a14889..c21d5efd 100644
--- a/BUILD/Languages/hungarian.lng
+++ b/BUILD/Languages/hungarian.lng
@@ -169,15 +169,15 @@
 <source>Comparison Result</source>
 <target>Az összehasonlítás eredménye</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Inkompatibilis szinkronizációs adatbázis formátum:</target>
-
 <source>Initial synchronization:</source>
 <target>Első szinkronizáció:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>A FreeFileSync egyik adatbázisfájlja nem létezik:</target>
 
+<source>Incompatible synchronization database format:</source>
+<target>Inkompatibilis szinkronizációs adatbázis formátum:</target>
+
 <source>Database files do not share a common synchronization session:</source>
 <target>Az adatbázisfájlok nem osztoznak egy közös szinkronizációs munkameneten:</target>
 
@@ -372,9 +372,6 @@ A parancssor végrehajtódik minden alkalommal, ha:
 <source>Batch execution</source>
 <target>Kötegelt végrehajtás</target>
 
-<source>Log-messages:</source>
-<target>Naplóbejegyzések:</target>
-
 <source>Stop</source>
 <target>Megállítás</target>
 
@@ -501,6 +498,24 @@ A parancssor végrehajtódik minden alkalommal, ha:
 <source>Total amount of data that will be transferred</source>
 <target>A mozgatandó adatok összmérete</target>
 
+<source>Operation:</source>
+<target>Művelet:</target>
+
+<source>Items found:</source>
+<target>Talált elemek száma:</target>
+
+<source>Items remaining:</source>
+<target>Hátralévő elemek száma:</target>
+
+<source>Speed:</source>
+<target>Sebesség:</target>
+
+<source>Time remaining:</source>
+<target>Hátralévő idő:</target>
+
+<source>Time elapsed:</source>
+<target>Eltelt idő:</target>
+
 <source>Batch job</source>
 <target>Kötegelt feladat</target>
 
@@ -549,32 +564,14 @@ A parancssor végrehajtódik minden alkalommal, ha:
 <source>&Cancel</source>
 <target>&Mégsem</target>
 
-<source>Operation:</source>
-<target>Művelet:</target>
-
-<source>Items found:</source>
-<target>Talált elemek száma:</target>
-
-<source>Items remaining:</source>
-<target>Hátralévő elemek száma:</target>
-
-<source>Speed:</source>
-<target>Sebesség:</target>
-
-<source>Time remaining:</source>
-<target>Hátralévő idő:</target>
-
-<source>Time elapsed:</source>
-<target>Eltelt idő:</target>
-
 <source>Select variant:</source>
 <target>Változat kiválasztása:</target>
 
 <source><Automatic></source>
 <target><Automatikus></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Mindkét oldal változásainak azonosítása és tárolása adatbázis segítségével. A törlések és ütközések automatikusan észlelődnek.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target></target>
 
 <source>Mirror ->></source>
 <target>Tükrözés ->></target>
@@ -1123,9 +1120,6 @@ Kizárni: \stuff\temp\*
 <source>Filter: Single pair</source>
 <target>Szűrő: Egy pár</target>
 
-<source>Ignore</source>
-<target>Figyelmen kívül hagy</target>
-
 <source>Direct</source>
 <target>Közvetlen</target>
 
@@ -1279,12 +1273,12 @@ Kizárni: \stuff\temp\*
 <source>Error opening file:</source>
 <target>A fájl megnyitása sikertelen:</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Végtelen hurok a mappák bejárásakor:</target>
-
 <source>Error traversing directory:</source>
 <target>A mappa átnézése sikertelen:</target>
 
+<source>Endless loop when traversing directory:</source>
+<target>Végtelen hurok a mappák bejárásakor:</target>
+
 <source>Error setting privilege:</source>
 <target>Hiba történt a jogok beállítása közben:</target>
 
@@ -1318,9 +1312,6 @@ Kizárni: \stuff\temp\*
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>A mappák függenek egymástól! Legyen óvatos, amikor megadja a szinkronizálási szabályokat:</target>
 
-<source>Comparing content of files %x</source>
-<target>%x fájlok tartalmának összehasonlítása</target>
-
 <source>Memory allocation failed!</source>
 <target>Sikertelen memóriafoglalás!</target>
 
@@ -1336,15 +1327,15 @@ Kizárni: \stuff\temp\*
 <source>Symlinks %x have the same date but a different target!</source>
 <target>A(z) %x symlinknek megegyezik a dátuma, de a célpontja nem!</target>
 
+<source>Comparing content of files %x</source>
+<target>%x fájlok tartalmának összehasonlítása</target>
+
 <source>Comparing files by content failed.</source>
 <target>Sikertelen a fájlok összehasonlítása tartalom alapján.</target>
 
 <source>Generating file list...</source>
 <target>Fájllista generálása...</target>
 
-<source>Multiple...</source>
-<target>Sokszorosítás</target>
-
 <source>Both sides are equal</source>
 <target>Mindkét oldal egyforma</target>
 
@@ -1363,6 +1354,12 @@ Kizárni: \stuff\temp\*
 <source>Delete right file/folder</source>
 <target>Jobb oldali fájl/mappa törlése</target>
 
+<source>Move file on left</source>
+<target></target>
+
+<source>Move file on right</source>
+<target></target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Bal oldali fájl/mappa felülírása a jobb oldalival</target>
 
@@ -1378,6 +1375,9 @@ Kizárni: \stuff\temp\*
 <source>Copy file attributes only to right</source>
 <target>Fájl attribútumok másolása csak a jobb oldalra</target>
 
+<source>Multiple...</source>
+<target>Sokszorosítás</target>
+
 <source>Deleting file %x</source>
 <target>Fájl törlése %x</target>
 
diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng
index cdf4ef83..97aff271 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronizzazione Automatizzata</target>
 
-<source>Browse</source>
-<target>Sfoglia</target>
-
-<source>Windows Error Code %x:</source>
-<target>Errore Windows Codice %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Errore Linux Codice %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>Linea di comando non valida: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>Errore nella risoluzione di collegamento simbolico:</target>
-
-<source>Show pop-up</source>
-<target>Mostra pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Mostra pop-up di errori o avvisi</target>
-
-<source>Ignore errors</source>
-<target>Ignora gli errori</target>
-
-<source>Hide all error and warning messages</source>
-<target>Nascondi tutti gli errori e i messaggi d'avviso</target>
-
-<source>Exit instantly</source>
-<target>Esci istantaneamente</target>
-
-<source>Abort synchronization immediately</source>
-<target>Interrompi immediatamente la sincronizzazione</target>
-
 <source>Select alternate comparison settings</source>
 <target>Seleziona impostazioni di comparazione alternative</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>Seleziona intervallo di tempo</target>
 
+<source>Show pop-up</source>
+<target>Mostra pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Mostra pop-up di errori o avvisi</target>
+
+<source>Ignore errors</source>
+<target>Ignora gli errori</target>
+
+<source>Hide all error and warning messages</source>
+<target>Nascondi tutti gli errori e i messaggi d'avviso</target>
+
+<source>Exit instantly</source>
+<target>Esci istantaneamente</target>
+
+<source>Abort synchronization immediately</source>
+<target>Interrompi immediatamente la sincronizzazione</target>
+
+<source>Browse</source>
+<target>Sfoglia</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Errore in lettura dal database di sincronizzione:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Errore in scrittura sul database di sincronizzazione:</target>
+
+<source>Invalid command line: %x</source>
+<target>Linea di comando non valida: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Errore Windows Codice %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Errore Linux Codice %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Errore nella risoluzione di collegamento simbolico:</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -163,17 +169,14 @@
 <source>Comparison Result</source>
 <target>Risultato della comparazione</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Formato database di sincronizzazione incompatibile:</target>
-
 <source>Initial synchronization:</source>
 <target>Prima sincronizzazione:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>Un file database di FreeFileSync non è ancora stato creato:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Errore in lettura dal database di sincronizzione:</target>
+<source>Incompatible synchronization database format:</source>
+<target>Formato database di sincronizzazione incompatibile:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>I file database non condividono una comune sessione di sincronizzazione:</target>
@@ -199,12 +202,18 @@
 <pluralform>%x sec</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Drag && drop</target>
+
 <source>Info</source>
 <target>Info</target>
 
 <source>Fatal Error</source>
 <target>Errore Fatale</target>
 
+<source>Error reading file:</source>
+<target>Errore durante la lettura del file:</target>
+
 <source>Scanning:</source>
 <target>Analisi in corso:</target>
 
@@ -223,15 +232,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>File di configurazione FreeFileSync non valido!</target>
 
-<source>File does not exist:</source>
-<target>Il file non esiste:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Errore nell'analisi del file di configurazione:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Errore durante lo spostamento nel Cestino:</target>
+
+<source>Could not load a required DLL:</source>
+<target>Impossibile caricare una DLL richiesta:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>Errore in accesso al Servizio Volume Shadow Copy</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>La creazione di copie shadow su WOW64 non e' supportata. Utilizzare FreeFileSync in versione 64-bit.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Impossibile determinare il nome volume per il file:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Il nome volume %x non è parte del nome file %y!</target>
+
 <source>/sec</source>
 <target>/sec</target>
 
+<source>File does not exist:</source>
+<target>Il file non esiste:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Impossibile leggere i valori per i seguenti nodi XML:</target>
+
 <source>S&ave configuration...</source>
 <target>S&alva la configurazione...</target>
 
@@ -324,141 +354,6 @@ La linea di comando è eseguita ogni volta che:
 <source>A directory input field is empty.</source>
 <target>Un campo directory di input è vuoto.</target>
 
-<source>Drag && drop</source>
-<target>Drag && drop</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>Monitoraggio directory non inizializzabile:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Errore durante il monitoraggio directory.</target>
-
-<source>Conversion error:</source>
-<target>Errore di conversione:</target>
-
-<source>Error deleting file:</source>
-<target>Errore durante l'eliminazione del file:</target>
-
-<source>Error moving file:</source>
-<target>Errore nello spostamento file:</target>
-
-<source>Target file already existing!</source>
-<target>File destinazione già esistente!</target>
-
-<source>Error moving directory:</source>
-<target>Errore nello spostamento directory:</target>
-
-<source>Target directory already existing!</source>
-<target>Directory di destinazione già esistente!</target>
-
-<source>Error deleting directory:</source>
-<target>Errore durante l'eliminazione delle directory:</target>
-
-<source>Error changing modification time:</source>
-<target>Errore durante la modifica della data:</target>
-
-<source>Error loading library function:</source>
-<target>Errore nel caricamento della funzione libreria:</target>
-
-<source>Error reading security context:</source>
-<target>Errore in lettura del contesto di sicurezza:</target>
-
-<source>Error writing security context:</source>
-<target>Errore in scrittura del contesto di sicurezza:</target>
-
-<source>Error copying file permissions:</source>
-<target>Errore durante la copia dei permessi su file:</target>
-
-<source>Error creating directory:</source>
-<target>Errore durante la creazione della directory:</target>
-
-<source>Error copying symbolic link:</source>
-<target>Errore durante la copia del link simbolico:</target>
-
-<source>Error copying file:</source>
-<target>Errore durante la copia del file:</target>
-
-<source>Error opening file:</source>
-<target>Errore in apertura file:</target>
-
-<source>Error writing file:</source>
-<target>Errore durante la scrittura del file:</target>
-
-<source>Error reading file:</source>
-<target>Errore durante la lettura del file:</target>
-
-<source>Operation aborted!</source>
-<target>Operazione abortita!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Loop senza fine attraverso le directory:</target>
-
-<source>Error traversing directory:</source>
-<target>Errore nel percorso della directory:</target>
-
-<source>Error setting privilege:</source>
-<target>Errore nell'impostazione dei privilegi:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Errore durante lo spostamento nel Cestino:</target>
-
-<source>Could not load a required DLL:</source>
-<target>Impossibile caricare una DLL richiesta:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Errore in scrittura sul database di sincronizzazione:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Errore in accesso al Servizio Volume Shadow Copy</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>La creazione di copie shadow su WOW64 non e' supportata. Utilizzare FreeFileSync in versione 64-bit.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>Impossibile determinare il nome volume per il file:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>Il nome volume %x non è parte del nome file %y!</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 ora</pluralform>
-<pluralform>%x ore</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 giorno</pluralform>
-<pluralform>%x giorni</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>Impossibile leggere i valori per i seguenti nodi XML:</target>
-
 <source>Logging</source>
 <target>Logging</target>
 
@@ -477,9 +372,6 @@ La linea di comando è eseguita ogni volta che:
 <source>Batch execution</source>
 <target>Esecuzione in batch</target>
 
-<source>Log-messages:</source>
-<target>Log-messages:</target>
-
 <source>Stop</source>
 <target>Stop</target>
 
@@ -606,6 +498,24 @@ La linea di comando è eseguita ogni volta che:
 <source>Total amount of data that will be transferred</source>
 <target>Volume dei dati che verranno trasferiti</target>
 
+<source>Operation:</source>
+<target>Operazione:</target>
+
+<source>Items found:</source>
+<target>Elementi trovati:</target>
+
+<source>Items remaining:</source>
+<target>Elementi rimanenti:</target>
+
+<source>Speed:</source>
+<target>Velocita':</target>
+
+<source>Time remaining:</source>
+<target>Tempo rimanente:</target>
+
+<source>Time elapsed:</source>
+<target>Tempo trascorso:</target>
+
 <source>Batch job</source>
 <target>Batch job</target>
 
@@ -654,32 +564,14 @@ La linea di comando è eseguita ogni volta che:
 <source>&Cancel</source>
 <target>&Annulla</target>
 
-<source>Operation:</source>
-<target>Operazione:</target>
-
-<source>Items found:</source>
-<target>Elementi trovati:</target>
-
-<source>Items remaining:</source>
-<target>Elementi rimanenti:</target>
-
-<source>Speed:</source>
-<target>Velocita':</target>
-
-<source>Time remaining:</source>
-<target>Tempo rimanente:</target>
-
-<source>Time elapsed:</source>
-<target>Tempo trascorso:</target>
-
 <source>Select variant:</source>
 <target>Selezionare una variante:</target>
 
 <source><Automatic></source>
 <target><Automatico></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Identifica e propaga cambiamenti su entrambi i lati usando un database. Cancellazioni e conflitti sono riconosciuti automaticamente.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Identifica e propaga modifiche su entrambi i lati usando un database. Cancellazioni, ridenominazioni e conflitti sono rilevati automaticamente.</target>
 
 <source>Mirror ->></source>
 <target>Mirror ->></target>
@@ -901,27 +793,19 @@ Escludi: \stuff\temp\*
 <target>Copia transazionale file</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></target>
+<target>Scrivi su un file temporaneo (*.ffs_tmp) prima di rinominarlo. Ciò garantisce uno stato consistente anche in caso di errore fatale.</target>
 
 <source>Copy locked files</source>
 <target>Copia file bloccati</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Copia file condivisi o bloccati usando il Servizio Volume Shadow Copy (Richiede diritti di Administrator)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Copia file condivisi o bloccati usando il Servizio Volume Shadow Copy (Richiede diritti di Administrator)</target>
 
 <source>Copy file access permissions</source>
 <target>Copia permessi di accesso file</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Trasferisci file e permessi sulle cartelle (Richiede diritti di Administrator)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Trasferisci file e permessi sulle cartelle (Richiede diritti di Administrator)</target>
 
 <source>Hidden dialogs:</source>
 <target>Messaggi nascosti:</target>
@@ -953,6 +837,9 @@ Trasferisci file e permessi sulle cartelle (Richiede diritti di Administrator)
 <source>&Find next</source>
 <target>&Trova successivo</target>
 
+<source>Operation aborted!</source>
+<target>Operazione abortita!</target>
+
 <source>Main bar</source>
 <target>Barra principale</target>
 
@@ -993,16 +880,16 @@ Trasferisci file e permessi sulle cartelle (Richiede diritti di Administrator)
 <target>Larghezza automatica colonne</target>
 
 <source>Icon size:</source>
-<target></target>
+<target>Dimensione icona:</target>
 
 <source>Small</source>
-<target></target>
+<target>Piccola</target>
 
 <source>Medium</source>
-<target></target>
+<target>Media</target>
 
 <source>Large</source>
-<target></target>
+<target>Grande</target>
 
 <source>Include all rows</source>
 <target>Includi tutte le righe</target>
@@ -1130,6 +1017,9 @@ Trasferisci file e permessi sulle cartelle (Richiede diritti di Administrator)
 <source>File list exported!</source>
 <target>Lista dei file esportata!</target>
 
+<source>Error writing file:</source>
+<target>Errore durante la scrittura del file:</target>
+
 <source>Batch file created successfully!</source>
 <target>Creazione batch file riuscita!</target>
 
@@ -1229,9 +1119,6 @@ Trasferisci file e permessi sulle cartelle (Richiede diritti di Administrator)
 <source>Filter: Single pair</source>
 <target>Filtro: Singola coppia</target>
 
-<source>Ignore</source>
-<target>Ignora</target>
-
 <source>Direct</source>
 <target>Diretto</target>
 
@@ -1295,6 +1182,105 @@ Trasferisci file e permessi sulle cartelle (Richiede diritti di Administrator)
 <source>Move files into a time-stamped subdirectory</source>
 <target>Sposta file in una sotto-cartella datata</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 ora</pluralform>
+<pluralform>%x ore</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 giorno</pluralform>
+<pluralform>%x giorni</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Monitoraggio directory non inizializzabile:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Errore durante il monitoraggio directory.</target>
+
+<source>Conversion error:</source>
+<target>Errore di conversione:</target>
+
+<source>Error deleting file:</source>
+<target>Errore durante l'eliminazione del file:</target>
+
+<source>Error moving file:</source>
+<target>Errore nello spostamento file:</target>
+
+<source>Target file already existing!</source>
+<target>File destinazione già esistente!</target>
+
+<source>Error moving directory:</source>
+<target>Errore nello spostamento directory:</target>
+
+<source>Target directory already existing!</source>
+<target>Directory di destinazione già esistente!</target>
+
+<source>Error deleting directory:</source>
+<target>Errore durante l'eliminazione delle directory:</target>
+
+<source>Error changing modification time:</source>
+<target>Errore durante la modifica della data:</target>
+
+<source>Error loading library function:</source>
+<target>Errore nel caricamento della funzione libreria:</target>
+
+<source>Error reading security context:</source>
+<target>Errore in lettura del contesto di sicurezza:</target>
+
+<source>Error writing security context:</source>
+<target>Errore in scrittura del contesto di sicurezza:</target>
+
+<source>Error copying file permissions:</source>
+<target>Errore durante la copia dei permessi su file:</target>
+
+<source>Error creating directory:</source>
+<target>Errore durante la creazione della directory:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Errore durante la copia del link simbolico:</target>
+
+<source>Error copying file:</source>
+<target>Errore durante la copia del file:</target>
+
+<source>Error opening file:</source>
+<target>Errore in apertura file:</target>
+
+<source>Error traversing directory:</source>
+<target>Errore nel percorso della directory:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Loop senza fine attraverso le directory:</target>
+
+<source>Error setting privilege:</source>
+<target>Errore nell'impostazione dei privilegi:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>Entrambi i lati sono cambiati dall'ultima sincronizzazione!</target>
 
@@ -1325,9 +1311,6 @@ Trasferisci file e permessi sulle cartelle (Richiede diritti di Administrator)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Le directory sono dipendenti! Fai attenzione quando configuri le regole di sincronizzazione:</target>
 
-<source>Comparing content of files %x</source>
-<target>Comparazione contenuto del file %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Allocazione di memoria fallita!</target>
 
@@ -1343,15 +1326,15 @@ Trasferisci file e permessi sulle cartelle (Richiede diritti di Administrator)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Symlinks %x hanno stessa data ma differente target!</target>
 
+<source>Comparing content of files %x</source>
+<target>Comparazione contenuto del file %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>Comparazione file in base al contenuto fallita.</target>
 
 <source>Generating file list...</source>
 <target>Generazione lista dei file...</target>
 
-<source>Multiple...</source>
-<target>Multiplo...</target>
-
 <source>Both sides are equal</source>
 <target>Entrambi i lati sono uguali</target>
 
@@ -1370,6 +1353,12 @@ Trasferisci file e permessi sulle cartelle (Richiede diritti di Administrator)
 <source>Delete right file/folder</source>
 <target>Cancella file/cartella di destra</target>
 
+<source>Move file on left</source>
+<target>Sposta il file a sinistra</target>
+
+<source>Move file on right</source>
+<target>Sposta il file a destra</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Sovrascrivi file/cartella di sinistra con quello di destra</target>
 
@@ -1385,6 +1374,9 @@ Trasferisci file e permessi sulle cartelle (Richiede diritti di Administrator)
 <source>Copy file attributes only to right</source>
 <target>Copia i soli attributi file verso destra</target>
 
+<source>Multiple...</source>
+<target>Multiplo...</target>
+
 <source>Deleting file %x</source>
 <target>Eliminazione file %x</target>
 
diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng
index fb788c8d..b3f3e1d1 100644
--- a/BUILD/Languages/japanese.lng
+++ b/BUILD/Languages/japanese.lng
@@ -80,7 +80,7 @@
 <target>検索</target>
 
 <source>Select time span</source>
-<target></target>
+<target>タイムスパンを選択</target>
 
 <source>Show pop-up</source>
 <target>ポップアップ表示</target>
@@ -148,7 +148,7 @@
 <target>サイズ</target>
 
 <source>Date</source>
-<target>データ</target>
+<target>日付</target>
 
 <source>Full path</source>
 <target>フルパス</target>
@@ -168,15 +168,15 @@
 <source>Comparison Result</source>
 <target>比較結果</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>同期データベースの書式に互換性がありません:</target>
-
 <source>Initial synchronization:</source>
 <target>同期処理の初期化:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>FreeFileSync データベースファイルが存在しません:</target>
 
+<source>Incompatible synchronization database format:</source>
+<target>同期データベースの書式に互換性がありません:</target>
+
 <source>Database files do not share a common synchronization session:</source>
 <target>データベースファイルは一般的な同期セッションを共有しません:</target>
 
@@ -239,7 +239,7 @@
 <target>必要なDLLを読み込めません:</target>
 
 <source>Error accessing Volume Shadow Copy Service!</source>
-<target></target>
+<target>ボリュームシャドウ・コピーサービスにアクセス出来ません!</target>
 
 <source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
 <target>WOW64 では、ボリュームシャドウコピーに対応していません、FreeFileSync 64-bit 版をお試しください。</target>
@@ -369,9 +369,6 @@ The command line is executed each time:
 <source>Batch execution</source>
 <target>一括処理を実行</target>
 
-<source>Log-messages:</source>
-<target>ログメッセージ:</target>
-
 <source>Stop</source>
 <target>停止</target>
 
@@ -498,6 +495,24 @@ The command line is executed each time:
 <source>Total amount of data that will be transferred</source>
 <target>転送されたデータの総量</target>
 
+<source>Operation:</source>
+<target>操作:</target>
+
+<source>Items found:</source>
+<target>見つかった要素:</target>
+
+<source>Items remaining:</source>
+<target>残りの要素:</target>
+
+<source>Speed:</source>
+<target>速度:</target>
+
+<source>Time remaining:</source>
+<target>残り時間:</target>
+
+<source>Time elapsed:</source>
+<target>経過時間:</target>
+
 <source>Batch job</source>
 <target>一括処理</target>
 
@@ -546,32 +561,14 @@ The command line is executed each time:
 <source>&Cancel</source>
 <target>キャンセル(&C)</target>
 
-<source>Operation:</source>
-<target>操作:</target>
-
-<source>Items found:</source>
-<target>見つかった要素:</target>
-
-<source>Items remaining:</source>
-<target>残りの要素:</target>
-
-<source>Speed:</source>
-<target>速度:</target>
-
-<source>Time remaining:</source>
-<target>残り時間:</target>
-
-<source>Time elapsed:</source>
-<target>経過時間:</target>
-
 <source>Select variant:</source>
 <target>変数を選択:</target>
 
 <source><Automatic></source>
 <target><自動></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>データベースを使用して、両側アイテムの変更を特定します。 削除、競合は自動的に検出することができます。</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>両側の識別、プロパティの変更特定にデータベースを使用します。削除、リネーム及び競合などは自動的に検出されます</target>
 
 <source>Mirror ->></source>
 <target>ミラー >></target>
@@ -790,30 +787,22 @@ Exclude: \stuff\temp\*
 <target>列を下に移動</target>
 
 <source>Transactional file copy</source>
-<target>Transactional ファイルコピー</target>
+<target>トランザクション・コピーを使用</target>
 
 <source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
 <target>最初に一時ファイル(*.ffs_tmp)に書き込み、それをリネームします。これにより、致命的なエラーが起こっても状態は保証されます</target>
 
 <source>Copy locked files</source>
-<target>ロックされたファイルをコピー</target>
+<target>ロックされたファイルをコピーする</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-ボリュームシャドーコピーを使用して共有/ロックされたファイルをコピー(管理者権限が必要)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>ボリュームシャドーコピーを使用して共有/ロックされたファイルをコピー(管理者権限が必要)</target>
 
 <source>Copy file access permissions</source>
-<target>ファイルのアクセスパーミッションをコピー</target>
+<target>ファイルのアクセスパーミッションをコピーする</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-ファイルとディレクトリのパーミッション転送(管理者権限が必要)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>ファイルとディレクトリのパーミッション転送(管理者権限が必要)</target>
 
 <source>Hidden dialogs:</source>
 <target>ダイアログを隠す</target>
@@ -1123,9 +1112,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Filter: Single pair</source>
 <target>フィルター:単一ペア</target>
 
-<source>Ignore</source>
-<target>無視</target>
-
 <source>Direct</source>
 <target>方向</target>
 
@@ -1274,12 +1260,12 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Error opening file:</source>
 <target>ファイルのオープンに失敗:</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>ディレクトリ移動中に無限ループが発生:</target>
-
 <source>Error traversing directory:</source>
 <target>ディレクトリの移動エラー:</target>
 
+<source>Endless loop when traversing directory:</source>
+<target>ディレクトリ移動中に無限ループが発生:</target>
+
 <source>Error setting privilege:</source>
 <target>特権の設定エラー:</target>
 
@@ -1313,9 +1299,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>ディレクトリが依存関係にあります! 同期規則の設定時には注意してください:</target>
 
-<source>Comparing content of files %x</source>
-<target>ファイル %x の内容を比較中</target>
-
 <source>Memory allocation failed!</source>
 <target>メモリ割り当てに失敗!</target>
 
@@ -1331,15 +1314,15 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>シンボリックリンク %x の日付は同一ですが、異なる対象があります!</target>
 
+<source>Comparing content of files %x</source>
+<target>ファイル %x の内容を比較中</target>
+
 <source>Comparing files by content failed.</source>
 <target>ファイル内容の比較に失敗しました</target>
 
 <source>Generating file list...</source>
 <target>ファイル一覧を作成中...</target>
 
-<source>Multiple...</source>
-<target>複数処理...</target>
-
 <source>Both sides are equal</source>
 <target>両側とも等しく</target>
 
@@ -1358,6 +1341,12 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Delete right file/folder</source>
 <target>右側のファイル/フォルダを削除</target>
 
+<source>Move file on left</source>
+<target>ファイルを左に移動</target>
+
+<source>Move file on right</source>
+<target>ファイルを右に移動</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>右側のものを左側のファイル/フォルダに上書き</target>
 
@@ -1373,6 +1362,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Copy file attributes only to right</source>
 <target>ファイル属性のみ右側にコピー</target>
 
+<source>Multiple...</source>
+<target>複数処理...</target>
+
 <source>Deleting file %x</source>
 <target>ファイル %x を削除中</target>
 
diff --git a/BUILD/Languages/korean.lng b/BUILD/Languages/korean.lng
index 561c10cd..653fb7e9 100644
--- a/BUILD/Languages/korean.lng
+++ b/BUILD/Languages/korean.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>실시간 동기화 - 자동 동기화</target>
 
-<source>Browse</source>
-<target>찾아보기</target>
-
-<source>Windows Error Code %x:</source>
-<target>윈도우 에러 코드 %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>리눅스 에러 코드 %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>잘못된 명령줄 : %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>심볼릭 링크를 해결하던 중 발생한 오류 :</target>
-
-<source>Show pop-up</source>
-<target>팝업 보이기</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>오류 또는 경고에 대한 팝업 보이기</target>
-
-<source>Ignore errors</source>
-<target>오류 무시</target>
-
-<source>Hide all error and warning messages</source>
-<target>모든 오류/경고 메세지 숨기기</target>
-
-<source>Exit instantly</source>
-<target>즉시 종료</target>
-
-<source>Abort synchronization immediately</source>
-<target>동기화 작업 즉시 중단</target>
-
 <source>Select alternate comparison settings</source>
 <target>대체 비교 설정 선택</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>시간간격(타임스팬) 선택</target>
 
+<source>Show pop-up</source>
+<target>팝업 보이기</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>오류 또는 경고에 대한 팝업 보이기</target>
+
+<source>Ignore errors</source>
+<target>오류 무시</target>
+
+<source>Hide all error and warning messages</source>
+<target>모든 오류/경고 메세지 숨기기</target>
+
+<source>Exit instantly</source>
+<target>즉시 종료</target>
+
+<source>Abort synchronization immediately</source>
+<target>동기화 작업 즉시 중단</target>
+
+<source>Browse</source>
+<target>찾아보기</target>
+
+<source>Error reading from synchronization database:</source>
+<target>동기화 데이터베이스로부터 읽어 들이던 중 발생한 오류 :</target>
+
+<source>Error writing to synchronization database:</source>
+<target>동기화 데이터베이스에 쓰던 중 발생한 오류 :</target>
+
+<source>Invalid command line: %x</source>
+<target>잘못된 명령줄 : %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>윈도우 에러 코드 %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>리눅스 에러 코드 %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>심볼릭 링크를 해결하던 중 발생한 오류 :</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -162,17 +168,14 @@
 <source>Comparison Result</source>
 <target>비교 결과</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>호환되지 않는 동기화 데이터베이스 형식 :</target>
-
 <source>Initial synchronization:</source>
 <target>초기 동기화 :</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>FreeFileSync 데이터베이스 파일 중 하나가 아직 존재하지 않습니다 :</target>
 
-<source>Error reading from synchronization database:</source>
-<target>동기화 데이터베이스로부터 읽어 들이던 중 발생한 오류 :</target>
+<source>Incompatible synchronization database format:</source>
+<target>호환되지 않는 동기화 데이터베이스 형식 :</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>데이터베이스 파일이 공통 동기화 세션을 공유하지 않습니다 :</target>
@@ -197,12 +200,18 @@
 <pluralform>%x초</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>드래그 && 드랍 (마우스로 파일 끌어다 놓기)</target>
+
 <source>Info</source>
 <target>정보</target>
 
 <source>Fatal Error</source>
 <target>치명적 오류</target>
 
+<source>Error reading file:</source>
+<target>파일을 읽던 중 발생한 오류 :</target>
+
 <source>Scanning:</source>
 <target>스캔 :</target>
 
@@ -220,15 +229,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>잘못된 FreeFileSync 설정 파일!</target>
 
-<source>File does not exist:</source>
-<target>파일이 존재하지 않습니다 :</target>
-
 <source>Error parsing configuration file:</source>
 <target>설정파일 분석 중 발생한 오류 :</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>휴지통으로 이동 중 발생한 오류 :</target>
+
+<source>Could not load a required DLL:</source>
+<target>필요한 DLL을 로드할 수 없습니다 :</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>볼륨 섀도 복사본 서비스에 액세스하던 중 오류 발생!</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>WOW64 에서의 Shadow Copy 는 지원하지 않습니다. FreeFileSync 64-bit 버전을 사용하세요.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>파일 볼륨 이름을 결정할 수 없습니다 :</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>볼륨 이름 %x 이(가) 파일 이름 %y 의 일부가 아닙니다!</target>
+
 <source>/sec</source>
 <target>/초</target>
 
+<source>File does not exist:</source>
+<target>파일이 존재하지 않습니다 :</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>다음 XML 노드 값을 읽어 들일 수 없습니다 :</target>
+
 <source>S&ave configuration...</source>
 <target>설정 저장</target>
 
@@ -321,138 +351,6 @@ The command line is executed each time:
 <source>A directory input field is empty.</source>
 <target>디렉토리 입력 필드가 비어 있습니다.</target>
 
-<source>Drag && drop</source>
-<target>드래그 && 드랍</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>디렉토리 모니터링을 초기화 할 수 없습니다 :</target>
-
-<source>Error when monitoring directories.</source>
-<target>디렉토리 모니터링 중 발생한 오류 :</target>
-
-<source>Conversion error:</source>
-<target>변환 오류 :</target>
-
-<source>Error deleting file:</source>
-<target>파일 삭제 중 발생한 오류 :</target>
-
-<source>Error moving file:</source>
-<target>파일 이동 중 발생한 오류 :</target>
-
-<source>Target file already existing!</source>
-<target>대상 파일이 이미 존재합니다!</target>
-
-<source>Error moving directory:</source>
-<target>디렉토리 이동 중 발생한 오류 :</target>
-
-<source>Target directory already existing!</source>
-<target>대상 디렉토리가 이미 존재합니다!</target>
-
-<source>Error deleting directory:</source>
-<target>디렉토리 삭제 중 발생한 오류 :</target>
-
-<source>Error changing modification time:</source>
-<target>시간 수정 중 발생한 오류 :</target>
-
-<source>Error loading library function:</source>
-<target>라이브러리 기능 로드 중 발생한 오류 :</target>
-
-<source>Error reading security context:</source>
-<target>보안 컨텍스트를 읽던 중 발생한 오류 :</target>
-
-<source>Error writing security context:</source>
-<target>보안 컨텍스트를 쓰던 중 발생한 오류 :</target>
-
-<source>Error copying file permissions:</source>
-<target>파일 권한 복사 중 발생한 오류 :</target>
-
-<source>Error creating directory:</source>
-<target>디렉토리 생성 중 발생한 오류 :</target>
-
-<source>Error copying symbolic link:</source>
-<target>심볼릭 링크 복사 중 발생한 오류 :</target>
-
-<source>Error copying file:</source>
-<target>파일 복사 중 발생한 오류 :</target>
-
-<source>Error opening file:</source>
-<target>파일을 열던 중 발생한 오류 :</target>
-
-<source>Error writing file:</source>
-<target>파일을 쓰던 중 발생한 오류 :</target>
-
-<source>Error reading file:</source>
-<target>파일을 읽던 중 발생한 오류 :</target>
-
-<source>Operation aborted!</source>
-<target>작업 중단!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>디렉토리 이동 중 무한 루프 발생 :</target>
-
-<source>Error traversing directory:</source>
-<target>디렉토리 이동 중 발생한 오류 :</target>
-
-<source>Error setting privilege:</source>
-<target>권한 설정 중 발생한 오류 :</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>휴지통으로 이동 중 발생한 오류 :</target>
-
-<source>Could not load a required DLL:</source>
-<target>필요한 DLL을 로드할 수 없습니다 :</target>
-
-<source>Error writing to synchronization database:</source>
-<target>동기화 데이터베이스에 쓰던 중 발생한 오류 :</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>볼륨 섀도 복사본 서비스에 액세스하던 중 오류 발생!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>WOW64 에서의 Shadow Copy 는 지원하지 않습니다. FreeFileSync 64-bit 버전을 사용하세요.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>파일 볼륨 이름을 결정할 수 없습니다 :</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>볼륨 이름 %x 이(가) 파일 이름 %y 의 일부가 아닙니다!</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x분</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x시간</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x일</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>다음 XML 노드 값을 읽어 들일 수 없습니다 :</target>
-
 <source>Logging</source>
 <target>로그 중</target>
 
@@ -471,9 +369,6 @@ The command line is executed each time:
 <source>Batch execution</source>
 <target>일괄 실행</target>
 
-<source>Log-messages:</source>
-<target>로그 메세지 :</target>
-
 <source>Stop</source>
 <target>정지</target>
 
@@ -600,6 +495,24 @@ The command line is executed each time:
 <source>Total amount of data that will be transferred</source>
 <target>전송하게 될 전체 데이터 용량</target>
 
+<source>Operation:</source>
+<target>작업 :</target>
+
+<source>Items found:</source>
+<target>발견된 요소 :</target>
+
+<source>Items remaining:</source>
+<target>남은 요소 :</target>
+
+<source>Speed:</source>
+<target>속도 :</target>
+
+<source>Time remaining:</source>
+<target>남은 시간 :</target>
+
+<source>Time elapsed:</source>
+<target>경과 시간 :</target>
+
 <source>Batch job</source>
 <target>일괄 작업</target>
 
@@ -648,32 +561,14 @@ The command line is executed each time:
 <source>&Cancel</source>
 <target>취소(&C)</target>
 
-<source>Operation:</source>
-<target>작업 :</target>
-
-<source>Items found:</source>
-<target>발견된 요소 :</target>
-
-<source>Items remaining:</source>
-<target>남은 요소 :</target>
-
-<source>Speed:</source>
-<target>속도 :</target>
-
-<source>Time remaining:</source>
-<target>남은 시간 :</target>
-
-<source>Time elapsed:</source>
-<target>경과 시간 :</target>
-
 <source>Select variant:</source>
 <target>옵션 선택 :</target>
 
 <source><Automatic></source>
 <target><자동></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>데이터베이스를 사용하여, 양측 변경사항을 확인합니다. 삭제 및 충돌 내역은 자동 감지됩니다.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>데이터베이스를 활용하여 양측의 변경사항을 확인하고 반영합니다. 파일 삭제/명칭 변경/충돌은 자동으로 감지됩니다.</target>
 
 <source>Mirror ->></source>
 <target>미러 ->></target>
@@ -895,27 +790,19 @@ Exclude: \stuff\temp\*
 <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></target>
+<target>임시 파일 (*.ffs_tmp)로 우선 작성 후, 파일명을 변경합니다. 이러면 치명적인 오류가 발생하더라도 일관된 상태를 보장할 수 있습니다.</target>
 
 <source>Copy locked files</source>
 <target>락 걸린 파일 복사</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Volume Shadow Copy를 사용하여 공유 또는 락 걸린 파일을 복사 (관리자 권한 필요)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Volume Shadow Copy를 사용하여 공유 또는 락 걸린 파일을 복사 (관리자 권한 필요)</target>
 
 <source>Copy file access permissions</source>
 <target>파일 접근 권한 복사</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-파일 및 디렉토리 권한 전송 (관리자 권한이 필요함)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>파일 및 디렉토리 권한 전송 (관리자 권한이 필요함)</target>
 
 <source>Hidden dialogs:</source>
 <target>다이얼로그 숨기기</target>
@@ -947,6 +834,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>&Find next</source>
 <target>다음 검색(&F)</target>
 
+<source>Operation aborted!</source>
+<target>작업 중단!</target>
+
 <source>Main bar</source>
 <target>메인 바</target>
 
@@ -987,16 +877,16 @@ Transfer file and directory permissions (Requires Administrator rights)
 <target>열 자동정렬</target>
 
 <source>Icon size:</source>
-<target></target>
+<target>아이콘 크기</target>
 
 <source>Small</source>
-<target></target>
+<target>작게</target>
 
 <source>Medium</source>
-<target></target>
+<target>중간</target>
 
 <source>Large</source>
-<target></target>
+<target>크게</target>
 
 <source>Include all rows</source>
 <target>모든 행 포함</target>
@@ -1124,6 +1014,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>File list exported!</source>
 <target>파일 리스트 내보내기 완료!</target>
 
+<source>Error writing file:</source>
+<target>파일을 쓰던 중 발생한 오류 :</target>
+
 <source>Batch file created successfully!</source>
 <target>일괄 파일이 성공적으로 생성 됐습니다!</target>
 
@@ -1219,9 +1112,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Filter: Single pair</source>
 <target>필터 : 단일 페어(짝)</target>
 
-<source>Ignore</source>
-<target>무시</target>
-
 <source>Direct</source>
 <target>다이렉트</target>
 
@@ -1283,6 +1173,102 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Move files into a time-stamped subdirectory</source>
 <target>파일을 타임스탬프 된 서브 폴더로 이동</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x분</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x시간</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x일</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>디렉토리 모니터링을 초기화 할 수 없습니다 :</target>
+
+<source>Error when monitoring directories.</source>
+<target>디렉토리 모니터링 중 발생한 오류 :</target>
+
+<source>Conversion error:</source>
+<target>변환 오류 :</target>
+
+<source>Error deleting file:</source>
+<target>파일 삭제 중 발생한 오류 :</target>
+
+<source>Error moving file:</source>
+<target>파일 이동 중 발생한 오류 :</target>
+
+<source>Target file already existing!</source>
+<target>대상 파일이 이미 존재합니다!</target>
+
+<source>Error moving directory:</source>
+<target>디렉토리 이동 중 발생한 오류 :</target>
+
+<source>Target directory already existing!</source>
+<target>대상 디렉토리가 이미 존재합니다!</target>
+
+<source>Error deleting directory:</source>
+<target>디렉토리 삭제 중 발생한 오류 :</target>
+
+<source>Error changing modification time:</source>
+<target>시간 수정 중 발생한 오류 :</target>
+
+<source>Error loading library function:</source>
+<target>라이브러리 기능 로드 중 발생한 오류 :</target>
+
+<source>Error reading security context:</source>
+<target>보안 컨텍스트를 읽던 중 발생한 오류 :</target>
+
+<source>Error writing security context:</source>
+<target>보안 컨텍스트를 쓰던 중 발생한 오류 :</target>
+
+<source>Error copying file permissions:</source>
+<target>파일 권한 복사 중 발생한 오류 :</target>
+
+<source>Error creating directory:</source>
+<target>디렉토리 생성 중 발생한 오류 :</target>
+
+<source>Error copying symbolic link:</source>
+<target>심볼릭 링크 복사 중 발생한 오류 :</target>
+
+<source>Error copying file:</source>
+<target>파일 복사 중 발생한 오류 :</target>
+
+<source>Error opening file:</source>
+<target>파일을 열던 중 발생한 오류 :</target>
+
+<source>Error traversing directory:</source>
+<target>디렉토리 이동 중 발생한 오류 :</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>디렉토리 이동 중 무한 루프 발생 :</target>
+
+<source>Error setting privilege:</source>
+<target>권한 설정 중 발생한 오류 :</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>마지막 동기화 작업 이후, 양측 모두 변경 되었습니다!</target>
 
@@ -1313,9 +1299,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>디렉토리가 의존 관계에 있습니다. 동기화 규칙 설정시 주의하십시오.</target>
 
-<source>Comparing content of files %x</source>
-<target>파일 %x 내용 별 비교 중</target>
-
 <source>Memory allocation failed!</source>
 <target>메모리 할당 실패!</target>
 
@@ -1331,15 +1314,15 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>심링크 %x 의 날짜는 같으나, 대상이 다릅니다!</target>
 
+<source>Comparing content of files %x</source>
+<target>파일 %x 내용 별 비교 중</target>
+
 <source>Comparing files by content failed.</source>
 <target>내용 별 파일 비교 실패</target>
 
 <source>Generating file list...</source>
 <target>파일 리스트 생성 중...</target>
 
-<source>Multiple...</source>
-<target>다중처리 (멀티플) 작업...</target>
-
 <source>Both sides are equal</source>
 <target>양측이 같음</target>
 
@@ -1358,6 +1341,12 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Delete right file/folder</source>
 <target>우측 파일/폴더 삭제</target>
 
+<source>Move file on left</source>
+<target>좌측 파일 이동</target>
+
+<source>Move file on right</source>
+<target>우측 파일 이동</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>우측 파일/폴더로 좌측 파일/폴더 덮어쓰기</target>
 
@@ -1373,6 +1362,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Copy file attributes only to right</source>
 <target>파일 속성만 우측으로 복사</target>
 
+<source>Multiple...</source>
+<target>다중처리 (멀티플) 작업...</target>
+
 <source>Deleting file %x</source>
 <target>파일 %x 삭제 중</target>
 
diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng
index 6ce2e79b..5c874c53 100644
--- a/BUILD/Languages/polish.lng
+++ b/BUILD/Languages/polish.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatyczna Synchronizacja</target>
 
-<source>Browse</source>
-<target>Przeglądaj</target>
-
-<source>Windows Error Code %x:</source>
-<target>Błąd systemu Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Błąd systemu linux %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>Nieprawidłowa komenda: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>Błąd odczytu dowiązania symbolicznego:</target>
-
-<source>Show pop-up</source>
-<target>Pokazuj okna pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Pokazuj okna pop-up dla błędów i ostrzeżeń</target>
-
-<source>Ignore errors</source>
-<target>Ignoruj błędy</target>
-
-<source>Hide all error and warning messages</source>
-<target>Ukryj wszystkie informacje błędach i ostrzeżeniach</target>
-
-<source>Exit instantly</source>
-<target>Wyjdź natychmiast</target>
-
-<source>Abort synchronization immediately</source>
-<target>Natychmiast zakończ synchronizację</target>
-
 <source>Select alternate comparison settings</source>
 <target>Określ alternatywne ustawienia porównywania</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>Określ przedział czasowy</target>
 
+<source>Show pop-up</source>
+<target>Pokazuj okna pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Pokazuj okna pop-up dla błędów i ostrzeżeń</target>
+
+<source>Ignore errors</source>
+<target>Ignoruj błędy</target>
+
+<source>Hide all error and warning messages</source>
+<target>Ukryj wszystkie informacje błędach i ostrzeżeniach</target>
+
+<source>Exit instantly</source>
+<target>Wyjdź natychmiast</target>
+
+<source>Abort synchronization immediately</source>
+<target>Natychmiast zakończ synchronizację</target>
+
+<source>Browse</source>
+<target>Przeglądaj</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Błąd odczytu z bazy danych synchronizacji:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Błąd zapisu do bazy danych synchronizacji:</target>
+
+<source>Invalid command line: %x</source>
+<target>Nieprawidłowa komenda: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Błąd systemu Windows %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Błąd systemu linux %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Błąd odczytu dowiązania symbolicznego:</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -164,17 +170,14 @@
 <source>Comparison Result</source>
 <target>Rezultat porównywania</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Niepoprawny format bazy danych dla synchronizacji:</target>
-
 <source>Initial synchronization:</source>
 <target>Wstępna synchronizacja:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>Jeden z plików bazy danych FreeFileSync nie istnieje:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Błąd odczytu z bazy danych synchronizacji:</target>
+<source>Incompatible synchronization database format:</source>
+<target>Niepoprawny format bazy danych dla synchronizacji:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>Pliki danych nie współdzielą wspólnej sesji synchronizacji:</target>
@@ -201,12 +204,18 @@
 <pluralform>%x sekund</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Drag && Drop</target>
+
 <source>Info</source>
 <target>Info</target>
 
 <source>Fatal Error</source>
 <target>Błąd krytyczny</target>
 
+<source>Error reading file:</source>
+<target>Błąd odczytu pliku:</target>
+
 <source>Scanning:</source>
 <target>Skanowanie:</target>
 
@@ -226,15 +235,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Nieprawidłowy plik konfiguracyjny!</target>
 
-<source>File does not exist:</source>
-<target>Plik nie istnieje:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Błąd parsowania pliku konfiguracyjnego:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Błąd podczas przenoszenia do kosza:</target>
+
+<source>Could not load a required DLL:</source>
+<target>Nie można załadować wymaganej biblioteki DLL:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>Błąd podczas dostępdu do usługi Volume Shadow Copy!</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>Tworzenie Shadow Copies dla WOW64 nie jest obsługiwane. Zainstaluj 64 bitową wersję FreeFileSync.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Nie można określić nazwy dysku dla pliku:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Dysk %x nie jest częścią pliku %y!</target>
+
 <source>/sec</source>
 <target>/sekundę</target>
 
+<source>File does not exist:</source>
+<target>Plik nie istnieje:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Nie można odczytać wartości dla danych gałęzi XML:</target>
+
 <source>S&ave configuration...</source>
 <target>Z&apisz konfigurację...</target>
 
@@ -327,144 +357,6 @@ Komenda jest wykonwywana za każdym razem gdy:
 <source>A directory input field is empty.</source>
 <target>Pole ze ścieżką katalogu jest puste.</target>
 
-<source>Drag && drop</source>
-<target>Drag && Drop</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>Nie można uruchomić monitora katalogów:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Błąd podczas monitorowania katalogów.</target>
-
-<source>Conversion error:</source>
-<target>Błąd konwersji:</target>
-
-<source>Error deleting file:</source>
-<target>Błąd podczas usuwania pliku:</target>
-
-<source>Error moving file:</source>
-<target>Błąd podczas przenoszenia pliku:</target>
-
-<source>Target file already existing!</source>
-<target>Plik docelowy już istnieje!</target>
-
-<source>Error moving directory:</source>
-<target>Błąd podczas przenoszenia katalogu:</target>
-
-<source>Target directory already existing!</source>
-<target>Katalog docelowy już istnieje!</target>
-
-<source>Error deleting directory:</source>
-<target>Błąd podczas usuwania katalogu:</target>
-
-<source>Error changing modification time:</source>
-<target>Błąd zmiany godziny modyfikacji:</target>
-
-<source>Error loading library function:</source>
-<target>Błąd wczytywania funkcji:</target>
-
-<source>Error reading security context:</source>
-<target>Błąd odczytu kontekstu bezpieczeństwa:</target>
-
-<source>Error writing security context:</source>
-<target>Błąd zapisu kontekstu bezpieczeństwa:</target>
-
-<source>Error copying file permissions:</source>
-<target>Błąd podczas kopiowania uprawnień pliku:</target>
-
-<source>Error creating directory:</source>
-<target>Błąd podczas tworzenia katalogu:</target>
-
-<source>Error copying symbolic link:</source>
-<target>Błąd podczas kopiowania dowiązania symbolicznego (symlink)</target>
-
-<source>Error copying file:</source>
-<target>Błąd podczas kopiowania pliku:</target>
-
-<source>Error opening file:</source>
-<target>Błąd odczytu pliku:</target>
-
-<source>Error writing file:</source>
-<target>Błąd zapisu pliku:</target>
-
-<source>Error reading file:</source>
-<target>Błąd odczytu pliku:</target>
-
-<source>Operation aborted!</source>
-<target>Operacja przerwana!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Zapętlenie podczas przeglądania katalogu:</target>
-
-<source>Error traversing directory:</source>
-<target>Błąd podczas odczytywania katalogu:</target>
-
-<source>Error setting privilege:</source>
-<target>Błąd ustawiania uprawnień:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Błąd podczas przenoszenia do kosza:</target>
-
-<source>Could not load a required DLL:</source>
-<target>Nie można załadować wymaganej biblioteki DLL:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Błąd zapisu do bazy danych synchronizacji:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Błąd podczas dostępdu do usługi Volume Shadow Copy!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Tworzenie Shadow Copies dla WOW64 nie jest obsługiwane. Zainstaluj 64 bitową wersję FreeFileSync.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>Nie można określić nazwy dysku dla pliku:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>Dysk %x nie jest częścią pliku %y!</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 minuta</pluralform>
-<pluralform>%x minuty</pluralform>
-<pluralform>%x minut</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 godzina</pluralform>
-<pluralform>%x godziny</pluralform>
-<pluralform>%x godzin</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 dzień</pluralform>
-<pluralform>%x dni</pluralform>
-<pluralform>%x dni</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>Nie można odczytać wartości dla danych gałęzi XML:</target>
-
 <source>Logging</source>
 <target>Tworzenie logów</target>
 
@@ -483,9 +375,6 @@ Komenda jest wykonwywana za każdym razem gdy:
 <source>Batch execution</source>
 <target>Uruchomienie pliku wsadowego</target>
 
-<source>Log-messages:</source>
-<target>Logi:</target>
-
 <source>Stop</source>
 <target>Zatrzymaj</target>
 
@@ -612,6 +501,24 @@ Komenda jest wykonwywana za każdym razem gdy:
 <source>Total amount of data that will be transferred</source>
 <target>Liczba danych do przekopiowania</target>
 
+<source>Operation:</source>
+<target>Operacja:</target>
+
+<source>Items found:</source>
+<target>Znalezione elementy:</target>
+
+<source>Items remaining:</source>
+<target>Pozostałe elementy:</target>
+
+<source>Speed:</source>
+<target>Prędkość:</target>
+
+<source>Time remaining:</source>
+<target>Pozostały czas:</target>
+
+<source>Time elapsed:</source>
+<target>Czas:</target>
+
 <source>Batch job</source>
 <target>Plik wsadowy</target>
 
@@ -660,32 +567,14 @@ Komenda jest wykonwywana za każdym razem gdy:
 <source>&Cancel</source>
 <target>&Anuluj</target>
 
-<source>Operation:</source>
-<target>Operacja:</target>
-
-<source>Items found:</source>
-<target>Znalezione elementy:</target>
-
-<source>Items remaining:</source>
-<target>Pozostałe elementy:</target>
-
-<source>Speed:</source>
-<target>Prędkość:</target>
-
-<source>Time remaining:</source>
-<target>Pozostały czas:</target>
-
-<source>Time elapsed:</source>
-<target>Czas:</target>
-
 <source>Select variant:</source>
 <target>Wybierz wariant:</target>
 
 <source><Automatic></source>
 <target><Automatycznie></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Wykryj i zastosuj zmiany po obu stronach używając bazy danych. Usunięcia i konflikty są wykrywane automatycznie.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Znajdź i zastosuj zmiany po obu stronach przy pomocy bazy danych. Usunięnia, zmiany nazwy plików oraz konflikty są usuwane automatycznie.</target>
 
 <source>Mirror ->></source>
 <target>Lustrzana ->></target>
@@ -907,27 +796,19 @@ Wyklucz: \moje\temp\*
 <target>Transakcyjne kopiowanie pliku</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></target>
+<target>Stwórz tymczasowy plik (*.ffs_tmp) następnie zamień jego nazwę. Gwarantuje to spójność nawet po wystąpieniu błędu.</target>
 
 <source>Copy locked files</source>
 <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>
+<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>
 
 <source>Copy file access permissions</source>
 <target>Kopiuj uprawnienia plików</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Transfer uprawnień plików i katalogów (Wymaga uprawnień Administratora)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Transfer uprawnień plików i katalogów (Wymaga uprawnień Administratora)</target>
 
 <source>Hidden dialogs:</source>
 <target>Ukryte dialogi:</target>
@@ -959,6 +840,9 @@ Transfer uprawnień plików i katalogów (Wymaga uprawnień Administratora)
 <source>&Find next</source>
 <target>&Znajdź następny</target>
 
+<source>Operation aborted!</source>
+<target>Operacja przerwana!</target>
+
 <source>Main bar</source>
 <target>Główny pasek</target>
 
@@ -999,16 +883,16 @@ Transfer uprawnień plików i katalogów (Wymaga uprawnień Administratora)
 <target>Autodopasowanie kolumn</target>
 
 <source>Icon size:</source>
-<target></target>
+<target>Rozmiar ikony:</target>
 
 <source>Small</source>
-<target></target>
+<target>Mały</target>
 
 <source>Medium</source>
-<target></target>
+<target>Średni</target>
 
 <source>Large</source>
-<target></target>
+<target>Duży</target>
 
 <source>Include all rows</source>
 <target>Dołącz wszystkie rzędy</target>
@@ -1136,6 +1020,9 @@ Transfer uprawnień plików i katalogów (Wymaga uprawnień Administratora)
 <source>File list exported!</source>
 <target>Lista plików wyeksportowana!</target>
 
+<source>Error writing file:</source>
+<target>Błąd zapisu pliku:</target>
+
 <source>Batch file created successfully!</source>
 <target>Plik wsadowy utworzony pomyślnie!</target>
 
@@ -1239,9 +1126,6 @@ Transfer uprawnień plików i katalogów (Wymaga uprawnień Administratora)
 <source>Filter: Single pair</source>
 <target>Filtr: Pojedyńcza para</target>
 
-<source>Ignore</source>
-<target>Ignoruj</target>
-
 <source>Direct</source>
 <target>Bezpośrednio</target>
 
@@ -1307,6 +1191,108 @@ Transfer uprawnień plików i katalogów (Wymaga uprawnień Administratora)
 <source>Move files into a time-stamped subdirectory</source>
 <target>Przenieś pliki do oznaczonego podkatalogu</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 minuta</pluralform>
+<pluralform>%x minuty</pluralform>
+<pluralform>%x minut</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 godzina</pluralform>
+<pluralform>%x godziny</pluralform>
+<pluralform>%x godzin</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 dzień</pluralform>
+<pluralform>%x dni</pluralform>
+<pluralform>%x dni</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Nie można uruchomić monitora katalogów:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Błąd podczas monitorowania katalogów.</target>
+
+<source>Conversion error:</source>
+<target>Błąd konwersji:</target>
+
+<source>Error deleting file:</source>
+<target>Błąd podczas usuwania pliku:</target>
+
+<source>Error moving file:</source>
+<target>Błąd podczas przenoszenia pliku:</target>
+
+<source>Target file already existing!</source>
+<target>Plik docelowy już istnieje!</target>
+
+<source>Error moving directory:</source>
+<target>Błąd podczas przenoszenia katalogu:</target>
+
+<source>Target directory already existing!</source>
+<target>Katalog docelowy już istnieje!</target>
+
+<source>Error deleting directory:</source>
+<target>Błąd podczas usuwania katalogu:</target>
+
+<source>Error changing modification time:</source>
+<target>Błąd zmiany godziny modyfikacji:</target>
+
+<source>Error loading library function:</source>
+<target>Błąd wczytywania funkcji:</target>
+
+<source>Error reading security context:</source>
+<target>Błąd odczytu kontekstu bezpieczeństwa:</target>
+
+<source>Error writing security context:</source>
+<target>Błąd zapisu kontekstu bezpieczeństwa:</target>
+
+<source>Error copying file permissions:</source>
+<target>Błąd podczas kopiowania uprawnień pliku:</target>
+
+<source>Error creating directory:</source>
+<target>Błąd podczas tworzenia katalogu:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Błąd podczas kopiowania dowiązania symbolicznego (symlink)</target>
+
+<source>Error copying file:</source>
+<target>Błąd podczas kopiowania pliku:</target>
+
+<source>Error opening file:</source>
+<target>Błąd odczytu pliku:</target>
+
+<source>Error traversing directory:</source>
+<target>Błąd podczas odczytywania katalogu:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Zapętlenie podczas przeglądania katalogu:</target>
+
+<source>Error setting privilege:</source>
+<target>Błąd ustawiania uprawnień:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>Obie strony uległy zmianie od ostatniej synchronizacji!</target>
 
@@ -1337,9 +1323,6 @@ Transfer uprawnień plików i katalogów (Wymaga uprawnień Administratora)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Katalogi są zależne! Pamiętaj o tym podczas ustawiania zasad synchronizacji:</target>
 
-<source>Comparing content of files %x</source>
-<target>Porównywanie zawartości plików %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Błąd alokacji zasobów!</target>
 
@@ -1355,15 +1338,15 @@ Transfer uprawnień plików i katalogów (Wymaga uprawnień Administratora)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Dowiązanie symboliczne %x ma te same dane, ale inny cel!</target>
 
+<source>Comparing content of files %x</source>
+<target>Porównywanie zawartości plików %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>Porównywanie przez zawartość zakończone niepowodzeniem.</target>
 
 <source>Generating file list...</source>
 <target>Generowanie listy plików...</target>
 
-<source>Multiple...</source>
-<target>Wiele...</target>
-
 <source>Both sides are equal</source>
 <target>Obie strony są równe</target>
 
@@ -1382,6 +1365,12 @@ Transfer uprawnień plików i katalogów (Wymaga uprawnień Administratora)
 <source>Delete right file/folder</source>
 <target>Usuń plik/katalog po prawej stronie</target>
 
+<source>Move file on left</source>
+<target>Przenieś plik na lewą stronę</target>
+
+<source>Move file on right</source>
+<target>Przenieś plik na prawą stronę</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Nadpisz plik/katalog po lewej stronie tym po prawej</target>
 
@@ -1397,6 +1386,9 @@ Transfer uprawnień plików i katalogów (Wymaga uprawnień Administratora)
 <source>Copy file attributes only to right</source>
 <target>Kopiuj atrybuty plików tylko na prawą stronę</target>
 
+<source>Multiple...</source>
+<target>Wiele...</target>
+
 <source>Deleting file %x</source>
 <target>Usuwanie pliku %x</target>
 
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index 97603be2..a108cdc3 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronização Automática</target>
 
-<source>Browse</source>
-<target>Procurar</target>
-
-<source>Windows Error Code %x:</source>
-<target>Código de erro do Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Código de erro do Linux %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>Linha de comando inválida: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>Erro na resolução do link simbólico:</target>
-
-<source>Show pop-up</source>
-<target>Mostrar popup</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Mostrar popup em caso de erros ou avisos</target>
-
-<source>Ignore errors</source>
-<target>Ignorar erros</target>
-
-<source>Hide all error and warning messages</source>
-<target>Ocultar todas as mensagens de erro/aviso</target>
-
-<source>Exit instantly</source>
-<target>Sair imediatamente</target>
-
-<source>Abort synchronization immediately</source>
-<target>Abortar sincronização imediatamente</target>
-
 <source>Select alternate comparison settings</source>
 <target>Selecionar opções alternativas de comparação</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>Selecionar intervalo de tempo</target>
 
+<source>Show pop-up</source>
+<target>Mostrar popup</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Mostrar popup em caso de erros ou avisos</target>
+
+<source>Ignore errors</source>
+<target>Ignorar erros</target>
+
+<source>Hide all error and warning messages</source>
+<target>Ocultar todas as mensagens de erro/aviso</target>
+
+<source>Exit instantly</source>
+<target>Sair imediatamente</target>
+
+<source>Abort synchronization immediately</source>
+<target>Abortar sincronização imediatamente</target>
+
+<source>Browse</source>
+<target>Procurar</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Erro ao ler a base de dados de sincronização:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Erro na escrita da base de dados de sincronização:</target>
+
+<source>Invalid command line: %x</source>
+<target>Linha de comando inválida: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Código de erro do Windows %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Código de erro do Linux %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Erro na resolução do link simbólico:</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -163,17 +169,14 @@
 <source>Comparison Result</source>
 <target>Resultados da comparação</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Formato de base de dados de sincronização incompatível:</target>
-
 <source>Initial synchronization:</source>
 <target>Sincronização inicial:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>Um dos ficheiros da base de dados não existe:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Erro ao ler a base de dados de sincronização:</target>
+<source>Incompatible synchronization database format:</source>
+<target>Formato de base de dados de sincronização incompatível:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>Bases de dados não partilham a mesma sessão de sincronização:</target>
@@ -199,12 +202,18 @@
 <pluralform>%x segs</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Arrastar && Largar</target>
+
 <source>Info</source>
 <target>Info</target>
 
 <source>Fatal Error</source>
 <target>Erro crítico</target>
 
+<source>Error reading file:</source>
+<target>Erro de leitura de ficheiro:</target>
+
 <source>Scanning:</source>
 <target>A pesquisar:</target>
 
@@ -223,15 +232,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Ficheiro de configuração inválido!</target>
 
-<source>File does not exist:</source>
-<target>O ficheiro não existe:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Erro de leitura do ficheiro de configuração:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Erro ao mover para a Reciclagem:</target>
+
+<source>Could not load a required DLL:</source>
+<target>Não foi possível carregar a DLL:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>Erro no acesso ao serviço Volume Shadow Copy!</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>Fazer cópias fantasma em WOW64 não é suportado. Por favor usar a versão 64-bit.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Não é possível determinar o nome do volume para o ficheiro:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Nome do volume %x não faz parte do ficheiro %y!</target>
+
 <source>/sec</source>
 <target>/seg</target>
 
+<source>File does not exist:</source>
+<target>O ficheiro não existe:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Não foi possível ler os valores dos seguintes nós XML:</target>
+
 <source>S&ave configuration...</source>
 <target>G&uardar a configuração...</target>
 
@@ -324,141 +354,6 @@ A linha de comandos é executada cada vez que:
 <source>A directory input field is empty.</source>
 <target>Um campo de directório está vazio.</target>
 
-<source>Drag && drop</source>
-<target>Arrastar && Largar</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>Não é possível iniciar monitorização do directório:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Erro ao monitorizar os directórios.</target>
-
-<source>Conversion error:</source>
-<target>Erro de conversão:</target>
-
-<source>Error deleting file:</source>
-<target>Erro ao eliminar o ficheiro:</target>
-
-<source>Error moving file:</source>
-<target>Erro ao mover o ficheiro:</target>
-
-<source>Target file already existing!</source>
-<target>Ficheiro de destino já existe!</target>
-
-<source>Error moving directory:</source>
-<target>Erro ao mover o directório:</target>
-
-<source>Target directory already existing!</source>
-<target>Directório de destino já existe!</target>
-
-<source>Error deleting directory:</source>
-<target>Erro ao eliminar a pasta:</target>
-
-<source>Error changing modification time:</source>
-<target>Erro ao mudar a hora de modificação:</target>
-
-<source>Error loading library function:</source>
-<target>Erro ao carregar a livraria:</target>
-
-<source>Error reading security context:</source>
-<target>Erro ao ler contexto de segurança:</target>
-
-<source>Error writing security context:</source>
-<target>Erro de escrita no contexto de segurança:</target>
-
-<source>Error copying file permissions:</source>
-<target>Erro ao copiar permissões dos ficheiros:</target>
-
-<source>Error creating directory:</source>
-<target>Erro ao criar a pasta:</target>
-
-<source>Error copying symbolic link:</source>
-<target>Erro ao copiar o link:</target>
-
-<source>Error copying file:</source>
-<target>Erro ao copiar ficheiro:</target>
-
-<source>Error opening file:</source>
-<target>Erro ao abrir ficheiro:</target>
-
-<source>Error writing file:</source>
-<target>Erro de escrita no ficheiro:</target>
-
-<source>Error reading file:</source>
-<target>Erro de leitura de ficheiro:</target>
-
-<source>Operation aborted!</source>
-<target>Operação abortada!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Loop infinito ao percorrer directório:</target>
-
-<source>Error traversing directory:</source>
-<target>Erro ao percorrer a pasta:</target>
-
-<source>Error setting privilege:</source>
-<target>Erro ao estabelecer privilégios:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Erro ao mover para a Reciclagem:</target>
-
-<source>Could not load a required DLL:</source>
-<target>Não foi possível carregar a DLL:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Erro na escrita da base de dados de sincronização:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Erro no acesso ao serviço Volume Shadow Copy!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Fazer cópias fantasma em WOW64 não é suportado. Por favor usar a versão 64-bit.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>Não é possível determinar o nome do volume para o ficheiro:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>Nome do volume %x não faz parte do ficheiro %y!</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x mins</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 hora</pluralform>
-<pluralform>%x horas</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 dia</pluralform>
-<pluralform>%x dias</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>Não foi possível ler os valores dos seguintes nós XML:</target>
-
 <source>Logging</source>
 <target>A escrever em log</target>
 
@@ -477,9 +372,6 @@ A linha de comandos é executada cada vez que:
 <source>Batch execution</source>
 <target>Execução do batch</target>
 
-<source>Log-messages:</source>
-<target>Log de mensagens:</target>
-
 <source>Stop</source>
 <target>Parar</target>
 
@@ -606,6 +498,24 @@ A linha de comandos é executada cada vez que:
 <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>Items found:</source>
+<target>Elementos encontrados:</target>
+
+<source>Items remaining:</source>
+<target>Elementos restantes:</target>
+
+<source>Speed:</source>
+<target>Velocidade:</target>
+
+<source>Time remaining:</source>
+<target>Tempo restante:</target>
+
+<source>Time elapsed:</source>
+<target>Tempo passado:</target>
+
 <source>Batch job</source>
 <target>Ficheiro Batch</target>
 
@@ -654,32 +564,14 @@ A linha de comandos é executada cada vez que:
 <source>&Cancel</source>
 <target>&Cancelar</target>
 
-<source>Operation:</source>
-<target>Operação:</target>
-
-<source>Items found:</source>
-<target>Elementos encontrados:</target>
-
-<source>Items remaining:</source>
-<target>Elementos restantes:</target>
-
-<source>Speed:</source>
-<target>Velocidade:</target>
-
-<source>Time remaining:</source>
-<target>Tempo restante:</target>
-
-<source>Time elapsed:</source>
-<target>Tempo passado:</target>
-
 <source>Select variant:</source>
 <target>Selecione uma variante:</target>
 
 <source><Automatic></source>
 <target><Automático></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Identificar e propagar as mudanças usando base de dados. Eliminações e conflitos serão detectados automaticamente.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target></target>
 
 <source>Mirror ->></source>
 <target>Espelhar ->></target>
@@ -905,22 +797,14 @@ Excluir: \stuff\temp\*
 <source>Copy locked files</source>
 <target>Copiar ficheiros bloqueados</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Copiar ficheiros partilhados ou bloqueados usando o serviço Volume Shadow Copy (Requer direitos de administrador)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Copiar ficheiros partilhados ou bloqueados usando o serviço Volume Shadow Copy (Requer direitos de administrador)</target>
 
 <source>Copy file access permissions</source>
 <target>Copiar permissões de acesso do ficheiro</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Transferir ficheiro e permissões (Requer direitos de administrador)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Transferir ficheiro e permissões (Requer direitos de administrador)</target>
 
 <source>Hidden dialogs:</source>
 <target>Diálogos ocultos:</target>
@@ -952,6 +836,9 @@ Transferir ficheiro e permissões (Requer direitos de administrador)
 <source>&Find next</source>
 <target>&Procurar seguinte</target>
 
+<source>Operation aborted!</source>
+<target>Operação abortada!</target>
+
 <source>Main bar</source>
 <target>Barra principal</target>
 
@@ -1129,6 +1016,9 @@ Transferir ficheiro e permissões (Requer direitos de administrador)
 <source>File list exported!</source>
 <target>Lista dos ficheiros exportada!</target>
 
+<source>Error writing file:</source>
+<target>Erro de escrita no ficheiro:</target>
+
 <source>Batch file created successfully!</source>
 <target>Ficheiro batch criado com sucesso!</target>
 
@@ -1228,9 +1118,6 @@ Transferir ficheiro e permissões (Requer direitos de administrador)
 <source>Filter: Single pair</source>
 <target>Filtro: Par simples</target>
 
-<source>Ignore</source>
-<target>Ignorar</target>
-
 <source>Direct</source>
 <target>Direto</target>
 
@@ -1294,6 +1181,105 @@ Transferir ficheiro e permissões (Requer direitos de administrador)
 <source>Move files into a time-stamped subdirectory</source>
 <target>Mover ficheiros para uma subpasta datada</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x mins</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 hora</pluralform>
+<pluralform>%x horas</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 dia</pluralform>
+<pluralform>%x dias</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Não é possível iniciar monitorização do directório:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Erro ao monitorizar os directórios.</target>
+
+<source>Conversion error:</source>
+<target>Erro de conversão:</target>
+
+<source>Error deleting file:</source>
+<target>Erro ao eliminar o ficheiro:</target>
+
+<source>Error moving file:</source>
+<target>Erro ao mover o ficheiro:</target>
+
+<source>Target file already existing!</source>
+<target>Ficheiro de destino já existe!</target>
+
+<source>Error moving directory:</source>
+<target>Erro ao mover o directório:</target>
+
+<source>Target directory already existing!</source>
+<target>Directório de destino já existe!</target>
+
+<source>Error deleting directory:</source>
+<target>Erro ao eliminar a pasta:</target>
+
+<source>Error changing modification time:</source>
+<target>Erro ao mudar a hora de modificação:</target>
+
+<source>Error loading library function:</source>
+<target>Erro ao carregar a livraria:</target>
+
+<source>Error reading security context:</source>
+<target>Erro ao ler contexto de segurança:</target>
+
+<source>Error writing security context:</source>
+<target>Erro de escrita no contexto de segurança:</target>
+
+<source>Error copying file permissions:</source>
+<target>Erro ao copiar permissões dos ficheiros:</target>
+
+<source>Error creating directory:</source>
+<target>Erro ao criar a pasta:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Erro ao copiar o link:</target>
+
+<source>Error copying file:</source>
+<target>Erro ao copiar ficheiro:</target>
+
+<source>Error opening file:</source>
+<target>Erro ao abrir ficheiro:</target>
+
+<source>Error traversing directory:</source>
+<target>Erro ao percorrer a pasta:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Loop infinito ao percorrer directório:</target>
+
+<source>Error setting privilege:</source>
+<target>Erro ao estabelecer privilégios:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>Ambos os lados tiveram alterações desde a última sincronização!</target>
 
@@ -1324,9 +1310,6 @@ Transferir ficheiro e permissões (Requer direitos de administrador)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Directórios são dependentes! Cuidado ao definir as regras de sincronização:</target>
 
-<source>Comparing content of files %x</source>
-<target>A comparar o conteúdo do ficheiro %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Alocação de memória falhou!</target>
 
@@ -1342,15 +1325,15 @@ Transferir ficheiro e permissões (Requer direitos de administrador)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Links simbólicos %x tem a mesma data mas diferente destino!</target>
 
+<source>Comparing content of files %x</source>
+<target>A comparar o conteúdo do ficheiro %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>A comparação de ficheiros por conteúdo falhou.</target>
 
 <source>Generating file list...</source>
 <target>A gerar lista ficheiros...</target>
 
-<source>Multiple...</source>
-<target>Multiplo...</target>
-
 <source>Both sides are equal</source>
 <target>Ambos os lados iguais</target>
 
@@ -1369,6 +1352,12 @@ Transferir ficheiro e permissões (Requer direitos de administrador)
 <source>Delete right file/folder</source>
 <target>Eliminar ficheiro/pasta à direita</target>
 
+<source>Move file on left</source>
+<target></target>
+
+<source>Move file on right</source>
+<target></target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Substituir ficheiro/pasta da esquerda (pelo da direita)</target>
 
@@ -1384,6 +1373,9 @@ Transferir ficheiro e permissões (Requer direitos de administrador)
 <source>Copy file attributes only to right</source>
 <target>Copiar apenas atributos de ficheiro para a direita</target>
 
+<source>Multiple...</source>
+<target>Multiplo...</target>
+
 <source>Deleting file %x</source>
 <target>Apagar ficheiro %x</target>
 
diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng
index 5489adeb..b6ec4d95 100644
--- a/BUILD/Languages/portuguese_br.lng
+++ b/BUILD/Languages/portuguese_br.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronização Automatizada</target>
 
-<source>Browse</source>
-<target>Procurar</target>
-
-<source>Windows Error Code %x:</source>
-<target>Código de Erro do Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Código de Erro do Linux %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>Linha de comando inválida: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>Erro na resolução de link simbólico:</target>
-
-<source>Show pop-up</source>
-<target>Mostrar pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Mostrar pop-up em erros e avisos</target>
-
-<source>Ignore errors</source>
-<target>Ignorar erros</target>
-
-<source>Hide all error and warning messages</source>
-<target>Ocultar todas as mensagens de erro ou aviso</target>
-
-<source>Exit instantly</source>
-<target>Sair instantaneamente</target>
-
-<source>Abort synchronization immediately</source>
-<target>Cancelar a sincronização imediatamente</target>
-
 <source>Select alternate comparison settings</source>
 <target>Selecionar configuração de comparação alternativa</target>
 
@@ -89,7 +56,7 @@
 <target>Erro</target>
 
 <source>Warning</source>
-<target>Atenção</target>
+<target>Avisos</target>
 
 <source>Question</source>
 <target>Questão</target>
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>Selecionar período de tempo</target>
 
+<source>Show pop-up</source>
+<target>Mostrar pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Mostrar pop-up em erros e avisos</target>
+
+<source>Ignore errors</source>
+<target>Ignorar erros</target>
+
+<source>Hide all error and warning messages</source>
+<target>Ocultar todas as mensagens de erro ou aviso</target>
+
+<source>Exit instantly</source>
+<target>Sair instantaneamente</target>
+
+<source>Abort synchronization immediately</source>
+<target>Cancelar a sincronização imediatamente</target>
+
+<source>Browse</source>
+<target>Procurar</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Erro ao ler do banco de dados de sincronização:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Erro ao escrever no banco de dados de sincronização:</target>
+
+<source>Invalid command line: %x</source>
+<target>Linha de comando inválida: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Código de Erro do Windows %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Código de Erro do Linux %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Erro na resolução de link simbólico:</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -163,17 +169,14 @@
 <source>Comparison Result</source>
 <target>Resultado da Comparação</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Formato de banco de dados de sincronização incompatível:</target>
-
 <source>Initial synchronization:</source>
 <target>Sincronização inicial:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>Um dos arquivos de banco de dados do FreeFileSync ainda não existe:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Erro ao ler do banco de dados de sincronização:</target>
+<source>Incompatible synchronization database format:</source>
+<target>Formato de banco de dados de sincronização incompatível:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>Arquivos de banco de dados não compartilham uma sessão de sincronização comum:</target>
@@ -199,12 +202,18 @@
 <pluralform>%x seg</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Arrastar && Soltar</target>
+
 <source>Info</source>
-<target>Info</target>
+<target>Informações</target>
 
 <source>Fatal Error</source>
 <target>Erro fatal</target>
 
+<source>Error reading file:</source>
+<target>Erro ao ler arquivo:</target>
+
 <source>Scanning:</source>
 <target>Pesquisando:</target>
 
@@ -223,15 +232,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Arquivo de configuração do FreeFileSync inválido!</target>
 
-<source>File does not exist:</source>
-<target>O arquivo não existe:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Erro de leitura do arquivo de configuração:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Erro ao mover para a Lixeira:</target>
+
+<source>Could not load a required DLL:</source>
+<target>Não foi possível carregar uma DLL requerida:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>Erro ao acessar o Serviço de Cópia de Sombra de Volume!</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>Cópias de sombra no WOW64 não são suportadas. Por favor use a versão 64-bits do FreeFileSync.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Não foi possível determinar o nome do volume para o arquivo:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Nome do volume %x não é parte do arquivo %y!</target>
+
 <source>/sec</source>
 <target>/seg</target>
 
+<source>File does not exist:</source>
+<target>O arquivo não existe:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Não foi possível ler os valores para os seguintes nós XML:</target>
+
 <source>S&ave configuration...</source>
 <target>S&alvar configuração...</target>
 
@@ -324,143 +354,8 @@ A linha de comando é executada cada vez que:
 <source>A directory input field is empty.</source>
 <target>Um campo de entrada de diretório está vazio.</target>
 
-<source>Drag && drop</source>
-<target>Arrastar && Soltar</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>Não foi possível inicializar o monitoramento de diretórios:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Erro ao monitorar os diretórios.</target>
-
-<source>Conversion error:</source>
-<target>Erro de conversão:</target>
-
-<source>Error deleting file:</source>
-<target>Erro ao apagar arquivo:</target>
-
-<source>Error moving file:</source>
-<target>Erro ao mover arquivo:</target>
-
-<source>Target file already existing!</source>
-<target>Arquivo de destino já existe!</target>
-
-<source>Error moving directory:</source>
-<target>Erro ao mover diretório:</target>
-
-<source>Target directory already existing!</source>
-<target>Diretório de destino já existe!</target>
-
-<source>Error deleting directory:</source>
-<target>Erro ao apagar diretório:</target>
-
-<source>Error changing modification time:</source>
-<target>Erro ao mudar a hora de modificação:</target>
-
-<source>Error loading library function:</source>
-<target>Erro ao carregar a biblioteca de funções:</target>
-
-<source>Error reading security context:</source>
-<target>Erro ao ler contexto de segurança:</target>
-
-<source>Error writing security context:</source>
-<target>Erro ao escrever contexto de segurança:</target>
-
-<source>Error copying file permissions:</source>
-<target>Erro ao copiar permissões do arquivo:</target>
-
-<source>Error creating directory:</source>
-<target>Erro ao criar diretório:</target>
-
-<source>Error copying symbolic link:</source>
-<target>Erro ao copiar links simbólicos:</target>
-
-<source>Error copying file:</source>
-<target>Erro ao copiar arquivo:</target>
-
-<source>Error opening file:</source>
-<target>Erro ao abrir arquivo:</target>
-
-<source>Error writing file:</source>
-<target>Erro ao escrever arquivo:</target>
-
-<source>Error reading file:</source>
-<target>Erro ao ler arquivo:</target>
-
-<source>Operation aborted!</source>
-<target>Operação cancelada!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Loop infinito quando percorrendo diretório:</target>
-
-<source>Error traversing directory:</source>
-<target>Erro ao percorrer diretório:</target>
-
-<source>Error setting privilege:</source>
-<target>Erro ao definir privilégio:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Erro ao mover para a Lixeira:</target>
-
-<source>Could not load a required DLL:</source>
-<target>Não foi possível carregar uma DLL requerida:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Erro ao escrever no banco de dados de sincronização:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Erro ao acessar o Serviço de Cópia de Sombra de Volume!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Cópias de sombra no WOW64 não são suportadas. Por favor use a versão 64-bits do FreeFileSync.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>Não foi possível determinar o nome do volume para o arquivo:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>Nome do volume %x não é parte do arquivo %y!</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 hora</pluralform>
-<pluralform>%x horas</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 dia</pluralform>
-<pluralform>%x dias</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>Não foi possível ler os valores para os seguintes nós XML:</target>
-
 <source>Logging</source>
-<target>Gravando log</target>
+<target>Log</target>
 
 <source>FreeFileSync batch file</source>
 <target>FreeFileSync arquivo batch</target>
@@ -477,9 +372,6 @@ A linha de comando é executada cada vez que:
 <source>Batch execution</source>
 <target>Execução do batch</target>
 
-<source>Log-messages:</source>
-<target>Log de mensagens:</target>
-
 <source>Stop</source>
 <target>Parar</target>
 
@@ -606,6 +498,24 @@ A linha de comando é executada cada vez que:
 <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>Items found:</source>
+<target>Elementos encontrados:</target>
+
+<source>Items remaining:</source>
+<target>Elementos faltantes:</target>
+
+<source>Speed:</source>
+<target>Velocidade:</target>
+
+<source>Time remaining:</source>
+<target>Tempo restante:</target>
+
+<source>Time elapsed:</source>
+<target>Tempo decorrido:</target>
+
 <source>Batch job</source>
 <target>Arquivo Batch</target>
 
@@ -654,32 +564,14 @@ A linha de comando é executada cada vez que:
 <source>&Cancel</source>
 <target>&Cancelar</target>
 
-<source>Operation:</source>
-<target>Operação:</target>
-
-<source>Items found:</source>
-<target>Elementos encontrados:</target>
-
-<source>Items remaining:</source>
-<target>Elementos faltantes:</target>
-
-<source>Speed:</source>
-<target>Velocidade:</target>
-
-<source>Time remaining:</source>
-<target>Tempo restante:</target>
-
-<source>Time elapsed:</source>
-<target>Tempo passado:</target>
-
 <source>Select variant:</source>
 <target>Selecione um modo:</target>
 
 <source><Automatic></source>
 <target><Automático></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Identifica e propaga mudanças em ambos os lados utilizando um banco de dados. Exclusões e conflitos serão detectados automaticamente.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Identifica e propaga as mudanças em ambos os lados usando um banco de dados. Arquivos apagados, renomeados e conflitantes são detectados automaticamente.</target>
 
 <source>Mirror ->></source>
 <target>Espelhar ->></target>
@@ -901,27 +793,19 @@ Excluir: \stuff\temp\*
 <target>Cópia de arquivo transacional</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></target>
+<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>
 
 <source>Copy locked files</source>
 <target>Copiar arquivos bloqueados (em uso)</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Copia os arquivos compartilhados ou bloqueados (em uso) usando o Serviço de Cópia de Sombra de Volume (Requer direitos de Administrador)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Copia os arquivos compartilhados ou bloqueados (em uso) usando o Serviço de Cópia de Sombra de Volume (Requer direitos de Administrador)</target>
 
 <source>Copy file access permissions</source>
 <target>Copiar permissões de acesso aos arquivos</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Transfere as permissões de arquivos e diretórios (Requer direitos de Administrador)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Transfere as permissões de arquivos e diretórios (Requer direitos de Administrador)</target>
 
 <source>Hidden dialogs:</source>
 <target>Diálogos ocultados:</target>
@@ -953,6 +837,9 @@ Transfere as permissões de arquivos e diretórios (Requer direitos de Administr
 <source>&Find next</source>
 <target>&Localizar próxima</target>
 
+<source>Operation aborted!</source>
+<target>Operação cancelada!</target>
+
 <source>Main bar</source>
 <target>Barra principal</target>
 
@@ -993,16 +880,16 @@ Transfere as permissões de arquivos e diretórios (Requer direitos de Administr
 <target>Autoajustar colunas</target>
 
 <source>Icon size:</source>
-<target></target>
+<target>Tamanho do ícone:</target>
 
 <source>Small</source>
-<target></target>
+<target>Pequeno</target>
 
 <source>Medium</source>
-<target></target>
+<target>Médio</target>
 
 <source>Large</source>
-<target></target>
+<target>Grande</target>
 
 <source>Include all rows</source>
 <target>Incluir todas as linhas</target>
@@ -1130,6 +1017,9 @@ Transfere as permissões de arquivos e diretórios (Requer direitos de Administr
 <source>File list exported!</source>
 <target>Lista de arquivos exportada!</target>
 
+<source>Error writing file:</source>
+<target>Erro ao escrever arquivo:</target>
+
 <source>Batch file created successfully!</source>
 <target>Arquivo batch criado com sucesso!</target>
 
@@ -1229,9 +1119,6 @@ Transfere as permissões de arquivos e diretórios (Requer direitos de Administr
 <source>Filter: Single pair</source>
 <target>Filtro: Apenas um par</target>
 
-<source>Ignore</source>
-<target>Ignorar</target>
-
 <source>Direct</source>
 <target>Direcionar</target>
 
@@ -1295,6 +1182,105 @@ Transfere as permissões de arquivos e diretórios (Requer direitos de Administr
 <source>Move files into a time-stamped subdirectory</source>
 <target>Mover arquivos para um subdiretório com carimbo de tempo</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 hora</pluralform>
+<pluralform>%x horas</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 dia</pluralform>
+<pluralform>%x dias</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Não foi possível inicializar o monitoramento de diretórios:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Erro ao monitorar os diretórios.</target>
+
+<source>Conversion error:</source>
+<target>Erro de conversão:</target>
+
+<source>Error deleting file:</source>
+<target>Erro ao apagar arquivo:</target>
+
+<source>Error moving file:</source>
+<target>Erro ao mover arquivo:</target>
+
+<source>Target file already existing!</source>
+<target>Arquivo de destino já existe!</target>
+
+<source>Error moving directory:</source>
+<target>Erro ao mover diretório:</target>
+
+<source>Target directory already existing!</source>
+<target>Diretório de destino já existe!</target>
+
+<source>Error deleting directory:</source>
+<target>Erro ao apagar diretório:</target>
+
+<source>Error changing modification time:</source>
+<target>Erro ao mudar a hora de modificação:</target>
+
+<source>Error loading library function:</source>
+<target>Erro ao carregar a biblioteca de funções:</target>
+
+<source>Error reading security context:</source>
+<target>Erro ao ler contexto de segurança:</target>
+
+<source>Error writing security context:</source>
+<target>Erro ao escrever contexto de segurança:</target>
+
+<source>Error copying file permissions:</source>
+<target>Erro ao copiar permissões do arquivo:</target>
+
+<source>Error creating directory:</source>
+<target>Erro ao criar diretório:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Erro ao copiar links simbólicos:</target>
+
+<source>Error copying file:</source>
+<target>Erro ao copiar arquivo:</target>
+
+<source>Error opening file:</source>
+<target>Erro ao abrir arquivo:</target>
+
+<source>Error traversing directory:</source>
+<target>Erro ao percorrer diretório:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Loop infinito quando percorrendo diretório:</target>
+
+<source>Error setting privilege:</source>
+<target>Erro ao definir privilégio:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>Ambos os lados foram alterados desde a última sincronização!</target>
 
@@ -1325,9 +1311,6 @@ Transfere as permissões de arquivos e diretórios (Requer direitos de Administr
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Diretórios são dependentes! Cuidado ao definir as regras de sincronização:</target>
 
-<source>Comparing content of files %x</source>
-<target>Comparando conteúdo do arquivo %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Alocação de memória falhou!</target>
 
@@ -1343,15 +1326,15 @@ Transfere as permissões de arquivos e diretórios (Requer direitos de Administr
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Links Simbólicos %x têm a mesma data mas um destino diferente!</target>
 
+<source>Comparing content of files %x</source>
+<target>Comparando conteúdo do arquivo %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>Comparação de arquivos pelo conteúdo falhou.</target>
 
 <source>Generating file list...</source>
 <target>Gerando lista de arquivos...</target>
 
-<source>Multiple...</source>
-<target>Múltiplos...</target>
-
 <source>Both sides are equal</source>
 <target>Ambos os lados são iguais</target>
 
@@ -1370,6 +1353,12 @@ Transfere as permissões de arquivos e diretórios (Requer direitos de Administr
 <source>Delete right file/folder</source>
 <target>Apagar arquivos/pastas da direita</target>
 
+<source>Move file on left</source>
+<target>Mover arquivo da esquerda</target>
+
+<source>Move file on right</source>
+<target>Mover arquivo da direita</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Substituir arquivos/pastas da esquerda pelos da direita</target>
 
@@ -1385,6 +1374,9 @@ Transfere as permissões de arquivos e diretórios (Requer direitos de Administr
 <source>Copy file attributes only to right</source>
 <target>Copiar apenas os atributos do arquivo para a direita</target>
 
+<source>Multiple...</source>
+<target>Múltiplos...</target>
+
 <source>Deleting file %x</source>
 <target>Apagando arquivo %x</target>
 
diff --git a/BUILD/Languages/romanian.lng b/BUILD/Languages/romanian.lng
index f9e85c0e..c7b8958c 100644
--- a/BUILD/Languages/romanian.lng
+++ b/BUILD/Languages/romanian.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronizare Inteligentă</target>
 
-<source>Browse</source>
-<target>Explorează</target>
-
-<source>Windows Error Code %x:</source>
-<target>Codul Erorii Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Codul Erorii Linux %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>Linie de comandă nevalidă: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>Eroare la rezolvarea legăturii simbolice:</target>
-
-<source>Show pop-up</source>
-<target>Este arătat un popîc</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Se afișează o fereastră popîc [popup] la erori sau avertizări</target>
-
-<source>Ignore errors</source>
-<target>Erorile sînt ignorate</target>
-
-<source>Hide all error and warning messages</source>
-<target>Sînt ascunse toate mesajele de eroare și de avertizare</target>
-
-<source>Exit instantly</source>
-<target>Ieși imediat</target>
-
-<source>Abort synchronization immediately</source>
-<target>Abandonează imediat sincronizarea</target>
-
 <source>Select alternate comparison settings</source>
 <target>Selectează setările alternative de comparare</target>
 
@@ -101,7 +68,7 @@
 <target>Configurează Filtrul</target>
 
 <source>Customize columns</source>
-<target>Personalizează coloanele</target>
+<target>Bifează coloanele de afișat</target>
 
 <source>Global settings</source>
 <target>Setări Globale</target>
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>Selectează intervalul de timp</target>
 
+<source>Show pop-up</source>
+<target>Este arătat un popîc</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Se afișează o fereastră popîc [popup] la erori sau avertizări</target>
+
+<source>Ignore errors</source>
+<target>Erorile sînt ignorate</target>
+
+<source>Hide all error and warning messages</source>
+<target>Sînt ascunse toate mesajele de eroare și de avertizare</target>
+
+<source>Exit instantly</source>
+<target>Ieși imediat</target>
+
+<source>Abort synchronization immediately</source>
+<target>Abandonează imediat sincronizarea</target>
+
+<source>Browse</source>
+<target>Explorează</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Eroare la citirea din baza de date a sincronizării:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Eroare la scrierea în baza de date a sincronizării:</target>
+
+<source>Invalid command line: %x</source>
+<target>Linie de comandă nevalidă: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Codul Erorii Windows %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Codul Erorii Linux %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Eroare la rezolvarea legăturii simbolice:</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -147,7 +153,7 @@
 <target>Dată</target>
 
 <source>Full path</source>
-<target>Cale completă</target>
+<target>Calea Completă</target>
 
 <source>Filename</source>
 <target>Numele Elementului</target>
@@ -164,17 +170,14 @@
 <source>Comparison Result</source>
 <target>Rezultatul Comparării</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Format al bazei de date necompatibil cu versiunea softului:</target>
-
 <source>Initial synchronization:</source>
 <target>Sincronizare inițială:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>Una dintre părți nu are o filă de tip bază de date FreeFileSync:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Eroare la citirea din baza de date a sincronizării:</target>
+<source>Incompatible synchronization database format:</source>
+<target>Format al bazei de date necompatibil cu versiunea softului:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>Filele bază de date nu partajează o sesiune comună de sincronizare</target>
@@ -201,17 +204,23 @@
 <pluralform>%x de sec</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Trage și pune un dosar peste compartimentul de mai jos sau selectează-l cu butonul de explorare</target>
+
 <source>Info</source>
 <target>Informații</target>
 
 <source>Fatal Error</source>
 <target>Eroare Fatală</target>
 
+<source>Error reading file:</source>
+<target>Eroare la citirea filei:</target>
+
 <source>Scanning:</source>
 <target>Scanez:</target>
 
 <source>Encoding extended time information: %x</source>
-<target>Codarea informațiilor timpului extins: %x</target>
+<target>Codez informațiile extinse despre timp: %x</target>
 
 <source>
 <pluralform>[1 Thread]</pluralform>
@@ -226,15 +235,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Filă de configurare FreeFileSync nevalidă!</target>
 
-<source>File does not exist:</source>
-<target>Fila nu există:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Eroare la parsarea filei de configurare:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Eroare la mutarea în Reciclator:</target>
+
+<source>Could not load a required DLL:</source>
+<target>Nu pot încărca o filă DLL necesară:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>Eroare la accesarea Serviciului de Conservare a Volumelor [Volume Shadow Copy]!</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>Realizarea de conservări (copii de rezervă) prin sistemul WOW64 nu este suportată. Folosește versiunea pe 64-biți a FreeFileSync.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Nu pot determina numele volumului pentru fila:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Numele volumului %x nu face parte din numele filei %y !</target>
+
 <source>/sec</source>
 <target>/sec</target>
 
+<source>File does not exist:</source>
+<target>Fila nu există:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Nu pot citi valorile pentru următoarele noduri XML:</target>
+
 <source>S&ave configuration...</source>
 <target>S&alvează Configurația...</target>
 
@@ -327,146 +357,8 @@ Linia de comandă este executată de fiecare dată cînd:
 <source>A directory input field is empty.</source>
 <target>Cel puțin unul din dosarele de comparat este nespecificat.</target>
 
-<source>Drag && drop</source>
-<target>Trage și lasă un dosar peste compartimentul de mai jos sau selectează-l cu butonul de explorare</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>Nu pot inițializa monitorizarea dosarelor:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Eroare la monitorizarea dosarelor.</target>
-
-<source>Conversion error:</source>
-<target>Eroare de convertire:</target>
-
-<source>Error deleting file:</source>
-<target>Eroare la ștergerea filei:</target>
-
-<source>Error moving file:</source>
-<target>Eroare la mutarea filei:</target>
-
-<source>Target file already existing!</source>
-<target>Fila țintă există deja!</target>
-
-<source>Error moving directory:</source>
-<target>Eroare la mutarea dosarului:</target>
-
-<source>Target directory already existing!</source>
-<target>Dosarul țintă există deja!</target>
-
-<source>Error deleting directory:</source>
-<target>Eroare la ștergerea dosarului:</target>
-
-<source>Error changing modification time:</source>
-<target>Eroare la schimbarea datei de modificare:</target>
-
-<source>Error loading library function:</source>
-<target>Eroare la încărcarea bibliotecii de funcții:</target>
-
-<source>Error reading security context:</source>
-<target>Eroare la citirea contextului de securitate:</target>
-
-<source>Error writing security context:</source>
-<target>Eroare la scrierea contextului de securitate:</target>
-
-<source>Error copying file permissions:</source>
-<target>Eroare la copierea permisiunilor filei:</target>
-
-<source>Error creating directory:</source>
-<target>Eroare la crearea dosarului:</target>
-
-<source>Error copying symbolic link:</source>
-<target>Eroare la copierea legăturii simbolice:</target>
-
-<source>Error copying file:</source>
-<target>Eroare la copierea filei:</target>
-
-<source>Error opening file:</source>
-<target>Eroare la deschiderea filei:</target>
-
-<source>Error writing file:</source>
-<target>Eroare la scrierea filei:</target>
-
-<source>Error reading file:</source>
-<target>Eroare la citirea filei:</target>
-
-<source>Operation aborted!</source>
-<target>Operație abandonată!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Buclă infinită la parcurgerea dosarului:</target>
-
-<source>Error traversing directory:</source>
-<target>Eroare la parcurgerea dosarului:</target>
-
-<source>Error setting privilege:</source>
-<target>Eroare la setarea privilegiului:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Eroare la mutarea în Reciclator:</target>
-
-<source>Could not load a required DLL:</source>
-<target>Nu pot încărca o filă DLL necesară:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Eroare la scrierea în baza de date a sincronizării:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Eroare la accesarea Serviciului de Conservare a Volumelor [Volume Shadow Copy]!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Realizarea de conservări (copii de rezervă) prin sistemul WOW64 nu este suportată. Folosește versiunea pe 64-biți a FreeFileSync.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>Nu pot determina numele volumului pentru fila:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>Numele volumului %x nu face parte din numele filei %y !</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-<pluralform>%x de min</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 oră</pluralform>
-<pluralform>%x ore</pluralform>
-<pluralform>%x de ore</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 zi</pluralform>
-<pluralform>%x zile</pluralform>
-<pluralform>%x de zile</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>Nu pot citi valorile pentru următoarele noduri XML:</target>
-
 <source>Logging</source>
-<target>Jurnalizez</target>
+<target>Jurnal</target>
 
 <source>FreeFileSync batch file</source>
 <target>Filă cu set de comenzi FreeFileSync</target>
@@ -483,9 +375,6 @@ Linia de comandă este executată de fiecare dată cînd:
 <source>Batch execution</source>
 <target>Execută Fila Set</target>
 
-<source>Log-messages:</source>
-<target>Mesaje de jurnalizare:</target>
-
 <source>Stop</source>
 <target>Oprește</target>
 
@@ -612,6 +501,24 @@ Linia de comandă este executată de fiecare dată cînd:
 <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>Items found:</source>
+<target>Elemente Găsite:</target>
+
+<source>Items remaining:</source>
+<target>Elemente Rămase:</target>
+
+<source>Speed:</source>
+<target>Viteză:</target>
+
+<source>Time remaining:</source>
+<target>Timp Rămas:</target>
+
+<source>Time elapsed:</source>
+<target>Timp Scurs:</target>
+
 <source>Batch job</source>
 <target>Sarcină Set</target>
 
@@ -660,32 +567,14 @@ Linia de comandă este executată de fiecare dată cînd:
 <source>&Cancel</source>
 <target>&Anulează</target>
 
-<source>Operation:</source>
-<target>Operație:</target>
-
-<source>Items found:</source>
-<target>Elemente Găsite:</target>
-
-<source>Items remaining:</source>
-<target>Elemente Rămase:</target>
-
-<source>Speed:</source>
-<target>Viteză:</target>
-
-<source>Time remaining:</source>
-<target>Timp Rămas:</target>
-
-<source>Time elapsed:</source>
-<target>Timp Scurs:</target>
-
 <source>Select variant:</source>
 <target>Selectează Varianta de Sincronizare:</target>
 
 <source><Automatic></source>
 <target><Sincronizare Inteligentă></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Modificările din ambele părți sînt identificate și propagate folosind o bază de date. Ștergerile și conflictele sînt detectate automat.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Identificare și propagare a modificărilor din ambele părți folosind o bază de date. Ștergerile, renumirile și conflictele sînt detectate automat</target>
 
 <source>Mirror ->></source>
 <target>Clonare =>></target>
@@ -697,7 +586,7 @@ Linia de comandă este executată de fiecare dată cînd:
 <target>Actualizare =></target>
 
 <source>Copy new or updated files to right folder.</source>
-<target>Copiază în dosarul din dreapta filele actualizate sau noi.</target>
+<target>Copiere în dosarul din dreapta a filelor actualizate sau noi.</target>
 
 <source>Custom</source>
 <target>Sincronizare Personalizată</target>
@@ -907,27 +796,19 @@ Excluse: \stuff\temp\*
 <target>Copiere tranzacțională a filelor</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></target>
+<target>Scrierea se face mai întîi într-o filă temporară (*.ffs_tmp), care e apoi renumită. Se garantează astfel consecvența stării filelor chiar și în cazul apariției de erori fatale.</target>
 
 <source>Copy locked files</source>
-<target>Copiere și a filelor zăvorîte [locked]</target>
+<target>Copiere a filelor partajate [shared] sau zăvorîte [locked]</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Copiază filele partajate sau zăvorîte folosind Serviciul de Conservare a Volumelor [Volume Shadow Copy] (Necesită drepturi de Administrator)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Filele partajate sau zăvorîte sînt copiate folosind Serviciul de Conservare a Volumelor din Windows [Volume Shadow Copy] (necesită drepturi de Administrator)</target>
 
 <source>Copy file access permissions</source>
 <target>Copiază permisiunile de acces ale filelor</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Transferă permisiunile filelor și dosarelor (Necesită drepturi de Administrator)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Transferă permisiunile filelor și dosarelor (necesită drepturi de Administrator)</target>
 
 <source>Hidden dialogs:</source>
 <target>Casete de dialog ascunse:</target>
@@ -948,7 +829,7 @@ Transferă permisiunile filelor și dosarelor (Necesită drepturi de Administrat
 <target>Varianta Sincronizării</target>
 
 <source>Statistics</source>
-<target>Statistici</target>
+<target>Statis.</target>
 
 <source>Find what:</source>
 <target>Găsește Asta:</target>
@@ -959,6 +840,9 @@ Transferă permisiunile filelor și dosarelor (Necesită drepturi de Administrat
 <source>&Find next</source>
 <target>&Găsește Următorul</target>
 
+<source>Operation aborted!</source>
+<target>Operație abandonată!</target>
+
 <source>Main bar</source>
 <target>Bara Principală</target>
 
@@ -996,19 +880,19 @@ Transferă permisiunile filelor și dosarelor (Necesită drepturi de Administrat
 <target>Selectează intervalul de timp...</target>
 
 <source>Auto-adjust columns</source>
-<target>Autoajustează Coloanele</target>
+<target>Ajustează Automat Coloanele</target>
 
 <source>Icon size:</source>
-<target></target>
+<target>Mărimea Icoanelor Elementelor:</target>
 
 <source>Small</source>
-<target></target>
+<target>Mică</target>
 
 <source>Medium</source>
-<target></target>
+<target>Medie</target>
 
 <source>Large</source>
-<target></target>
+<target>Mare</target>
 
 <source>Include all rows</source>
 <target>Include Toate Rîndurile</target>
@@ -1136,6 +1020,9 @@ Transferă permisiunile filelor și dosarelor (Necesită drepturi de Administrat
 <source>File list exported!</source>
 <target>Lista de file a fost exportată!</target>
 
+<source>Error writing file:</source>
+<target>Eroare la scrierea filei:</target>
+
 <source>Batch file created successfully!</source>
 <target>Fila cu setul de comenzi a fost creată cu succces !</target>
 
@@ -1239,9 +1126,6 @@ Transferă permisiunile filelor și dosarelor (Necesită drepturi de Administrat
 <source>Filter: Single pair</source>
 <target>Filtru: O singură pereche</target>
 
-<source>Ignore</source>
-<target>Ignoră</target>
-
 <source>Direct</source>
 <target>Direcționează</target>
 
@@ -1307,6 +1191,108 @@ Transferă permisiunile filelor și dosarelor (Necesită drepturi de Administrat
 <source>Move files into a time-stamped subdirectory</source>
 <target>Filele sînt mutate într-un subdosar cu marcaj de timp</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+<pluralform>%x de min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 oră</pluralform>
+<pluralform>%x ore</pluralform>
+<pluralform>%x de ore</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 zi</pluralform>
+<pluralform>%x zile</pluralform>
+<pluralform>%x de zile</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Nu pot inițializa monitorizarea dosarelor:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Eroare la monitorizarea dosarelor.</target>
+
+<source>Conversion error:</source>
+<target>Eroare de convertire:</target>
+
+<source>Error deleting file:</source>
+<target>Eroare la ștergerea filei:</target>
+
+<source>Error moving file:</source>
+<target>Eroare la mutarea filei:</target>
+
+<source>Target file already existing!</source>
+<target>Fila țintă există deja!</target>
+
+<source>Error moving directory:</source>
+<target>Eroare la mutarea dosarului:</target>
+
+<source>Target directory already existing!</source>
+<target>Dosarul țintă există deja!</target>
+
+<source>Error deleting directory:</source>
+<target>Eroare la ștergerea dosarului:</target>
+
+<source>Error changing modification time:</source>
+<target>Eroare la schimbarea datei de modificare:</target>
+
+<source>Error loading library function:</source>
+<target>Eroare la încărcarea bibliotecii de funcții:</target>
+
+<source>Error reading security context:</source>
+<target>Eroare la citirea contextului de securitate:</target>
+
+<source>Error writing security context:</source>
+<target>Eroare la scrierea contextului de securitate:</target>
+
+<source>Error copying file permissions:</source>
+<target>Eroare la copierea permisiunilor filei:</target>
+
+<source>Error creating directory:</source>
+<target>Eroare la crearea dosarului:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Eroare la copierea legăturii simbolice:</target>
+
+<source>Error copying file:</source>
+<target>Eroare la copierea filei:</target>
+
+<source>Error opening file:</source>
+<target>Eroare la deschiderea filei:</target>
+
+<source>Error traversing directory:</source>
+<target>Eroare la parcurgerea dosarului:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Buclă infinită la parcurgerea dosarului:</target>
+
+<source>Error setting privilege:</source>
+<target>Eroare la setarea privilegiului:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>Ambele părți s-au modificat de la ultima sincronizare!</target>
 
@@ -1337,9 +1323,6 @@ Transferă permisiunile filelor și dosarelor (Necesită drepturi de Administrat
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Dosarele sînt interdependente! Atenție la setarea regulilor de sincronizare:</target>
 
-<source>Comparing content of files %x</source>
-<target>Compar conținutul filelor %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Alocarea memoriei a eșuat!</target>
 
@@ -1355,15 +1338,15 @@ Transferă permisiunile filelor și dosarelor (Necesită drepturi de Administrat
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Simlegăturile %x au dată identică, dar ținte diferite!</target>
 
+<source>Comparing content of files %x</source>
+<target>Compar conținutul filelor %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>Compararea filelor după conținut a eșuat.</target>
 
 <source>Generating file list...</source>
 <target>Generez lista de file...</target>
 
-<source>Multiple...</source>
-<target>Multiplu...</target>
-
 <source>Both sides are equal</source>
 <target>Ambele părți sînt identice</target>
 
@@ -1382,6 +1365,12 @@ Transferă permisiunile filelor și dosarelor (Necesită drepturi de Administrat
 <source>Delete right file/folder</source>
 <target>Șterge elementul drept</target>
 
+<source>Move file on left</source>
+<target>Mută fila în stînga</target>
+
+<source>Move file on right</source>
+<target>Mută fila în dreapta</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Suprascrie elementul stîng (fila/dosarul) cu cel drept</target>
 
@@ -1397,6 +1386,9 @@ Transferă permisiunile filelor și dosarelor (Necesită drepturi de Administrat
 <source>Copy file attributes only to right</source>
 <target>Copiază atributele filelor doar înspre dreapta</target>
 
+<source>Multiple...</source>
+<target>Multiplu...</target>
+
 <source>Deleting file %x</source>
 <target>Șterg fila %x</target>
 
diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng
index 1a4965e8..75da2588 100644
--- a/BUILD/Languages/russian.lng
+++ b/BUILD/Languages/russian.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Автоматическая синхронизация</target>
 
-<source>Browse</source>
-<target>Обзор</target>
-
-<source>Windows Error Code %x:</source>
-<target>Код ошибки Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Код ошибки Linux %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>Неверная командная строка: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>Ошибка при решении символической ссылки:</target>
-
-<source>Show pop-up</source>
-<target>Показывать всплывающие окна</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Показывать всплывающие окна при ошибках и замечаниях</target>
-
-<source>Ignore errors</source>
-<target>Игнорировать ошибки</target>
-
-<source>Hide all error and warning messages</source>
-<target>Скрывать все ошибки и сообщения с предупреждениями</target>
-
-<source>Exit instantly</source>
-<target>Выйти немедленно</target>
-
-<source>Abort synchronization immediately</source>
-<target>Отменить синхронизацию немедленно</target>
-
 <source>Select alternate comparison settings</source>
 <target>Выбрать альтернативные настройки сравнения</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>Выберите промежуток времени</target>
 
+<source>Show pop-up</source>
+<target>Показывать всплывающие окна</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Показывать всплывающие окна при ошибках и замечаниях</target>
+
+<source>Ignore errors</source>
+<target>Игнорировать ошибки</target>
+
+<source>Hide all error and warning messages</source>
+<target>Скрывать все ошибки и сообщения с предупреждениями</target>
+
+<source>Exit instantly</source>
+<target>Выйти немедленно</target>
+
+<source>Abort synchronization immediately</source>
+<target>Отменить синхронизацию немедленно</target>
+
+<source>Browse</source>
+<target>Обзор</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Ошибка при чтении из базы данных синхронизации:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Ошибка при записи в базу данных синхронизации:</target>
+
+<source>Invalid command line: %x</source>
+<target>Неверная командная строка: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Код ошибки Windows %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Код ошибки Linux %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Ошибка при решении символической ссылки:</target>
+
 <source>%x MB</source>
 <target>%x МБ</target>
 
@@ -164,17 +170,14 @@
 <source>Comparison Result</source>
 <target>Результаты сравнения</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Несовместимый формат базы данных синхронизации:</target>
-
 <source>Initial synchronization:</source>
 <target>Первоначальная синхронизация:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>Одного из файлов баз данных FreeFileSync еще не существует:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Ошибка при чтении из базы данных синхронизации:</target>
+<source>Incompatible synchronization database format:</source>
+<target>Несовместимый формат базы данных синхронизации:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>Файлы баз данных не имеют общей сессии синхронизации:</target>
@@ -201,12 +204,18 @@
 <pluralform>%x секунд</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Drag && drop</target>
+
 <source>Info</source>
 <target>Информация</target>
 
 <source>Fatal Error</source>
 <target>Критическая ошибка</target>
 
+<source>Error reading file:</source>
+<target>Ошибка при чтении файла:</target>
+
 <source>Scanning:</source>
 <target>Сканирую:</target>
 
@@ -226,15 +235,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Неверный файл конфигурации FreeFileSync!</target>
 
-<source>File does not exist:</source>
-<target>Файл не существует:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Ошибка при анализе файла настроек синхронизации:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Ошибка при перемещении в "Корзину":</target>
+
+<source>Could not load a required DLL:</source>
+<target>Не удалось загрузить необходимые DLL:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>Ошибка доступа к службе Теневого Копирования Тома!</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>Создание теневых копий на WOW64 не поддерживается. Пожалуйста, используйте FreeFileSync 64-разрядной версии.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Не удалось определить название тома для файла:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Имя тома %x не является частью имени файла %y!</target>
+
 <source>/sec</source>
 <target>/с</target>
 
+<source>File does not exist:</source>
+<target>Файл не существует:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Не удалось прочитать значения для следующих XML записей:</target>
+
 <source>S&ave configuration...</source>
 <target>Сохранить настройки синхронизации...</target>
 
@@ -327,144 +357,6 @@ The command line is executed each time:
 <source>A directory input field is empty.</source>
 <target>Поле ввода пути папки пустое.</target>
 
-<source>Drag && drop</source>
-<target>Drag && drop</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>Не удалось инициализировать папку для мониторинга:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Ошибка при мониторинге папок.</target>
-
-<source>Conversion error:</source>
-<target>Ошибка преобразования:</target>
-
-<source>Error deleting file:</source>
-<target>Ошибка при удалении файла:</target>
-
-<source>Error moving file:</source>
-<target>Ошибка перемещения файла:</target>
-
-<source>Target file already existing!</source>
-<target>Конечный файл уже существует!</target>
-
-<source>Error moving directory:</source>
-<target>Ошибка перемещения папки:</target>
-
-<source>Target directory already existing!</source>
-<target>Конечная папка уже существует!</target>
-
-<source>Error deleting directory:</source>
-<target>Ошибка при удалении папки:</target>
-
-<source>Error changing modification time:</source>
-<target>Ошибка при изменении времени модификации файла:</target>
-
-<source>Error loading library function:</source>
-<target>Ошибка при загрузке функции библиотеки:</target>
-
-<source>Error reading security context:</source>
-<target>Ошибка при чтении контекста безобасности:</target>
-
-<source>Error writing security context:</source>
-<target>Ошибка при записи контекста безобасности:</target>
-
-<source>Error copying file permissions:</source>
-<target>Ошибка при копировании прав доступа:</target>
-
-<source>Error creating directory:</source>
-<target>Ошибка при создании папки:</target>
-
-<source>Error copying symbolic link:</source>
-<target>Ошибка при копировании символьной ссылки:</target>
-
-<source>Error copying file:</source>
-<target>Ошибка при копировании файла:</target>
-
-<source>Error opening file:</source>
-<target>Ошибка при открытии файла:</target>
-
-<source>Error writing file:</source>
-<target>Ошибка при записи файла:</target>
-
-<source>Error reading file:</source>
-<target>Ошибка при чтении файла:</target>
-
-<source>Operation aborted!</source>
-<target>Операция отменена!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Зацикливание при встрече пересекающихся путей:</target>
-
-<source>Error traversing directory:</source>
-<target>Ошибка при пересечении папок:</target>
-
-<source>Error setting privilege:</source>
-<target>Ошибка установки привилегий:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Ошибка при перемещении в "Корзину":</target>
-
-<source>Could not load a required DLL:</source>
-<target>Не удалось загрузить необходимые DLL:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Ошибка при записи в базу данных синхронизации:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Ошибка доступа к службе Теневого Копирования Тома!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Создание теневых копий на WOW64 не поддерживается. Пожалуйста, используйте FreeFileSync 64-разрядной версии.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>Не удалось определить название тома для файла:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>Имя тома %x не является частью имени файла %y!</target>
-
-<source>%x TB</source>
-<target>%x ТБ</target>
-
-<source>%x PB</source>
-<target>%x ПБ</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x минута</pluralform>
-<pluralform>%x минуты</pluralform>
-<pluralform>%x минут</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x час</pluralform>
-<pluralform>%x часа</pluralform>
-<pluralform>%x часов</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x день</pluralform>
-<pluralform>%x дня</pluralform>
-<pluralform>%x дней</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>Не удалось прочитать значения для следующих XML записей:</target>
-
 <source>Logging</source>
 <target>Лог-файлы</target>
 
@@ -483,9 +375,6 @@ The command line is executed each time:
 <source>Batch execution</source>
 <target>Выполнение пакетного задания</target>
 
-<source>Log-messages:</source>
-<target>Лог-сообщения:</target>
-
 <source>Stop</source>
 <target>Стоп</target>
 
@@ -615,6 +504,24 @@ The command line is executed each time:
 <source>Total amount of data that will be transferred</source>
 <target>Общий объем данных, который будет передаваться</target>
 
+<source>Operation:</source>
+<target>Операция:</target>
+
+<source>Items found:</source>
+<target>Элементов найдено:</target>
+
+<source>Items remaining:</source>
+<target>Элементов осталось:</target>
+
+<source>Speed:</source>
+<target>Скорость:</target>
+
+<source>Time remaining:</source>
+<target>Времени осталось:</target>
+
+<source>Time elapsed:</source>
+<target>Времени прошло:</target>
+
 <source>Batch job</source>
 <target>Пакетное задание</target>
 
@@ -663,32 +570,14 @@ The command line is executed each time:
 <source>&Cancel</source>
 <target>&Отмена</target>
 
-<source>Operation:</source>
-<target>Операция:</target>
-
-<source>Items found:</source>
-<target>Элементов найдено:</target>
-
-<source>Items remaining:</source>
-<target>Элементов осталось:</target>
-
-<source>Speed:</source>
-<target>Скорость:</target>
-
-<source>Time remaining:</source>
-<target>Времени осталось:</target>
-
-<source>Time elapsed:</source>
-<target>Времени прошло:</target>
-
 <source>Select variant:</source>
 <target>Выберите вариант:</target>
 
 <source><Automatic></source>
 <target><Автоматический></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Выявление и распространение изменений на обеих сторонах с использованием базы данных. Удаленные файлы и конфликты определяются автоматически.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Выявление и распространение изменений на обе стороны, используя базу данных. Удаленные, переименованные и конфликтные файлы определяются автоматически.</target>
 
 <source>Mirror ->></source>
 <target>Зеркало ->></target>
@@ -910,22 +799,14 @@ Exclude: \stuff\temp\*
 <source>Copy locked files</source>
 <target>Копирование заблокированных файлов</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Копирование общих или заблокированных файлов с использованием службы Теневого Копирования Тома (требуются права Администратора)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Копирование общих или заблокированных файлов с использованием службы Теневого Копирования Тома (требуются права Администратора)</target>
 
 <source>Copy file access permissions</source>
 <target>Копирование прав доступа к файлам</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Передача прав доступа к файлам/папкам (требуются права Администратора)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Передача прав доступа к файлам/папкам (требуются права Администратора)</target>
 
 <source>Hidden dialogs:</source>
 <target>Скрытые диалоги</target>
@@ -957,6 +838,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>&Find next</source>
 <target>&Найти далее</target>
 
+<source>Operation aborted!</source>
+<target>Операция отменена!</target>
+
 <source>Main bar</source>
 <target>Главная панель</target>
 
@@ -1134,6 +1018,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>File list exported!</source>
 <target>Список файлов экспортирован!</target>
 
+<source>Error writing file:</source>
+<target>Ошибка при записи файла:</target>
+
 <source>Batch file created successfully!</source>
 <target>Файл пакетного задания создан успешно!</target>
 
@@ -1237,9 +1124,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Filter: Single pair</source>
 <target>Фильтр: Одна пара</target>
 
-<source>Ignore</source>
-<target>Игнорировать</target>
-
 <source>Direct</source>
 <target>Прямое</target>
 
@@ -1308,6 +1192,108 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Move files into a time-stamped subdirectory</source>
 <target>Перемещать файлы в заданную папку (можно создавать архивные версии удаленных файлов)</target>
 
+<source>%x TB</source>
+<target>%x ТБ</target>
+
+<source>%x PB</source>
+<target>%x ПБ</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x минута</pluralform>
+<pluralform>%x минуты</pluralform>
+<pluralform>%x минут</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x час</pluralform>
+<pluralform>%x часа</pluralform>
+<pluralform>%x часов</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x день</pluralform>
+<pluralform>%x дня</pluralform>
+<pluralform>%x дней</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Не удалось инициализировать папку для мониторинга:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Ошибка при мониторинге папок.</target>
+
+<source>Conversion error:</source>
+<target>Ошибка преобразования:</target>
+
+<source>Error deleting file:</source>
+<target>Ошибка при удалении файла:</target>
+
+<source>Error moving file:</source>
+<target>Ошибка перемещения файла:</target>
+
+<source>Target file already existing!</source>
+<target>Конечный файл уже существует!</target>
+
+<source>Error moving directory:</source>
+<target>Ошибка перемещения папки:</target>
+
+<source>Target directory already existing!</source>
+<target>Конечная папка уже существует!</target>
+
+<source>Error deleting directory:</source>
+<target>Ошибка при удалении папки:</target>
+
+<source>Error changing modification time:</source>
+<target>Ошибка при изменении времени модификации файла:</target>
+
+<source>Error loading library function:</source>
+<target>Ошибка при загрузке функции библиотеки:</target>
+
+<source>Error reading security context:</source>
+<target>Ошибка при чтении контекста безобасности:</target>
+
+<source>Error writing security context:</source>
+<target>Ошибка при записи контекста безобасности:</target>
+
+<source>Error copying file permissions:</source>
+<target>Ошибка при копировании прав доступа:</target>
+
+<source>Error creating directory:</source>
+<target>Ошибка при создании папки:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Ошибка при копировании символьной ссылки:</target>
+
+<source>Error copying file:</source>
+<target>Ошибка при копировании файла:</target>
+
+<source>Error opening file:</source>
+<target>Ошибка при открытии файла:</target>
+
+<source>Error traversing directory:</source>
+<target>Ошибка при пересечении папок:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Зацикливание при встрече пересекающихся путей:</target>
+
+<source>Error setting privilege:</source>
+<target>Ошибка установки привилегий:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>Со времени последней синхронизации с обеих сторон произошли изменения!</target>
 
@@ -1341,9 +1327,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Зависимые папки! Будьте внимательны при настройке правил синхронизации:</target>
 
-<source>Comparing content of files %x</source>
-<target>Сравнение содержания файлов %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Ошибка выделения памяти! (Не хватает памяти)</target>
 
@@ -1359,15 +1342,15 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Символьная ссылка %x имеет ту же дату, но различное содержание!</target>
 
+<source>Comparing content of files %x</source>
+<target>Сравнение содержания файлов %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>Сравнение файлов по содержимому провалено.</target>
 
 <source>Generating file list...</source>
 <target>Создание списка файлов...</target>
 
-<source>Multiple...</source>
-<target>Различные варианты синхронизации</target>
-
 <source>Both sides are equal</source>
 <target>Обе стороны равны</target>
 
@@ -1386,6 +1369,12 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Delete right file/folder</source>
 <target>Удалить файл/папку справа</target>
 
+<source>Move file on left</source>
+<target>Переместить файл налево</target>
+
+<source>Move file on right</source>
+<target>Переместить файл направо</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Перезаписать файл/папку слева на аналогичную из правой части</target>
 
@@ -1401,6 +1390,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Copy file attributes only to right</source>
 <target>Скопировать только атрибуты файла направо</target>
 
+<source>Multiple...</source>
+<target>Различные варианты синхронизации</target>
+
 <source>Deleting file %x</source>
 <target>Удаление файла %x</target>
 
diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index bf917426..4e6683db 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Avtomatizirana sinhronizacija</target>
 
-<source>Browse</source>
-<target>Brskaj</target>
-
-<source>Windows Error Code %x:</source>
-<target>Windows koda napake %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux koda napake %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>Napačna ukazna vrstica: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>Napaka pri razreševanju simbolične povezave:</target>
-
-<source>Show pop-up</source>
-<target>Prikaži pojavno okno</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Prikaži pojavne napaka ali opozorila</target>
-
-<source>Ignore errors</source>
-<target>Ignoriraj napake</target>
-
-<source>Hide all error and warning messages</source>
-<target>Skrij vsa obvestila o napakah in opozorilih</target>
-
-<source>Exit instantly</source>
-<target>Zapusti v trenutku</target>
-
-<source>Abort synchronization immediately</source>
-<target>Takoj prekini sinhronizacijo</target>
-
 <source>Select alternate comparison settings</source>
 <target>Izberite alternativne nastavitve primerjanja</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>Izberite časovni okvir</target>
 
+<source>Show pop-up</source>
+<target>Prikaži pojavno okno</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Prikaži pojavne napaka ali opozorila</target>
+
+<source>Ignore errors</source>
+<target>Ignoriraj napake</target>
+
+<source>Hide all error and warning messages</source>
+<target>Skrij vsa obvestila o napakah in opozorilih</target>
+
+<source>Exit instantly</source>
+<target>Zapusti v trenutku</target>
+
+<source>Abort synchronization immediately</source>
+<target>Takoj prekini sinhronizacijo</target>
+
+<source>Browse</source>
+<target>Brskaj</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Napaka pri branju iz sinhronizacijske podatkovne baze:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Napaka pri pisanju v sinhronizacijsko podatkovno bazo:</target>
+
+<source>Invalid command line: %x</source>
+<target>Napačna ukazna vrstica: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Windows koda napake %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Linux koda napake %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Napaka pri razreševanju simbolične povezave:</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -165,17 +171,14 @@
 <source>Comparison Result</source>
 <target>Rezultati primerjave</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Nekompatibilen format sinhronizacijske podatkovne baze:</target>
-
 <source>Initial synchronization:</source>
 <target>Začetna sinhronizacija:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>Ena od FreeFileSync datotek podatkovne baze še en obstaja:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Napaka pri branju iz sinhronizacijske podatkovne baze:</target>
+<source>Incompatible synchronization database format:</source>
+<target>Nekompatibilen format sinhronizacijske podatkovne baze:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>Datoteke podatkovne baze si ne delijo skupne sinhronizacijske seje:</target>
@@ -203,12 +206,18 @@
 <pluralform>%x sek</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Povleci && spusti</target>
+
 <source>Info</source>
 <target>Info</target>
 
 <source>Fatal Error</source>
 <target>Usodna napaka</target>
 
+<source>Error reading file:</source>
+<target>Napaka pri branju datoteke:</target>
+
 <source>Scanning:</source>
 <target>Pregledujem:</target>
 
@@ -229,15 +238,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Neveljavna FreeFileSync nastavitvena datoteka!</target>
 
-<source>File does not exist:</source>
-<target>Datoteka ne obstaja:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Napaka pri preverjanju konfiguracijske datoteke:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Napaka pri premikanju v Koš:</target>
+
+<source>Could not load a required DLL:</source>
+<target>Ne morem naložiti zahtevano DLL:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>Napaka pri dostopu do servisa senčnih kopij!</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>Ustvarjanje senčnih kopij na WOW63 ni podprto. Prosimo uporabite 64-bitno FreeFileSync različico.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Ne morem določiti imena volumna za datoteko:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Ime volumna %x ni del imena datoteke %y!</target>
+
 <source>/sec</source>
 <target>/sek</target>
 
+<source>File does not exist:</source>
+<target>Datoteka ne obstaja:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Ne morem brati vrednosti za naslednja XML vozlišča:</target>
+
 <source>S&ave configuration...</source>
 <target>Shr&ani konfiguracijo...</target>
 
@@ -330,147 +360,6 @@ Ukazna vrstica se izvrši vsakič ko:
 <source>A directory input field is empty.</source>
 <target>Vpisno polje za imenik je prazno.</target>
 
-<source>Drag && drop</source>
-<target>Povleci && spusti</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>Ne morem začeti nadzorovanja imenikov:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Napaka pri nadzorovanju imenikov.</target>
-
-<source>Conversion error:</source>
-<target>Napaka pri pretvorbi:</target>
-
-<source>Error deleting file:</source>
-<target>Napaka pri brisanju datoteke:</target>
-
-<source>Error moving file:</source>
-<target>Napaka pri premikanju datoteke:</target>
-
-<source>Target file already existing!</source>
-<target>Ciljna datoteka že obstaja!</target>
-
-<source>Error moving directory:</source>
-<target>Napaka pri premikanju imenika:</target>
-
-<source>Target directory already existing!</source>
-<target>Ciljni imenik že obstaja!</target>
-
-<source>Error deleting directory:</source>
-<target>Napaka pri brisanju imenika:</target>
-
-<source>Error changing modification time:</source>
-<target>Napaka pri spreminjanju časa modifikacije:</target>
-
-<source>Error loading library function:</source>
-<target>Napaka pri nalaganju funkcije iz knjižnice:</target>
-
-<source>Error reading security context:</source>
-<target>Napaka pri branju varnostne skladnosti:</target>
-
-<source>Error writing security context:</source>
-<target>Napaka pri pisanju varnostne skladnosti:</target>
-
-<source>Error copying file permissions:</source>
-<target>Napaka pri kopiranju datotečnih dovoljenj:</target>
-
-<source>Error creating directory:</source>
-<target>Napaka pri ustvarjanju imenika:</target>
-
-<source>Error copying symbolic link:</source>
-<target>Napaka pri kopiranju simboličnih povezav:</target>
-
-<source>Error copying file:</source>
-<target>Napaka pri kopiranju datoteke:</target>
-
-<source>Error opening file:</source>
-<target>Napaka pri odpiranju datoteke:</target>
-
-<source>Error writing file:</source>
-<target>Napaka pri pisanju datoteke:</target>
-
-<source>Error reading file:</source>
-<target>Napaka pri branju datoteke:</target>
-
-<source>Operation aborted!</source>
-<target>Operacija prekinjena!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Neskončna zanka pri prehodu imenika:</target>
-
-<source>Error traversing directory:</source>
-<target>Napaka pri prehajanju imenika:</target>
-
-<source>Error setting privilege:</source>
-<target>Napaka pri nastavljanju privilegija:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Napaka pri premikanju v Koš:</target>
-
-<source>Could not load a required DLL:</source>
-<target>Ne morem naložiti zahtevano DLL:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Napaka pri pisanju v sinhronizacijsko podatkovno bazo:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Napaka pri dostopu do servisa senčnih kopij!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Ustvarjanje senčnih kopij na WOW63 ni podprto. Prosimo uporabite 64-bitno FreeFileSync različico.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>Ne morem določiti imena volumna za datoteko:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>Ime volumna %x ni del imena datoteke %y!</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-<pluralform>%x min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 ura</pluralform>
-<pluralform>%x uri</pluralform>
-<pluralform>%x ure</pluralform>
-<pluralform>%x ur</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 dan</pluralform>
-<pluralform>%x dni</pluralform>
-<pluralform>%x dni</pluralform>
-<pluralform>%x dni</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>Ne morem brati vrednosti za naslednja XML vozlišča:</target>
-
 <source>Logging</source>
 <target>Beleženje</target>
 
@@ -489,9 +378,6 @@ Ukazna vrstica se izvrši vsakič ko:
 <source>Batch execution</source>
 <target>Paketno izvajanje</target>
 
-<source>Log-messages:</source>
-<target>Sporočila beleženja:</target>
-
 <source>Stop</source>
 <target>Ustavi</target>
 
@@ -618,6 +504,24 @@ Ukazna vrstica se izvrši vsakič ko:
 <source>Total amount of data that will be transferred</source>
 <target>Količina podatkov, ki bo prenešena</target>
 
+<source>Operation:</source>
+<target>Operacija:</target>
+
+<source>Items found:</source>
+<target>Najdenih elementov:</target>
+
+<source>Items remaining:</source>
+<target>Preostalih elementov:</target>
+
+<source>Speed:</source>
+<target>Hitrost:</target>
+
+<source>Time remaining:</source>
+<target>Preostali čas:</target>
+
+<source>Time elapsed:</source>
+<target>Pretečen čas:</target>
+
 <source>Batch job</source>
 <target>Paketno opravilo</target>
 
@@ -666,32 +570,14 @@ Ukazna vrstica se izvrši vsakič ko:
 <source>&Cancel</source>
 <target>&Prekliči</target>
 
-<source>Operation:</source>
-<target>Operacija:</target>
-
-<source>Items found:</source>
-<target>Najdenih elementov:</target>
-
-<source>Items remaining:</source>
-<target>Preostalih elementov:</target>
-
-<source>Speed:</source>
-<target>Hitrost:</target>
-
-<source>Time remaining:</source>
-<target>Preostali čas:</target>
-
-<source>Time elapsed:</source>
-<target>Pretečen čas:</target>
-
 <source>Select variant:</source>
 <target>Izberite varianto:</target>
 
 <source><Automatic></source>
 <target><Samodejno></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Prepoznaj in širi spremembe na obeh straneh z uporabo podatkovne baze. Izbrisi in spori so zaznani samodejno.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Identificiraj in promoviraj spremembe na obeh straneh z uporabo podatkovne baze. Izbrisi, preimenovanja in spori so samodejno zaznani.</target>
 
 <source>Mirror ->></source>
 <target>Zrcalno ->></target>
@@ -913,27 +799,19 @@ Izključi: \stuff\temp\*
 <target>Transakcijsko kopiranje datotek</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></target>
+<target>Najprej zapisuj v začasno datoteko (*.ffs_tmp) in nato preimenuj. To zagotavlja dosledno stanje celo v primeru usodne napake.</target>
 
 <source>Copy locked files</source>
 <target>Kopiraj zaklenjene datoteke</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Kopiraj deljene ali zaklenjene datoteke z uporabo servisa Shadow Copy (Zahteva pravice skrbnika)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Kopiraj deljene ali zaklenjene datoteke z uporabo servisa Shadow Copy (Zahteva pravice skrbnika)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopiraj dovoljenja dostopov datoteke</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Prenesi dovoljenja datotek in imenikov (Zahteva pravice skrbnika)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Prenesi dovoljenja datotek in imenikov (Zahteva pravice skrbnika)</target>
 
 <source>Hidden dialogs:</source>
 <target>Skriti pogovori:</target>
@@ -965,6 +843,9 @@ Prenesi dovoljenja datotek in imenikov (Zahteva pravice skrbnika)
 <source>&Find next</source>
 <target>&Najdi naslednje</target>
 
+<source>Operation aborted!</source>
+<target>Operacija prekinjena!</target>
+
 <source>Main bar</source>
 <target>Glavna vrstica</target>
 
@@ -1005,16 +886,16 @@ Prenesi dovoljenja datotek in imenikov (Zahteva pravice skrbnika)
 <target>Samo-prilagodi stolpce</target>
 
 <source>Icon size:</source>
-<target></target>
+<target>Velikost ikone:</target>
 
 <source>Small</source>
-<target></target>
+<target>Majhna</target>
 
 <source>Medium</source>
-<target></target>
+<target>Srednja</target>
 
 <source>Large</source>
-<target></target>
+<target>Velika</target>
 
 <source>Include all rows</source>
 <target>Vključi se vrstice</target>
@@ -1142,6 +1023,9 @@ Prenesi dovoljenja datotek in imenikov (Zahteva pravice skrbnika)
 <source>File list exported!</source>
 <target>Seznam datotek je bil izvožen!</target>
 
+<source>Error writing file:</source>
+<target>Napaka pri pisanju datoteke:</target>
+
 <source>Batch file created successfully!</source>
 <target>Paketna datoteka je bila uspešno ustvarjena!</target>
 
@@ -1249,9 +1133,6 @@ Prenesi dovoljenja datotek in imenikov (Zahteva pravice skrbnika)
 <source>Filter: Single pair</source>
 <target>Filtriraj: En sam par</target>
 
-<source>Ignore</source>
-<target>Ignoriraj</target>
-
 <source>Direct</source>
 <target>Neposredno</target>
 
@@ -1319,6 +1200,111 @@ Prenesi dovoljenja datotek in imenikov (Zahteva pravice skrbnika)
 <source>Move files into a time-stamped subdirectory</source>
 <target>Premakni datoteke v časovno-označen podimenik</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+<pluralform>%x min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 ura</pluralform>
+<pluralform>%x uri</pluralform>
+<pluralform>%x ure</pluralform>
+<pluralform>%x ur</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 dan</pluralform>
+<pluralform>%x dni</pluralform>
+<pluralform>%x dni</pluralform>
+<pluralform>%x dni</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Ne morem začeti nadzorovanja imenikov:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Napaka pri nadzorovanju imenikov.</target>
+
+<source>Conversion error:</source>
+<target>Napaka pri pretvorbi:</target>
+
+<source>Error deleting file:</source>
+<target>Napaka pri brisanju datoteke:</target>
+
+<source>Error moving file:</source>
+<target>Napaka pri premikanju datoteke:</target>
+
+<source>Target file already existing!</source>
+<target>Ciljna datoteka že obstaja!</target>
+
+<source>Error moving directory:</source>
+<target>Napaka pri premikanju imenika:</target>
+
+<source>Target directory already existing!</source>
+<target>Ciljni imenik že obstaja!</target>
+
+<source>Error deleting directory:</source>
+<target>Napaka pri brisanju imenika:</target>
+
+<source>Error changing modification time:</source>
+<target>Napaka pri spreminjanju časa modifikacije:</target>
+
+<source>Error loading library function:</source>
+<target>Napaka pri nalaganju funkcije iz knjižnice:</target>
+
+<source>Error reading security context:</source>
+<target>Napaka pri branju varnostne skladnosti:</target>
+
+<source>Error writing security context:</source>
+<target>Napaka pri pisanju varnostne skladnosti:</target>
+
+<source>Error copying file permissions:</source>
+<target>Napaka pri kopiranju datotečnih dovoljenj:</target>
+
+<source>Error creating directory:</source>
+<target>Napaka pri ustvarjanju imenika:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Napaka pri kopiranju simboličnih povezav:</target>
+
+<source>Error copying file:</source>
+<target>Napaka pri kopiranju datoteke:</target>
+
+<source>Error opening file:</source>
+<target>Napaka pri odpiranju datoteke:</target>
+
+<source>Error traversing directory:</source>
+<target>Napaka pri prehajanju imenika:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Neskončna zanka pri prehodu imenika:</target>
+
+<source>Error setting privilege:</source>
+<target>Napaka pri nastavljanju privilegija:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>Obe strani sta se spremenili od zadnje sinhronizacije!</target>
 
@@ -1349,9 +1335,6 @@ Prenesi dovoljenja datotek in imenikov (Zahteva pravice skrbnika)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Imeniki so v odvisnosti! Bodite pozorni, ko nastavljate sinhronizacijska pravila:</target>
 
-<source>Comparing content of files %x</source>
-<target>Primerjam vsebino datotek %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Neuspešno dodeljevanje pomnilnika!</target>
 
@@ -1367,15 +1350,15 @@ Prenesi dovoljenja datotek in imenikov (Zahteva pravice skrbnika)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Simbolične povezave %x imajo isti datum, vendar različni cilj!</target>
 
+<source>Comparing content of files %x</source>
+<target>Primerjam vsebino datotek %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>Primerjava datotek po vsebini ni uspela.</target>
 
 <source>Generating file list...</source>
 <target>Ustvarjam seznam datotek...</target>
 
-<source>Multiple...</source>
-<target>Večkratno...</target>
-
 <source>Both sides are equal</source>
 <target>Obe strani sta enaki</target>
 
@@ -1394,6 +1377,12 @@ Prenesi dovoljenja datotek in imenikov (Zahteva pravice skrbnika)
 <source>Delete right file/folder</source>
 <target>Izbriši desno datoteko/mapo</target>
 
+<source>Move file on left</source>
+<target>Premakni datoteko na levo</target>
+
+<source>Move file on right</source>
+<target>Premakni datoteko na desno</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Prepiši levo datoteko/mapo s tisto na desni</target>
 
@@ -1409,6 +1398,9 @@ Prenesi dovoljenja datotek in imenikov (Zahteva pravice skrbnika)
 <source>Copy file attributes only to right</source>
 <target>Kopiraj atribute datoteke samo na desno</target>
 
+<source>Multiple...</source>
+<target>Večkratno...</target>
+
 <source>Deleting file %x</source>
 <target>Brisanje datoteke %x</target>
 
diff --git a/BUILD/Languages/spanish.lng b/BUILD/Languages/spanish.lng
index f1072972..574aeca1 100644
--- a/BUILD/Languages/spanish.lng
+++ b/BUILD/Languages/spanish.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronización Automática</target>
 
-<source>Browse</source>
-<target>Examinar</target>
-
-<source>Windows Error Code %x:</source>
-<target>Código de error de Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Código de error de Linux %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>Línea de comandos errónea: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>Error al resolver enlace simbólico:</target>
-
-<source>Show pop-up</source>
-<target>Mostrar ventana emergente</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Mostrar ventana emergente de errores o avisos</target>
-
-<source>Ignore errors</source>
-<target>Ignorar errores</target>
-
-<source>Hide all error and warning messages</source>
-<target>Ocultar todos los mensajes de error y aviso</target>
-
-<source>Exit instantly</source>
-<target>Salir inmediatamente</target>
-
-<source>Abort synchronization immediately</source>
-<target>Abortar sincronización inmediatamente</target>
-
 <source>Select alternate comparison settings</source>
 <target>Seleccionar opciones alternativas de comparación</target>
 
@@ -113,7 +80,46 @@
 <target>Buscar</target>
 
 <source>Select time span</source>
-<target></target>
+<target>Seleccionar duración</target>
+
+<source>Show pop-up</source>
+<target>Mostrar ventana emergente</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Mostrar ventana emergente de errores o avisos</target>
+
+<source>Ignore errors</source>
+<target>Ignorar errores</target>
+
+<source>Hide all error and warning messages</source>
+<target>Ocultar todos los mensajes de error y aviso</target>
+
+<source>Exit instantly</source>
+<target>Salir inmediatamente</target>
+
+<source>Abort synchronization immediately</source>
+<target>Abortar sincronización inmediatamente</target>
+
+<source>Browse</source>
+<target>Examinar</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Error al leer de la base de datos de sincronización:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Error al escribir en la base de datos de sincronización:</target>
+
+<source>Invalid command line: %x</source>
+<target>Línea de comandos errónea: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Código de error de Windows %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Código de error de Linux %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Error al resolver enlace simbólico:</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -163,17 +169,14 @@
 <source>Comparison Result</source>
 <target>Resultado de la comparación</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Formato de base de datos de sincronización incompatible:</target>
-
 <source>Initial synchronization:</source>
 <target>Sincronización inicial:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>Uno de los archivos de la base de datos de FreeFileSync aún no existe:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Error al leer de la base de datos de sincronización:</target>
+<source>Incompatible synchronization database format:</source>
+<target>Formato de base de datos de sincronización incompatible:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>Archivos de base de datos no comparten la misma sesión de sincronización:</target>
@@ -199,12 +202,18 @@
 <pluralform>%x segundos</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Arrastrar y soltar</target>
+
 <source>Info</source>
 <target>Info</target>
 
 <source>Fatal Error</source>
 <target>Error fatal</target>
 
+<source>Error reading file:</source>
+<target>Error al leer archivo:</target>
+
 <source>Scanning:</source>
 <target>Escanear:</target>
 
@@ -223,15 +232,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>¡Archivo de configuración de FreeFileSync inválido!</target>
 
-<source>File does not exist:</source>
-<target>El archivo no existe:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Error al analizar el archivo de configuración:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Error al mover a la Papelera de Reciclaje:</target>
+
+<source>Could not load a required DLL:</source>
+<target>No se ha podido cargar el DLL solicitado:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>¡Error al acceder al servicio Volume Shadow Copy!</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>La realización de copias shadow en WOW64 no está soportado. Por favor, use la versión 64-bit de FreeFileSync.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>No se ha podido determinar el nombre del volumen para el archivo:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>El nombre del volumen %x no es una parte del nombre de archivo %y</target>
+
 <source>/sec</source>
 <target>/seg</target>
 
+<source>File does not exist:</source>
+<target>El archivo no existe:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>No se ha podido leer los valores para los siguientes nodos XML:</target>
+
 <source>S&ave configuration...</source>
 <target>G&uardar configuración...</target>
 
@@ -324,141 +354,6 @@ La línea de comandos se ejecuta cada vez:
 <source>A directory input field is empty.</source>
 <target>Un campo de directorio está vacío.</target>
 
-<source>Drag && drop</source>
-<target>Arrastrar y soltar</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>No se ha podido inicializar la visualización de directorios:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Error al visualizar los directorios.</target>
-
-<source>Conversion error:</source>
-<target>Error de conversión:</target>
-
-<source>Error deleting file:</source>
-<target>Error al borrar archivo:</target>
-
-<source>Error moving file:</source>
-<target>Error al mover archivo:</target>
-
-<source>Target file already existing!</source>
-<target>¡El archivo de destino ya existe!</target>
-
-<source>Error moving directory:</source>
-<target>Error al mover directorio:</target>
-
-<source>Target directory already existing!</source>
-<target>¡El directorio de destino ya existe!</target>
-
-<source>Error deleting directory:</source>
-<target>Error al borrar directorio:</target>
-
-<source>Error changing modification time:</source>
-<target>Error al cambiar hora de modificación:</target>
-
-<source>Error loading library function:</source>
-<target>Error al cargar la función de biblioteca:</target>
-
-<source>Error reading security context:</source>
-<target>Error al leer en contexto de seguridad:</target>
-
-<source>Error writing security context:</source>
-<target>Error al escribir en contexto de seguridad:</target>
-
-<source>Error copying file permissions:</source>
-<target>Error al copiar permisos del fichero:</target>
-
-<source>Error creating directory:</source>
-<target>Error al crear directorio:</target>
-
-<source>Error copying symbolic link:</source>
-<target>Error al copiar enlace simbólico:</target>
-
-<source>Error copying file:</source>
-<target>Error al copiar archivo:</target>
-
-<source>Error opening file:</source>
-<target>Error al abrir archivo:</target>
-
-<source>Error writing file:</source>
-<target>Error al escribir archivo:</target>
-
-<source>Error reading file:</source>
-<target>Error al leer archivo:</target>
-
-<source>Operation aborted!</source>
-<target>¡Operación abortada!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Bucle infinito al buscar en el directorio:</target>
-
-<source>Error traversing directory:</source>
-<target>Error al buscar en el directorio:</target>
-
-<source>Error setting privilege:</source>
-<target>Error al establecer privilegios:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Error al mover a la Papelera de Reciclaje:</target>
-
-<source>Could not load a required DLL:</source>
-<target>No se ha podido cargar el DLL solicitado:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Error al escribir en la base de datos de sincronización:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>¡Error al acceder al servicio Volume Shadow Copy!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>La realización de copias shadow en WOW64 no está soportado. Por favor, use la versión 64-bit de FreeFileSync.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>No se ha podido determinar el nombre del volumen para el archivo:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>El nombre del volumen %x no es una parte del nombre de archivo %y</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 minuto</pluralform>
-<pluralform>%x minutos</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 hora</pluralform>
-<pluralform>%x horas</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 día</pluralform>
-<pluralform>%x días</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>No se ha podido leer los valores para los siguientes nodos XML:</target>
-
 <source>Logging</source>
 <target>Iniciando sesión</target>
 
@@ -477,9 +372,6 @@ La línea de comandos se ejecuta cada vez:
 <source>Batch execution</source>
 <target>Ejecución batch</target>
 
-<source>Log-messages:</source>
-<target>Registro de mensajes:</target>
-
 <source>Stop</source>
 <target>Detener</target>
 
@@ -606,6 +498,24 @@ La línea de comandos se ejecuta cada vez:
 <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>Items found:</source>
+<target>Elementos encontrados:</target>
+
+<source>Items remaining:</source>
+<target>Elementos restantes:</target>
+
+<source>Speed:</source>
+<target>Velocidad:</target>
+
+<source>Time remaining:</source>
+<target>Tiempo restante:</target>
+
+<source>Time elapsed:</source>
+<target>Tiempo transcurrido:</target>
+
 <source>Batch job</source>
 <target>Tarea batch</target>
 
@@ -654,32 +564,14 @@ La línea de comandos se ejecuta cada vez:
 <source>&Cancel</source>
 <target>&Cancelar</target>
 
-<source>Operation:</source>
-<target>Operación:</target>
-
-<source>Items found:</source>
-<target>Elementos encontrados:</target>
-
-<source>Items remaining:</source>
-<target>Elementos restantes:</target>
-
-<source>Speed:</source>
-<target>Velocidad:</target>
-
-<source>Time remaining:</source>
-<target>Tiempo restante:</target>
-
-<source>Time elapsed:</source>
-<target>Tiempo transcurrido:</target>
-
 <source>Select variant:</source>
 <target>Seleccione un tipo:</target>
 
 <source><Automatic></source>
 <target><Automático></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Identificar y aplicar cambios en ambos lados usando una base de datos. Las eliminaciones y los conflictos se detectan automáticamente.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Identificar y propagar cambios en ambos lados usando una base de datos. Borrados, renombraciones y conflictos son detectados automáticamente.</target>
 
 <source>Mirror ->></source>
 <target>Espejo ->></target>
@@ -901,27 +793,19 @@ Excluir: \stuff\temp\*
 <target>Copia de archivos transaccionales</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></target>
+<target>Escribir en archivo temporal (*.ffs_tmp) primero y después renombrarlo. Esto garantiza un estado consistente incluso en caso de error fatal.</target>
 
 <source>Copy locked files</source>
 <target>Copiar archivos bloqueados</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Copiar archivos compartidos o bloqueados usando el servicio "Volume Shadow Copy" (Requiere derechos de administrador)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Copiar archivos compartidos o bloqueados usando el servicio "Volume Shadow Copy" (Requiere derechos de administrador)</target>
 
 <source>Copy file access permissions</source>
 <target>Copiar permisos de acceso al archivo</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Transferir permisos de archivo y directorio (Requiere derechos de administrador)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Transferir permisos de archivo y directorio (Requiere derechos de administrador)</target>
 
 <source>Hidden dialogs:</source>
 <target>Diálogos ocultos:</target>
@@ -953,6 +837,9 @@ Transferir permisos de archivo y directorio (Requiere derechos de administrador)
 <source>&Find next</source>
 <target>&Buscar siguiente</target>
 
+<source>Operation aborted!</source>
+<target>¡Operación abortada!</target>
+
 <source>Main bar</source>
 <target>Barra principal</target>
 
@@ -993,16 +880,16 @@ Transferir permisos de archivo y directorio (Requiere derechos de administrador)
 <target>Ajustar automáticamente las columnas</target>
 
 <source>Icon size:</source>
-<target></target>
+<target>Tamaño del icono:</target>
 
 <source>Small</source>
-<target></target>
+<target>Pequeño</target>
 
 <source>Medium</source>
-<target></target>
+<target>Medio</target>
 
 <source>Large</source>
-<target></target>
+<target>Grande</target>
 
 <source>Include all rows</source>
 <target>Incluir todas las filas</target>
@@ -1130,6 +1017,9 @@ Transferir permisos de archivo y directorio (Requiere derechos de administrador)
 <source>File list exported!</source>
 <target>¡Lista de archivos exportada!</target>
 
+<source>Error writing file:</source>
+<target>Error al escribir archivo:</target>
+
 <source>Batch file created successfully!</source>
 <target>¡El archivo batch ha sido creado correctamente!</target>
 
@@ -1229,9 +1119,6 @@ Transferir permisos de archivo y directorio (Requiere derechos de administrador)
 <source>Filter: Single pair</source>
 <target>Filtro: Sólo un par</target>
 
-<source>Ignore</source>
-<target>Ignorar</target>
-
 <source>Direct</source>
 <target>Enviar</target>
 
@@ -1295,6 +1182,105 @@ Transferir permisos de archivo y directorio (Requiere derechos de administrador)
 <source>Move files into a time-stamped subdirectory</source>
 <target>Mover archivos a un subdirectorio con marca de tiempo</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 minuto</pluralform>
+<pluralform>%x minutos</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 hora</pluralform>
+<pluralform>%x horas</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 día</pluralform>
+<pluralform>%x días</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>No se ha podido inicializar la visualización de directorios:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Error al visualizar los directorios.</target>
+
+<source>Conversion error:</source>
+<target>Error de conversión:</target>
+
+<source>Error deleting file:</source>
+<target>Error al borrar archivo:</target>
+
+<source>Error moving file:</source>
+<target>Error al mover archivo:</target>
+
+<source>Target file already existing!</source>
+<target>¡El archivo de destino ya existe!</target>
+
+<source>Error moving directory:</source>
+<target>Error al mover directorio:</target>
+
+<source>Target directory already existing!</source>
+<target>¡El directorio de destino ya existe!</target>
+
+<source>Error deleting directory:</source>
+<target>Error al borrar directorio:</target>
+
+<source>Error changing modification time:</source>
+<target>Error al cambiar hora de modificación:</target>
+
+<source>Error loading library function:</source>
+<target>Error al cargar la función de biblioteca:</target>
+
+<source>Error reading security context:</source>
+<target>Error al leer en contexto de seguridad:</target>
+
+<source>Error writing security context:</source>
+<target>Error al escribir en contexto de seguridad:</target>
+
+<source>Error copying file permissions:</source>
+<target>Error al copiar permisos del fichero:</target>
+
+<source>Error creating directory:</source>
+<target>Error al crear directorio:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Error al copiar enlace simbólico:</target>
+
+<source>Error copying file:</source>
+<target>Error al copiar archivo:</target>
+
+<source>Error opening file:</source>
+<target>Error al abrir archivo:</target>
+
+<source>Error traversing directory:</source>
+<target>Error al buscar en el directorio:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Bucle infinito al buscar en el directorio:</target>
+
+<source>Error setting privilege:</source>
+<target>Error al establecer privilegios:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>¡Ambos lados han cambiado desde la última sincronizacion!</target>
 
@@ -1325,9 +1311,6 @@ Transferir permisos de archivo y directorio (Requiere derechos de administrador)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>¡Los directorios son dependientes! Tenga cuidado al establecer las reglas de sincronización:</target>
 
-<source>Comparing content of files %x</source>
-<target>Comparación del contenido de los archivos %x</target>
-
 <source>Memory allocation failed!</source>
 <target>¡La asignación de memoria ha fallado!</target>
 
@@ -1343,15 +1326,15 @@ Transferir permisos de archivo y directorio (Requiere derechos de administrador)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>¡Los enlaces simbólicos %x tienen la misma fecha pero un destino diferente!</target>
 
+<source>Comparing content of files %x</source>
+<target>Comparación del contenido de los archivos %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>La comparación de archivos por el contenido ha fallado.</target>
 
 <source>Generating file list...</source>
 <target>Generando lista de archivos...</target>
 
-<source>Multiple...</source>
-<target>Múltiple...</target>
-
 <source>Both sides are equal</source>
 <target>Ambos lados son iguales</target>
 
@@ -1370,6 +1353,12 @@ Transferir permisos de archivo y directorio (Requiere derechos de administrador)
 <source>Delete right file/folder</source>
 <target>Eliminar archivo/carpeta de la derecha</target>
 
+<source>Move file on left</source>
+<target>Mover archivo a la izquierda</target>
+
+<source>Move file on right</source>
+<target>Mover archivo a la derecha</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Sobreescribir archivo/carpeta de la izquierda por el de la derecha</target>
 
@@ -1385,6 +1374,9 @@ Transferir permisos de archivo y directorio (Requiere derechos de administrador)
 <source>Copy file attributes only to right</source>
 <target>Copiar sólo atributos del archivo a la derecha</target>
 
+<source>Multiple...</source>
+<target>Múltiple...</target>
+
 <source>Deleting file %x</source>
 <target>Borrar archivo %x</target>
 
diff --git a/BUILD/Languages/swedish.lng b/BUILD/Languages/swedish.lng
index acd17992..07d20948 100644
--- a/BUILD/Languages/swedish.lng
+++ b/BUILD/Languages/swedish.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatiserad synkronisering</target>
 
-<source>Browse</source>
-<target>Bläddra</target>
-
-<source>Windows Error Code %x:</source>
-<target>Windows Felkod %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux Felkod %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>Ogiltig kommandorad: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>Kan inte tyda symbolisk länk:</target>
-
-<source>Show pop-up</source>
-<target>Visa pop-up</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Visa pop-up vid fel och varningar</target>
-
-<source>Ignore errors</source>
-<target>Ignorera fel</target>
-
-<source>Hide all error and warning messages</source>
-<target>Visa inte fel- och varningsmeddelanden</target>
-
-<source>Exit instantly</source>
-<target>Avsluta omedelbart</target>
-
-<source>Abort synchronization immediately</source>
-<target>Avbryt synkronisering omedelbart</target>
-
 <source>Select alternate comparison settings</source>
 <target>Välj alternativa jämförelseinställningar</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>Välj tidsintervall</target>
 
+<source>Show pop-up</source>
+<target>Visa pop-up</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Visa pop-up vid fel och varningar</target>
+
+<source>Ignore errors</source>
+<target>Ignorera fel</target>
+
+<source>Hide all error and warning messages</source>
+<target>Visa inte fel- och varningsmeddelanden</target>
+
+<source>Exit instantly</source>
+<target>Avsluta omedelbart</target>
+
+<source>Abort synchronization immediately</source>
+<target>Avbryt synkronisering omedelbart</target>
+
+<source>Browse</source>
+<target>Bläddra</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Kan inte läsa från databasen:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Kan inte skriva till databas:</target>
+
+<source>Invalid command line: %x</source>
+<target>Ogiltig kommandorad: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Windows Felkod %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Linux Felkod %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Kan inte tyda symbolisk länk:</target>
+
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -163,17 +169,14 @@
 <source>Comparison Result</source>
 <target>Jämförelseresultat</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Inkompatibelt databasformat:</target>
-
 <source>Initial synchronization:</source>
 <target>Initial synkronisering:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>En av FreeFileSyncs databasfiler saknas:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Kan inte läsa från databasen:</target>
+<source>Incompatible synchronization database format:</source>
+<target>Inkompatibelt databasformat:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>Databasfiler delar inte en gemensam synkroniseringssession:</target>
@@ -199,12 +202,18 @@
 <pluralform>%x sek</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Dra && släpp</target>
+
 <source>Info</source>
 <target>Info</target>
 
 <source>Fatal Error</source>
 <target>Allvarligt fel</target>
 
+<source>Error reading file:</source>
+<target>Kan inte läsa fil:</target>
+
 <source>Scanning:</source>
 <target>Skannar:</target>
 
@@ -223,15 +232,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Felaktig FreeFileSync konfigurationsfil!</target>
 
-<source>File does not exist:</source>
-<target>Filen finns inte:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Kan inte läsa in konfigurationsfil:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Kan inte flytta till papperskorgen:</target>
+
+<source>Could not load a required DLL:</source>
+<target>Kan inte läsa in nödvändig DLL:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>Kunde inte starta tjänsten Volume Shadow Copy (VSS)</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>Skuggkopior av wow64 stöds ej. Använd FreeFileSync x64 istället!</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Kan inte bestämma volym för fil:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Volymnamn %x saknas i filnamn %y!</target>
+
 <source>/sec</source>
 <target>/s</target>
 
+<source>File does not exist:</source>
+<target>Filen finns inte:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Kan inte läsa värden för följande XML-noder:</target>
+
 <source>S&ave configuration...</source>
 <target>S&para inställningar...</target>
 
@@ -324,141 +354,6 @@ Kommandot verkställes när:
 <source>A directory input field is empty.</source>
 <target>Ett katalogfält är tomt</target>
 
-<source>Drag && drop</source>
-<target>Dra && släpp</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>Kan inte initiera katalogskanner:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Fel vid övervakning av kataloger.</target>
-
-<source>Conversion error:</source>
-<target>Konversionsfel:</target>
-
-<source>Error deleting file:</source>
-<target>Kan inte ta bort fil:</target>
-
-<source>Error moving file:</source>
-<target>Kan inte flytta fil:</target>
-
-<source>Target file already existing!</source>
-<target>Filen finns redan!</target>
-
-<source>Error moving directory:</source>
-<target>Kan inte flytta katalog:</target>
-
-<source>Target directory already existing!</source>
-<target>Målkatalogen finns redan!</target>
-
-<source>Error deleting directory:</source>
-<target>Kan inte ta bort katalog:</target>
-
-<source>Error changing modification time:</source>
-<target>Kan inte modifiera tidsstämpel:</target>
-
-<source>Error loading library function:</source>
-<target>Kan inte starta biblioteksfunktion:</target>
-
-<source>Error reading security context:</source>
-<target>Kan inte läsa säkerhetskontext:</target>
-
-<source>Error writing security context:</source>
-<target>Kan inte skriva säkerhetskontext:</target>
-
-<source>Error copying file permissions:</source>
-<target>Kan inte kopiera filsystembehörighet:</target>
-
-<source>Error creating directory:</source>
-<target>Kan inte skapa katalog:</target>
-
-<source>Error copying symbolic link:</source>
-<target>Kan inte kopiera symbolisk länk:</target>
-
-<source>Error copying file:</source>
-<target>Kan inte kopiera fil:</target>
-
-<source>Error opening file:</source>
-<target>Kan inte öppna fil:</target>
-
-<source>Error writing file:</source>
-<target>Kan inte skriva fil:</target>
-
-<source>Error reading file:</source>
-<target>Kan inte läsa fil:</target>
-
-<source>Operation aborted!</source>
-<target>Processen avbruten!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Oändlig loop vid accessförsök på katalog:</target>
-
-<source>Error traversing directory:</source>
-<target>Accessfel på katalog:</target>
-
-<source>Error setting privilege:</source>
-<target>Kan inte ange privilegie:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Kan inte flytta till papperskorgen:</target>
-
-<source>Could not load a required DLL:</source>
-<target>Kan inte läsa in nödvändig DLL:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Kan inte skriva till databas:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Kunde inte starta tjänsten Volume Shadow Copy (VSS)</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Skuggkopior av wow64 stöds ej. Använd FreeFileSync x64 istället!</target>
-
-<source>Could not determine volume name for file:</source>
-<target>Kan inte bestämma volym för fil:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>Volymnamn %x saknas i filnamn %y!</target>
-
-<source>%x TB</source>
-<target>%x TB</target>
-
-<source>%x PB</source>
-<target>%x PB</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 timma</pluralform>
-<pluralform>%x timmar</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 dag</pluralform>
-<pluralform>%x dagar</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>Kan inte läsa värden för följande XML-noder:</target>
-
 <source>Logging</source>
 <target>Loggar</target>
 
@@ -477,9 +372,6 @@ Kommandot verkställes när:
 <source>Batch execution</source>
 <target>Batch-körning</target>
 
-<source>Log-messages:</source>
-<target>Logg-meddelanden:</target>
-
 <source>Stop</source>
 <target>Stopp</target>
 
@@ -606,6 +498,24 @@ Kommandot verkställes när:
 <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>Items found:</source>
+<target>Funna poster:</target>
+
+<source>Items remaining:</source>
+<target>Återstående poster:</target>
+
+<source>Speed:</source>
+<target>Hastighet:</target>
+
+<source>Time remaining:</source>
+<target>Kvarvarande tid:</target>
+
+<source>Time elapsed:</source>
+<target>Förfluten tid:</target>
+
 <source>Batch job</source>
 <target>Batch-jobb</target>
 
@@ -654,32 +564,14 @@ Kommandot verkställes när:
 <source>&Cancel</source>
 <target>&Avbryt</target>
 
-<source>Operation:</source>
-<target>Arbetsuppgift:</target>
-
-<source>Items found:</source>
-<target>Funna poster:</target>
-
-<source>Items remaining:</source>
-<target>Återstående poster:</target>
-
-<source>Speed:</source>
-<target>Hastighet:</target>
-
-<source>Time remaining:</source>
-<target>Kvarvarande tid:</target>
-
-<source>Time elapsed:</source>
-<target>Förfluten tid:</target>
-
 <source>Select variant:</source>
 <target>Välj variant:</target>
 
 <source><Automatic></source>
 <target><Automatisk></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Identifiera och visa förändringar på båda sidor via databas. Borttagningar och konflikter upptäcks automatiskt.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Använd en databas för att identifiera och sprida ändringar på båda sidor. Borttagning, namnbyte och konflikter upptäcks automatiskt</target>
 
 <source>Mirror ->></source>
 <target>Spegla ->></target>
@@ -901,27 +793,19 @@ Undanta: \stuff\temp\*
 <target>Transaktionell filkopiering</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></target>
+<target>Skriv först till en temporär fil (*.ffs_tmp) och byt sedan namn på den. Detta garanterar en konsistent status även vid allvarliga fel</target>
 
 <source>Copy locked files</source>
 <target>Kopiera låsta filer</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Kopiera delade eller låsta filer med hjälp av Volume Shadow Copy Service (Kräver administratörsrättighet)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Kopiera delade eller låsta filer med hjälp av Volume Shadow Copy Service (Kräver administratörsrättighet)</target>
 
 <source>Copy file access permissions</source>
 <target>Kopiera filåtkomstbehörigheter</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Överför fil- och katalogrättigheter (Kräver administratörsrättigheter)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Överför fil- och katalogrättigheter (Kräver administratörsrättigheter)</target>
 
 <source>Hidden dialogs:</source>
 <target>Dolda meddelanden:</target>
@@ -953,6 +837,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>&Find next</source>
 <target>&Sök nästa</target>
 
+<source>Operation aborted!</source>
+<target>Processen avbruten!</target>
+
 <source>Main bar</source>
 <target>Huvudfält</target>
 
@@ -993,16 +880,16 @@ Transfer file and directory permissions (Requires Administrator rights)
 <target>Autojustera kollumner</target>
 
 <source>Icon size:</source>
-<target></target>
+<target>Ikonstorlek:</target>
 
 <source>Small</source>
-<target></target>
+<target>Liten</target>
 
 <source>Medium</source>
-<target></target>
+<target>Normal</target>
 
 <source>Large</source>
-<target></target>
+<target>Stor</target>
 
 <source>Include all rows</source>
 <target>Inkludera alla rader</target>
@@ -1130,6 +1017,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>File list exported!</source>
 <target>Fillista exporterad!</target>
 
+<source>Error writing file:</source>
+<target>Kan inte skriva fil:</target>
+
 <source>Batch file created successfully!</source>
 <target>Batch-filen skapades korrekt!</target>
 
@@ -1229,9 +1119,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Filter: Single pair</source>
 <target>Filter: Enstaka undantag</target>
 
-<source>Ignore</source>
-<target>Ignorera</target>
-
 <source>Direct</source>
 <target>Direkt</target>
 
@@ -1295,6 +1182,105 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Move files into a time-stamped subdirectory</source>
 <target>Flytta filer till en tidsstämplad underkatalog</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 timma</pluralform>
+<pluralform>%x timmar</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 dag</pluralform>
+<pluralform>%x dagar</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Kan inte initiera katalogskanner:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Fel vid övervakning av kataloger.</target>
+
+<source>Conversion error:</source>
+<target>Konversionsfel:</target>
+
+<source>Error deleting file:</source>
+<target>Kan inte ta bort fil:</target>
+
+<source>Error moving file:</source>
+<target>Kan inte flytta fil:</target>
+
+<source>Target file already existing!</source>
+<target>Filen finns redan!</target>
+
+<source>Error moving directory:</source>
+<target>Kan inte flytta katalog:</target>
+
+<source>Target directory already existing!</source>
+<target>Målkatalogen finns redan!</target>
+
+<source>Error deleting directory:</source>
+<target>Kan inte ta bort katalog:</target>
+
+<source>Error changing modification time:</source>
+<target>Kan inte modifiera tidsstämpel:</target>
+
+<source>Error loading library function:</source>
+<target>Kan inte starta biblioteksfunktion:</target>
+
+<source>Error reading security context:</source>
+<target>Kan inte läsa säkerhetskontext:</target>
+
+<source>Error writing security context:</source>
+<target>Kan inte skriva säkerhetskontext:</target>
+
+<source>Error copying file permissions:</source>
+<target>Kan inte kopiera filsystembehörighet:</target>
+
+<source>Error creating directory:</source>
+<target>Kan inte skapa katalog:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Kan inte kopiera symbolisk länk:</target>
+
+<source>Error copying file:</source>
+<target>Kan inte kopiera fil:</target>
+
+<source>Error opening file:</source>
+<target>Kan inte öppna fil:</target>
+
+<source>Error traversing directory:</source>
+<target>Accessfel på katalog:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Oändlig loop vid accessförsök på katalog:</target>
+
+<source>Error setting privilege:</source>
+<target>Kan inte ange privilegie:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>Båda sidor har ändrats sedan senaste synkroniseringen!</target>
 
@@ -1325,9 +1311,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Kataloger är beroende! Var försiktig när du sätter upp synkroniseringsregler:</target>
 
-<source>Comparing content of files %x</source>
-<target>Jämför filinnehåll för %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Minnesallokering misslyckades!</target>
 
@@ -1343,15 +1326,15 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Symbolisk länk %x har samma datum, men annat mål!</target>
 
+<source>Comparing content of files %x</source>
+<target>Jämför filinnehåll för %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>Kunde inte jämföra filinnehåll.</target>
 
 <source>Generating file list...</source>
 <target>Skapar fillista...</target>
 
-<source>Multiple...</source>
-<target>Multipla...</target>
-
 <source>Both sides are equal</source>
 <target>Bägge sidor är lika</target>
 
@@ -1370,6 +1353,12 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Delete right file/folder</source>
 <target>Ta bort höger fil/katalog</target>
 
+<source>Move file on left</source>
+<target>Flytta fil på vänster sida</target>
+
+<source>Move file on right</source>
+<target>Flytta fil på höger sida</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Skriv över vänster fil/katalog med den högra</target>
 
@@ -1385,6 +1374,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Copy file attributes only to right</source>
 <target>Kopiera endast filattribut åt höger</target>
 
+<source>Multiple...</source>
+<target>Multipla...</target>
+
 <source>Deleting file %x</source>
 <target>Tar bort filen %x</target>
 
diff --git a/BUILD/Languages/turkish.lng b/BUILD/Languages/turkish.lng
index a360bcd1..2e0622d4 100644
--- a/BUILD/Languages/turkish.lng
+++ b/BUILD/Languages/turkish.lng
@@ -169,15 +169,15 @@
 <source>Comparison Result</source>
 <target>Karşılaştırma sonucu</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Uyumsuz eşleştirme veritabanı biçimi:</target>
-
 <source>Initial synchronization:</source>
 <target>Başlangıç eşleştirmesi:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>FreeFileSync veritabanı dosyalarından biri henüz yok:</target>
 
+<source>Incompatible synchronization database format:</source>
+<target>Uyumsuz eşleştirme veritabanı biçimi:</target>
+
 <source>Database files do not share a common synchronization session:</source>
 <target>Veritabanıdosyaları ortak bir eşleştirmeoturumunu paylaşmıyor:</target>
 
@@ -232,9 +232,6 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Geçersiz FreeFileSync yapılandırma dosyası!</target>
 
-<source>File does not exist:</source>
-<target>Dosya bulunamadı:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Yapılandırma dosyası çözümlenirken hata:</target>
 
@@ -259,6 +256,9 @@
 <source>/sec</source>
 <target>/san</target>
 
+<source>File does not exist:</source>
+<target>Dosya bulunamadı:</target>
+
 <source>Could not read values for the following XML nodes:</source>
 <target>Şu XML düğümlerindeki değerler okunamadı:</target>
 
@@ -372,9 +372,6 @@ Her seferinde çalıştırılacak komut satırı:
 <source>Batch execution</source>
 <target>Toplu komut yürütme</target>
 
-<source>Log-messages:</source>
-<target>Günlük iletileri:</target>
-
 <source>Stop</source>
 <target>Durdur</target>
 
@@ -501,6 +498,24 @@ Her seferinde çalıştırılacak komut satırı:
 <source>Total amount of data that will be transferred</source>
 <target>Aktarılacak toplam veri miktarı</target>
 
+<source>Operation:</source>
+<target>İşlem:</target>
+
+<source>Items found:</source>
+<target>Bulunan bileşenler:</target>
+
+<source>Items remaining:</source>
+<target>Kalan bileşenler:</target>
+
+<source>Speed:</source>
+<target>Hız:</target>
+
+<source>Time remaining:</source>
+<target>Kalan zaman:</target>
+
+<source>Time elapsed:</source>
+<target>Geçen zaman:</target>
+
 <source>Batch job</source>
 <target>Toplu iş</target>
 
@@ -549,32 +564,14 @@ Her seferinde çalıştırılacak komut satırı:
 <source>&Cancel</source>
 <target>İ&ptal</target>
 
-<source>Operation:</source>
-<target>İşlem:</target>
-
-<source>Items found:</source>
-<target>Bulunan bileşenler:</target>
-
-<source>Items remaining:</source>
-<target>Kalan bileşenler:</target>
-
-<source>Speed:</source>
-<target>Hız:</target>
-
-<source>Time remaining:</source>
-<target>Kalan zaman:</target>
-
-<source>Time elapsed:</source>
-<target>Geçen zaman:</target>
-
 <source>Select variant:</source>
 <target>Davranışı seçin:</target>
 
 <source><Automatic></source>
 <target><Kendiliğinden></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Bir veritabanı kullanarak iki yandaki değişiklikleri belirler ve günceller. Silinme ve tutarsızlıklar kendiliğinden algılanır.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>İki yandaki değişiklikleri bir veritabanı kullanarak belirle ve sakla. Silme, yeniden adlandırma ve çakışma işlemleri kendiliğinden algılanır.</target>
 
 <source>Mirror ->></source>
 <target>Yansı ->></target>
@@ -801,22 +798,14 @@ Katma: \stuff\temp\*
 <source>Copy locked files</source>
 <target>Kilitli dosyaları da kopyala</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Paylaşılan ya da kilitli dosyaları Gölge Kopya Hizmetini kullanarak kopyalar (Yönetici izinlerine gerek duyar)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Paylaşılan ya da kilitli dosyaları Gölge Kopya Hizmetini kullanarak kopyalar (Yönetici izinlerine gerek duyar)</target>
 
 <source>Copy file access permissions</source>
 <target>Dosya erişim izinlerini kopyala</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Dosya ve klasör izinlerini de aktarır (Yönetici izinlerine gerek duyar)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Dosya ve klasör izinlerini de aktarır (Yönetici izinlerine gerek duyar)</target>
 
 <source>Hidden dialogs:</source>
 <target>Gizlenmiş iletiler:</target>
@@ -1130,9 +1119,6 @@ Dosya ve klasör izinlerini de aktarır (Yönetici izinlerine gerek duyar)
 <source>Filter: Single pair</source>
 <target>Süzgeç: Tek çift</target>
 
-<source>Ignore</source>
-<target>Yoksay</target>
-
 <source>Direct</source>
 <target>Doğrudan</target>
 
@@ -1286,12 +1272,12 @@ Dosya ve klasör izinlerini de aktarır (Yönetici izinlerine gerek duyar)
 <source>Error opening file:</source>
 <target>Dosya açılırken hata:</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Klasörlerde dolaşırken sonsuz döngü:</target>
-
 <source>Error traversing directory:</source>
 <target>Klasörde dolaşırken hata:</target>
 
+<source>Endless loop when traversing directory:</source>
+<target>Klasörlerde dolaşırken sonsuz döngü:</target>
+
 <source>Error setting privilege:</source>
 <target>İzinler ayarlanırken hata:</target>
 
@@ -1325,9 +1311,6 @@ Dosya ve klasör izinlerini de aktarır (Yönetici izinlerine gerek duyar)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Klasörler bağımlı! Eşleştirme kurallarını koyarken dikkatli olun:</target>
 
-<source>Comparing content of files %x</source>
-<target>%x dosyalarının içeriği karşılaştırılıyor</target>
-
 <source>Memory allocation failed!</source>
 <target>Bellek ayrılamadı!</target>
 
@@ -1343,15 +1326,15 @@ Dosya ve klasör izinlerini de aktarır (Yönetici izinlerine gerek duyar)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Sembolik bağlantılar %x aynı tarihli fakat hedefleri farklı!</target>
 
+<source>Comparing content of files %x</source>
+<target>%x dosyalarının içeriği karşılaştırılıyor</target>
+
 <source>Comparing files by content failed.</source>
 <target>Dosyaların içerikleri karşılaştırılamadı.</target>
 
 <source>Generating file list...</source>
 <target>Dosya listesi oluşturuluyor...</target>
 
-<source>Multiple...</source>
-<target>Çoklu...</target>
-
 <source>Both sides are equal</source>
 <target>İki tarafta aynı</target>
 
@@ -1370,6 +1353,12 @@ Dosya ve klasör izinlerini de aktarır (Yönetici izinlerine gerek duyar)
 <source>Delete right file/folder</source>
 <target>Sağdaki dosya/klasörleri sil</target>
 
+<source>Move file on left</source>
+<target>Soldaki dosyayı taşı</target>
+
+<source>Move file on right</source>
+<target>Sağdaki dosyayı taşı</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Soldaki dosya/klasörlerin üzerine sağdakileri yaz</target>
 
@@ -1385,6 +1374,9 @@ Dosya ve klasör izinlerini de aktarır (Yönetici izinlerine gerek duyar)
 <source>Copy file attributes only to right</source>
 <target>Dosya özniteliklerini yalnız sağa kopyalaya</target>
 
+<source>Multiple...</source>
+<target>Çoklu...</target>
+
 <source>Deleting file %x</source>
 <target>%x dosyası siliniyor</target>
 
diff --git a/BUILD/Languages/ukrainian.lng b/BUILD/Languages/ukrainian.lng
index 4973cf06..cfe7e92d 100644
--- a/BUILD/Languages/ukrainian.lng
+++ b/BUILD/Languages/ukrainian.lng
@@ -22,39 +22,6 @@
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Автоматична синхронізація</target>
 
-<source>Browse</source>
-<target>Переглянути</target>
-
-<source>Windows Error Code %x:</source>
-<target>Код помилки Windows %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Код помилки Linux %x:</target>
-
-<source>Invalid command line: %x</source>
-<target>Неправильний командний рядок: %x</target>
-
-<source>Error resolving symbolic link:</source>
-<target>Помилка при вирішені символічного посилання:</target>
-
-<source>Show pop-up</source>
-<target>Показувати виринаючі вікна</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Показувати виринаючі вікна при помилках та попередженнях</target>
-
-<source>Ignore errors</source>
-<target>Ігнорувати помилки</target>
-
-<source>Hide all error and warning messages</source>
-<target>Приховати всі помилки і повідомлення з попередженнями</target>
-
-<source>Exit instantly</source>
-<target>Вийти негайно</target>
-
-<source>Abort synchronization immediately</source>
-<target>Перервати синхронізацію негайно</target>
-
 <source>Select alternate comparison settings</source>
 <target>Вибрати альтернативні налаштування порівняння</target>
 
@@ -115,6 +82,45 @@
 <source>Select time span</source>
 <target>Виберіть часовий інтервал</target>
 
+<source>Show pop-up</source>
+<target>Показувати виринаючі вікна</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Показувати виринаючі вікна при помилках та попередженнях</target>
+
+<source>Ignore errors</source>
+<target>Ігнорувати помилки</target>
+
+<source>Hide all error and warning messages</source>
+<target>Приховати всі помилки і повідомлення з попередженнями</target>
+
+<source>Exit instantly</source>
+<target>Вийти негайно</target>
+
+<source>Abort synchronization immediately</source>
+<target>Перервати синхронізацію негайно</target>
+
+<source>Browse</source>
+<target>Переглянути</target>
+
+<source>Error reading from synchronization database:</source>
+<target>Помилка при читанні з бази даних синхронізації:</target>
+
+<source>Error writing to synchronization database:</source>
+<target>Помилка при записі у базу данних синхронізації:</target>
+
+<source>Invalid command line: %x</source>
+<target>Неправильний командний рядок: %x</target>
+
+<source>Windows Error Code %x:</source>
+<target>Код помилки Windows %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Код помилки Linux %x:</target>
+
+<source>Error resolving symbolic link:</source>
+<target>Помилка при вирішені символічного посилання:</target>
+
 <source>%x MB</source>
 <target>%x МБ</target>
 
@@ -164,17 +170,14 @@
 <source>Comparison Result</source>
 <target>Результати порівнювання</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Несумісний формат бази даних синхронізації:</target>
-
 <source>Initial synchronization:</source>
 <target>Вступна синхронізація:</target>
 
 <source>One of the FreeFileSync database files is not yet existing:</source>
 <target>Файлу бази даних FreeFileSync ще не існує:</target>
 
-<source>Error reading from synchronization database:</source>
-<target>Помилка при читанні з бази даних синхронізації:</target>
+<source>Incompatible synchronization database format:</source>
+<target>Несумісний формат бази даних синхронізації:</target>
 
 <source>Database files do not share a common synchronization session:</source>
 <target>Файли бази даних не мають спільної сесії синхронізації</target>
@@ -201,12 +204,18 @@
 <pluralform>%x сек</pluralform>
 </target>
 
+<source>Drag && drop</source>
+<target>Drag && drop</target>
+
 <source>Info</source>
 <target>Інформація</target>
 
 <source>Fatal Error</source>
 <target>Критична помилка</target>
 
+<source>Error reading file:</source>
+<target>Помилка при читанні файлу:</target>
+
 <source>Scanning:</source>
 <target>Сканую:</target>
 
@@ -226,15 +235,36 @@
 <source>Invalid FreeFileSync config file!</source>
 <target>Неправильний файл конфігурації FreeFileSync!</target>
 
-<source>File does not exist:</source>
-<target>Файл не існує:</target>
-
 <source>Error parsing configuration file:</source>
 <target>Помилка при анализі файлу налаштувань синхронізації:</target>
 
+<source>Error moving to Recycle Bin:</source>
+<target>Помилка переміщення в "Корзину":</target>
+
+<source>Could not load a required DLL:</source>
+<target>Не вдалося завантажити необхідні DLL:</target>
+
+<source>Error accessing Volume Shadow Copy Service!</source>
+<target>Помилка доступу до послуги Тіньового Копіювання Тому</target>
+
+<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
+<target>Створення тіньових копій на WOW64 не підтримується. Будь ласка, використайте FreeFileSync 64-розрядної версії.</target>
+
+<source>Could not determine volume name for file:</source>
+<target>Не вдалося визначити назву тому для файлу:</target>
+
+<source>Volume name %x not part of filename %y!</source>
+<target>Ім’я тому %x не є частиною імені файлу %y!</target>
+
 <source>/sec</source>
 <target>/сек</target>
 
+<source>File does not exist:</source>
+<target>Файл не існує:</target>
+
+<source>Could not read values for the following XML nodes:</source>
+<target>Не вдалося прочитати значення таких XML записів:</target>
+
 <source>S&ave configuration...</source>
 <target>Зберегти налаштування...</target>
 
@@ -327,144 +357,6 @@ The command line is executed each time:
 <source>A directory input field is empty.</source>
 <target>Поле введення шляху каталога порожнє.</target>
 
-<source>Drag && drop</source>
-<target>Drag && drop</target>
-
-<source>Could not initialize directory monitoring:</source>
-<target>Не вдалося ініціювати каталог для моніторингу:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Помилка моніторингу каталогу.</target>
-
-<source>Conversion error:</source>
-<target>Помилка перетворення:</target>
-
-<source>Error deleting file:</source>
-<target>Помилка при вилученні файлу:</target>
-
-<source>Error moving file:</source>
-<target>Помилка переміщення файлу:</target>
-
-<source>Target file already existing!</source>
-<target>Кінцевий файл уже існує!</target>
-
-<source>Error moving directory:</source>
-<target>Помилка переміщення каталогу:</target>
-
-<source>Target directory already existing!</source>
-<target>Кінцевий каталог вже існує!</target>
-
-<source>Error deleting directory:</source>
-<target>Помилка при вилученні каталогу:</target>
-
-<source>Error changing modification time:</source>
-<target>Помилка при зміні часу модификації файлу:</target>
-
-<source>Error loading library function:</source>
-<target>Помилка при завантаженні функції бібліотеки:</target>
-
-<source>Error reading security context:</source>
-<target>Помилка при читанні контексту безпеки:</target>
-
-<source>Error writing security context:</source>
-<target>Помилка при записі контексту безпеки:</target>
-
-<source>Error copying file permissions:</source>
-<target>Помилка при копіюванні прав доступу:</target>
-
-<source>Error creating directory:</source>
-<target>Помилка при створенні каталогу:</target>
-
-<source>Error copying symbolic link:</source>
-<target>Помилка при копіюванні символьного посилання:</target>
-
-<source>Error copying file:</source>
-<target>Помилка при копіюванні файлу:</target>
-
-<source>Error opening file:</source>
-<target>Помилка при відкриванні файлу:</target>
-
-<source>Error writing file:</source>
-<target>Помилка при записі файлу:</target>
-
-<source>Error reading file:</source>
-<target>Помилка при читанні файлу:</target>
-
-<source>Operation aborted!</source>
-<target>Операція відмінена!</target>
-
-<source>Endless loop when traversing directory:</source>
-<target>Зациклюванння при обході каталогу:</target>
-
-<source>Error traversing directory:</source>
-<target>Помилка обходу каталогу:</target>
-
-<source>Error setting privilege:</source>
-<target>Помилка встановлення привилеїв:</target>
-
-<source>Error moving to Recycle Bin:</source>
-<target>Помилка переміщення в "Корзину":</target>
-
-<source>Could not load a required DLL:</source>
-<target>Не вдалося завантажити необхідні DLL:</target>
-
-<source>Error writing to synchronization database:</source>
-<target>Помилка при записі у базу данних синхронізації:</target>
-
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Помилка доступу до послуги Тіньового Копіювання Тому</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Створення тіньових копій на WOW64 не підтримується. Будь ласка, використайте FreeFileSync 64-розрядної версії.</target>
-
-<source>Could not determine volume name for file:</source>
-<target>Не вдалося визначити назву тому для файлу:</target>
-
-<source>Volume name %x not part of filename %y!</source>
-<target>Ім’я тому %x не є частиною імені файлу %y!</target>
-
-<source>%x TB</source>
-<target>%x ТБ</target>
-
-<source>%x PB</source>
-<target>%x ПБ</target>
-
-<source>%x%</source>
-<target>%x%</target>
-
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x хв</pluralform>
-<pluralform>%x хв</pluralform>
-<pluralform>%x хв</pluralform>
-</target>
-
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x година</pluralform>
-<pluralform>%x години</pluralform>
-<pluralform>%x годин</pluralform>
-</target>
-
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x день</pluralform>
-<pluralform>%x дні</pluralform>
-<pluralform>%x днів</pluralform>
-</target>
-
-<source>Could not read values for the following XML nodes:</source>
-<target>Не вдалося прочитати значення таких XML записів:</target>
-
 <source>Logging</source>
 <target>Лог-файли</target>
 
@@ -483,9 +375,6 @@ The command line is executed each time:
 <source>Batch execution</source>
 <target>Виконання пакетного завдання</target>
 
-<source>Log-messages:</source>
-<target>Лог-повідомлення:</target>
-
 <source>Stop</source>
 <target>Стоп</target>
 
@@ -615,6 +504,24 @@ The command line is executed each time:
 <source>Total amount of data that will be transferred</source>
 <target>Загальний об’єм даних, які будуть передаватися</target>
 
+<source>Operation:</source>
+<target>Операція:</target>
+
+<source>Items found:</source>
+<target>Елементів знайдено:</target>
+
+<source>Items remaining:</source>
+<target>Елементів залишилось:</target>
+
+<source>Speed:</source>
+<target>Швидкість:</target>
+
+<source>Time remaining:</source>
+<target>Залишилось часу:</target>
+
+<source>Time elapsed:</source>
+<target>Пройшло часу:</target>
+
 <source>Batch job</source>
 <target>Пакетне завдання</target>
 
@@ -663,32 +570,14 @@ The command line is executed each time:
 <source>&Cancel</source>
 <target>&Відмінити</target>
 
-<source>Operation:</source>
-<target>Операція:</target>
-
-<source>Items found:</source>
-<target>Елементів знайдено:</target>
-
-<source>Items remaining:</source>
-<target>Елементів залишилось:</target>
-
-<source>Speed:</source>
-<target>Швидкість:</target>
-
-<source>Time remaining:</source>
-<target>Залишилось часу:</target>
-
-<source>Time elapsed:</source>
-<target>Пройшло часу:</target>
-
 <source>Select variant:</source>
 <target>Виберіть варіант:</target>
 
 <source><Automatic></source>
 <target><Автоматичний></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
-<target>Виявлення і поширення змін на обох сторінах з використанням бази даних. Вилучені файли і конфлікти визначаються автоматично.</target>
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Виявити та поширити зміни на обидві сторони використовуючи базу даних. Видалення, перейменування та конфлікти визначаються автоматично.</target>
 
 <source>Mirror ->></source>
 <target>Дзеркало ->></target>
@@ -911,22 +800,14 @@ Exclude: \stuff\temp\*
 <source>Copy locked files</source>
 <target>Копіювати заблоковані файли</target>
 
-<source>
-Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)
-</source>
-<target>
-Копіювати спільних чи заблокованих файлів з використанням послуги Тіньового Копіювання Тому (потрібні права Адміністратора)
-</target>
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Копіювати спільних чи заблокованих файлів з використанням послуги Тіньового Копіювання Тому (потрібні права Адміністратора)</target>
 
 <source>Copy file access permissions</source>
 <target>Копіювати права доступу до файлу</target>
 
-<source>
-Transfer file and directory permissions (Requires Administrator rights)
-</source>
-<target>
-Передача прав доступу файлу/каталогу (потрібні права Адміністратора)
-</target>
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Передача прав доступу файлу/каталогу (потрібні права Адміністратора)</target>
 
 <source>Hidden dialogs:</source>
 <target>Приховані діалоги</target>
@@ -958,6 +839,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>&Find next</source>
 <target>&Знайти наступний</target>
 
+<source>Operation aborted!</source>
+<target>Операція відмінена!</target>
+
 <source>Main bar</source>
 <target>Головна панель</target>
 
@@ -1135,6 +1019,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>File list exported!</source>
 <target>Список файлів експортовано!</target>
 
+<source>Error writing file:</source>
+<target>Помилка при записі файлу:</target>
+
 <source>Batch file created successfully!</source>
 <target>Файл завдання успішно створений!</target>
 
@@ -1238,9 +1125,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Filter: Single pair</source>
 <target>Фільтр: Одна пара</target>
 
-<source>Ignore</source>
-<target>Ігнорувати</target>
-
 <source>Direct</source>
 <target>Прямо</target>
 
@@ -1306,6 +1190,108 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Move files into a time-stamped subdirectory</source>
 <target>Переміщати файли в підкатлог з часовою міткою</target>
 
+<source>%x TB</source>
+<target>%x ТБ</target>
+
+<source>%x PB</source>
+<target>%x ПБ</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x хв</pluralform>
+<pluralform>%x хв</pluralform>
+<pluralform>%x хв</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x година</pluralform>
+<pluralform>%x години</pluralform>
+<pluralform>%x годин</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x день</pluralform>
+<pluralform>%x дні</pluralform>
+<pluralform>%x днів</pluralform>
+</target>
+
+<source>Could not initialize directory monitoring:</source>
+<target>Не вдалося ініціювати каталог для моніторингу:</target>
+
+<source>Error when monitoring directories.</source>
+<target>Помилка моніторингу каталогу.</target>
+
+<source>Conversion error:</source>
+<target>Помилка перетворення:</target>
+
+<source>Error deleting file:</source>
+<target>Помилка при вилученні файлу:</target>
+
+<source>Error moving file:</source>
+<target>Помилка переміщення файлу:</target>
+
+<source>Target file already existing!</source>
+<target>Кінцевий файл уже існує!</target>
+
+<source>Error moving directory:</source>
+<target>Помилка переміщення каталогу:</target>
+
+<source>Target directory already existing!</source>
+<target>Кінцевий каталог вже існує!</target>
+
+<source>Error deleting directory:</source>
+<target>Помилка при вилученні каталогу:</target>
+
+<source>Error changing modification time:</source>
+<target>Помилка при зміні часу модификації файлу:</target>
+
+<source>Error loading library function:</source>
+<target>Помилка при завантаженні функції бібліотеки:</target>
+
+<source>Error reading security context:</source>
+<target>Помилка при читанні контексту безпеки:</target>
+
+<source>Error writing security context:</source>
+<target>Помилка при записі контексту безпеки:</target>
+
+<source>Error copying file permissions:</source>
+<target>Помилка при копіюванні прав доступу:</target>
+
+<source>Error creating directory:</source>
+<target>Помилка при створенні каталогу:</target>
+
+<source>Error copying symbolic link:</source>
+<target>Помилка при копіюванні символьного посилання:</target>
+
+<source>Error copying file:</source>
+<target>Помилка при копіюванні файлу:</target>
+
+<source>Error opening file:</source>
+<target>Помилка при відкриванні файлу:</target>
+
+<source>Error traversing directory:</source>
+<target>Помилка обходу каталогу:</target>
+
+<source>Endless loop when traversing directory:</source>
+<target>Зациклюванння при обході каталогу:</target>
+
+<source>Error setting privilege:</source>
+<target>Помилка встановлення привилеїв:</target>
+
 <source>Both sides have changed since last synchronization!</source>
 <target>З моменту останньої синхронізації з обох сторін відбулися зміни!</target>
 
@@ -1339,9 +1325,6 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Залежні каталоги! Будьте уважні при налаштуванні правил синхронізації:</target>
 
-<source>Comparing content of files %x</source>
-<target>Порівнювання вмісту файлів %x</target>
-
 <source>Memory allocation failed!</source>
 <target>Помилка виділення пам’яті! (Не хватает памяти)</target>
 
@@ -1357,15 +1340,15 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Symlinks %x have the same date but a different target!</source>
 <target>Символьне посиланння %x має таку ж дату, але різний вміст!</target>
 
+<source>Comparing content of files %x</source>
+<target>Порівнювання вмісту файлів %x</target>
+
 <source>Comparing files by content failed.</source>
 <target>Порівнювання файлів за вмістом не вдалося.</target>
 
 <source>Generating file list...</source>
 <target>Створення списку файлів...</target>
 
-<source>Multiple...</source>
-<target>Різні варіанти...</target>
-
 <source>Both sides are equal</source>
 <target>Сторони ідентичні</target>
 
@@ -1384,6 +1367,12 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Delete right file/folder</source>
 <target>Вилучити файл/папку праворуч</target>
 
+<source>Move file on left</source>
+<target>Перемістити файли ліворуч</target>
+
+<source>Move file on right</source>
+<target>Перемістити файли праворуч</target>
+
 <source>Overwrite left file/folder with right one</source>
 <target>Перезаписати файл/папку ліворуч відповідником зправа</target>
 
@@ -1399,6 +1388,9 @@ Transfer file and directory permissions (Requires Administrator rights)
 <source>Copy file attributes only to right</source>
 <target>Зкопіювати праворуч лише атрибути файлу</target>
 
+<source>Multiple...</source>
+<target>Різні варіанти...</target>
+
 <source>Deleting file %x</source>
 <target>Вилучення файлу %x</target>