3.18

27 files changed, 3942 insertions, 1699 deletions

diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt
index e12fa657..ca5e6c62 100644
--- a/BUILD/Changelog.txt
+++ b/BUILD/Changelog.txt
@@ -2,6 +2,21 @@
 |FreeFileSync|
 --------------
 
+Changelog v3.18
+---------------
+Launcher running synchronously and returning application error code
+Fixed sort by file extension
+Fixed drag and drop of SAMBA network folder
+Render (all) invalid file dates correctly on GUI
+Correct layout selection for RTL and LTR languages
+Correct GUI status texts while waiting for directory lock
+Properly set default directory when loading configuration
+New XML framework: zenXML
+Addded Hebrew language
+Addded Danish language
+Updated translation files
+
+
 Changelog v3.17
 ---------------
 Filter files by size
diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index 28448ccf..50dc50b5 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -17,8 +17,22 @@
 <target>实时同步 - 自动同步</target>
 <source>Browse</source>
 <target>浏览</target>
+<source>Invalid commandline: "%x"</source>
+<target>非法命令行:"%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>解决符号链接出错:</target>
+<source>Show popup</source>
+<target>显示弹出窗口</target>
+<source>Show popup 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 synchronization settings</source>
 <target>选择替换同步设置</target>
 <source>No filter selected</source>
@@ -125,8 +139,6 @@
 <target>文件不存在:</target>
 <source>Error parsing configuration file:</source>
 <target>分析配置文件出错:</target>
-<source>Error writing file:</source>
-<target>写入文件出错:</target>
 <source>/sec</source>
 <target>/秒</target>
 <source>
@@ -212,8 +224,6 @@ The command line is executed each time:
 <target>监视激活...</target>
 <source>Waiting for missing directories...</source>
 <target>正在等待丢失的目录...</target>
-<source>Command line is empty!</source>
-<target>命令行是空的!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>不能初始化目录监视:</target>
 <source>A directory input field is empty.</source>
@@ -254,12 +264,18 @@ The command line is executed each time:
 <target>复制文件出错:</target>
 <source>Error opening file:</source>
 <target>打开文件出错:</target>
+<source>Error writing file:</source>
+<target>写入文件出错:</target>
 <source>Error reading file:</source>
 <target>读取文件出错:</target>
 <source>Endless loop when traversing directory:</source>
 <target>遍历目录时出现无限循环:</target>
 <source>Error traversing directory:</source>
 <target>遍历目录出错:</target>
+<source>Windows Error Code %x:</source>
+<target>Windows错误代码 %x:</target>
+<source>Linux Error Code %x:</source>
+<target>Linux错误代码 %x:</target>
 <source>Error setting privilege:</source>
 <target>设置权限时出错:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -284,18 +300,6 @@ The command line is executed each time:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>不能从如下XML节点读取数值:</target>
-<source>Show popup</source>
-<target>显示弹出窗口</target>
-<source>Show popup 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>Logging</source>
 <target>记录</target>
 <source>FreeFileSync batch file</source>
@@ -400,8 +404,8 @@ The command line is executed each time:
 <target>右侧</target>
 <source>Batch job</source>
 <target>批处理作业</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>装配一个批处理文件用于自动同步. 要开始批处理模式只需简单地将批处理文件名传送给FreeFileSync可执行文件:FreeFileSync.exe <batchfile>. 这个也可以安排在您的操作系统的计划任务中.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>为自动同步创建一个批处理. 要开始批处理模式只需简单地双击批处理文件或通过命令行执行：FreeFileSync.exe <批处理文件名>. 此外还可以通过操作系统的计划任务来定时执行.</target>
 <source>Help</source>
 <target>帮助</target>
 <source>Configuration overview:</source>
@@ -443,7 +447,7 @@ The command line is executed each time:
 <source>Select variant:</source>
 <target>选择变化的:</target>
 <source><Automatic></source>
-<target>自动</target>
+<target><自动></target>
 <source>Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.</source>
 <target>使用数据库来识别和传送两边的改变. 自动检测删除和冲突状态.</target>
 <source>Mirror ->></source>
@@ -451,7 +455,7 @@ The command line is executed each time:
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>镜像备份左边的文件夹.同步后右边的文件夹被修改为和左边文件夹精确匹配.</target>
 <source>Update -></source>
-<target>升级 -></target>
+<target>更新 -></target>
 <source>Copy new or updated files to right folder.</source>
 <target>复制新的或修改过的文件到右侧文件夹</target>
 <source>Custom</source>
@@ -468,18 +472,18 @@ The command line is executed each time:
 <target>分类</target>
 <source>Action</source>
 <target>动作</target>
-<source>Files/folders that exist on left side only</source>
-<target>仅在左侧存在的文件/文件夹</target>
-<source>Files/folders that exist on right side only</source>
-<target>仅在右侧存在的文件/文件夹</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>两侧都有,左侧较新的文件</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>两侧都有,右侧较新的文件</target>
-<source>Files that have different content</source>
-<target>有不同内容的文件</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>冲突/文件不能被归类</target>
+<source>File/folder exists on left side only</source>
+<target>文件/文件夹仅存在于左侧</target>
+<source>File/folder exists on right side only</source>
+<target>文件/文件夹仅存在于右侧</target>
+<source>Left file is newer</source>
+<target>左侧文件较新</target>
+<source>Right file is newer</source>
+<target>右侧文件较新</target>
+<source>Files have different content</source>
+<target>文件内容不同</target>
+<source>Conflict/file cannot be categorized</source>
+<target>冲突/文件不能被分类</target>
 <source>Compare by...</source>
 <target>比较选项...</target>
 <source>
@@ -544,7 +548,7 @@ As the name suggests, two files which share the same name are marked as equal if
 With this option enabled the decision tree is smaller:
 </source>
 <target>
-顾名思义,两个相同文件名的文件当且仅当它们具有相同的内容时会被认为是相同的。
+顾名思义,两个相同文件名的文件当且仅当它们具有相同的内容时会被认为是相同的.
 此选项对于一致性检查比较有用，而不是备份操作. 因此,文件时间没有被考虑到. 
 
 通过此选项使决策树较小:
@@ -616,8 +620,8 @@ Include: *.doc;*.zip;*.exe
 Exclude: \stuff\temp\*
 </source>
 <target>
-Include: *.doc;*.zip;*.exe
-Exclude: \stuff\temp\*
+包括: *.doc;*.zip;*.exe
+排除: \stuff\temp\*
 </target>
 <source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
 <target>同步所有 .doc, .zip和 .exe 文件, 除了"temp"中的一切.</target>
@@ -703,10 +707,8 @@ Transfer file and directory permissions
 <target><多选></target>
 <source>D-Click</source>
 <target>双击</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>复制到剪贴板	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>删除文件	DEL</target>
+<source>Delete</source>
+<target>删除</target>
 <source>Customize...</source>
 <target>自定义...</target>
 <source>Auto-adjust columns</source>
@@ -846,11 +848,11 @@ Transfer file and directory permissions
 <source>on one side only</source>
 <target>仅在一侧</target>
 <source>same date</source>
-<target></target>
+<target>日期相同</target>
 <source>different date</source>
-<target></target>
+<target>日期不同</target>
 <source>Inactive</source>
-<target>不活动</target>
+<target>不使用</target>
 <source>Second</source>
 <target>秒</target>
 <source>Minute</source>
@@ -957,28 +959,28 @@ Transfer file and directory permissions
 <target>生成文件列表...</target>
 <source>Multiple...</source>
 <target>并联...</target>
-<source>Files that are equal on both sides</source>
-<target>两边文件相同</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>相等的文件/文件夹仅仅文件属性不同</target>
-<source>Copy from right to left</source>
-<target>从右侧复制到左侧</target>
-<source>Copy from left to right</source>
-<target>从左侧复制到右侧</target>
-<source>Delete files/folders existing on left side only</source>
-<target>删除仅在左侧存在的文件/文件夹</target>
-<source>Delete files/folders existing on right side only</source>
-<target>删除仅在右侧存在的文件/文件夹</target>
-<source>Copy from right to left overwriting</source>
-<target>从右侧复制到左侧(覆盖模式)</target>
-<source>Copy from left to right overwriting</source>
-<target>从左侧复制到右侧(覆盖模式)</target>
+<source>Both sides are equal</source>
+<target>两侧相等</target>
+<source>Files/folders differ in attributes only</source>
+<target>文件/文件夹仅属性不同</target>
+<source>Copy new file/folder to left</source>
+<target>复制新文件/文件夹至左侧</target>
+<source>Copy new file/folder to right</source>
+<target>复制新文件/文件夹至右侧</target>
+<source>Delete left file/folder</source>
+<target>删除左侧文件/文件夹</target>
+<source>Delete right file/folder</source>
+<target>删除右侧文件/文件夹</target>
+<source>Overwrite left file/folder with right one</source>
+<target>从右侧覆盖左侧的文件/文件夹</target>
+<source>Overwrite right file/folder with left one</source>
+<target>从左侧覆盖右侧的文件/文件夹</target>
 <source>Do nothing</source>
 <target>保持不动</target>
-<source>Copy attributes only from right to left</source>
-<target>从右边到左边只复制文件属性</target>
-<source>Copy attributes only from left to right</source>
-<target>从左边到右边只复制文件属性</target>
+<source>Copy file attributes only to left</source>
+<target>仅复制文件属性到左侧</target>
+<source>Copy file attributes only to right</source>
+<target>仅复制文件属性到右侧</target>
 <source>Deleting file %x</source>
 <target>正删除文件 %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1009,6 +1011,8 @@ Transfer file and directory permissions
 <target>更新 %x 的属性</target>
 <source>Source directory does not exist anymore:</source>
 <target>源目录已经不存在:</target>
+<source>Generating database...</source>
+<target>正在生成数据库...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>根据配置没有任何同步!</target>
 <source>Target directory name must not be empty!</source>
@@ -1033,8 +1037,6 @@ Transfer file and directory permissions
 <target>有一个目录将被修改,而它是多个文件夹对的一部分!请重新检查同步设置!</target>
 <source>Processing folder pair:</source>
 <target>正在处理成对文件夹:</target>
-<source>Generating database...</source>
-<target>正在生成数据库...</target>
 <source>Error copying locked file %x!</source>
 <target>复制已锁定的文件时出错 %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng
index 9b0cdf5d..54f3d843 100644
--- a/BUILD/Languages/chinese_traditional.lng
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -17,8 +17,22 @@
 <target>即時同步 - 自動同步</target>
 <source>Browse</source>
 <target>瀏覽</target>
+<source>Invalid commandline: "%x"</source>
+<target>無效的命令列："%x"</target>
 <source>Error resolving symbolic link:</source>
-<target>解决符號連結錯誤：</target>
+<target>解析錯誤的符號連結：</target>
+<source>Show popup</source>
+<target>顯示彈出視窗</target>
+<source>Show popup 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 synchronization settings</source>
 <target>選擇備用同步設定</target>
 <source>No filter selected</source>
@@ -125,8 +139,6 @@
 <target>檔案不存在：</target>
 <source>Error parsing configuration file:</source>
 <target>分析配置檔案錯誤：</target>
-<source>Error writing file:</source>
-<target>寫入檔案錯誤：</target>
 <source>/sec</source>
 <target>/秒</target>
 <source>
@@ -212,8 +224,6 @@ The command line is executed each time:
 <target>監測活動...</target>
 <source>Waiting for missing directories...</source>
 <target>等待缺少的目錄...</target>
-<source>Command line is empty!</source>
-<target>命令列是空的！</target>
 <source>Could not initialize directory monitoring:</source>
 <target>無法初始化目錄監測：</target>
 <source>A directory input field is empty.</source>
@@ -254,12 +264,18 @@ The command line is executed each time:
 <target>複製檔案錯誤：</target>
 <source>Error opening file:</source>
 <target>開啟檔案錯誤：</target>
+<source>Error writing file:</source>
+<target>寫入檔案錯誤：</target>
 <source>Error reading file:</source>
 <target>讀取檔案錯誤：</target>
 <source>Endless loop when traversing directory:</source>
 <target>當遍歷目錄時無限循環：</target>
 <source>Error traversing directory:</source>
 <target>遍歷目錄錯誤：</target>
+<source>Windows Error Code %x:</source>
+<target>Windows 錯誤代碼 %x：</target>
+<source>Linux Error Code %x:</source>
+<target>Linux 錯誤代碼 %x：</target>
 <source>Error setting privilege:</source>
 <target>設定權限錯誤：</target>
 <source>Error moving to Recycle Bin:</source>
@@ -284,18 +300,6 @@ The command line is executed each time:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>無法讀取 XML 之後節點的值：</target>
-<source>Show popup</source>
-<target>顯示彈出視窗</target>
-<source>Show popup 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>Logging</source>
 <target>日誌記錄</target>
 <source>FreeFileSync batch file</source>
@@ -400,8 +404,8 @@ The command line is executed each time:
 <target>右邊</target>
 <source>Batch job</source>
 <target>批次處理作業</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>組合一個用於自動同步的批次檔。若要開始批次處理模式，只需簡單的將批次檔名傳送给 FreeFileSync 可執行檔：FreeFileSync.exe <batchfile>。這個也可以安排在你的作業系統的計畫任務中。</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>新建一個自動同步的批次檔。若要開始批次處理模式只需按兩下此檔或通過命令列執行：FreeFileSync.exe <batchfile>。還可以安排在您的作業系統的任務計畫中。</target>
 <source>Help</source>
 <target>說明</target>
 <source>Configuration overview:</source>
@@ -468,18 +472,18 @@ The command line is executed each time:
 <target>分類</target>
 <source>Action</source>
 <target>動作</target>
-<source>Files/folders that exist on left side only</source>
+<source>File/folder exists on left side only</source>
 <target>只存在於左邊的檔案/資料夾</target>
-<source>Files/folders that exist on right side only</source>
+<source>File/folder exists on right side only</source>
 <target>只存在於右邊的檔案/資料夾</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>檔案存在於兩邊，左邊檔案較新</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>檔案存在於兩邊，右邊檔案較新</target>
-<source>Files that have different content</source>
-<target>具有不同內容的檔案</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>衝突/檔案不能被分類</target>
+<source>Left file is newer</source>
+<target>左邊檔案較新</target>
+<source>Right file is newer</source>
+<target>右邊檔案較新</target>
+<source>Files have different content</source>
+<target>檔案的內容不同</target>
+<source>Conflict/file cannot be categorized</source>
+<target>衝突/檔案無法分類</target>
 <source>Compare by...</source>
 <target>比對選項...</target>
 <source>
@@ -595,9 +599,9 @@ Note: The name filter must be specified relative(!) to main synchronization dire
 <source>Hints:</source>
 <target>提示：</target>
 <source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. 輸入相對檔案或目錄名稱，使用';'或空行分隔。</target>
+<target>1. 輸入相對檔案或目錄名稱，使用 ';' 或空行分隔。</target>
 <source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. 使用萬用字元‘*’和‘?’。</target>
+<target>2. 使用萬用字元 '*' 和 '?'。</target>
 <source>3. Exclude files directly on main grid via context menu.</source>
 <target>3. 經由內容選單直接在主要網格排除檔案。</target>
 <source>Example</source>
@@ -694,10 +698,8 @@ Transfer file and directory permissions
 <target><多重選擇></target>
 <source>D-Click</source>
 <target>點兩下</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>複製到剪貼簿	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>刪除檔案	DEL</target>
+<source>Delete</source>
+<target>刪除</target>
 <source>Customize...</source>
 <target>自訂...</target>
 <source>Auto-adjust columns</source>
@@ -836,8 +838,10 @@ Transfer file and directory permissions
 <target>檔案在兩邊均已存在</target>
 <source>on one side only</source>
 <target>只有一邊</target>
-<source>different</source>
-<target>不同</target>
+<source>same date</source>
+<target>相同日期</target>
+<source>different date</source>
+<target>不同日期</target>
 <source>Inactive</source>
 <target>停用</target>
 <source>Second</source>
@@ -946,28 +950,28 @@ Transfer file and directory permissions
 <target>產生檔案清單...</target>
 <source>Multiple...</source>
 <target>多個...</target>
-<source>Files that are equal on both sides</source>
-<target>兩邊相同的檔案</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>同等檔案/資料夾只在於屬性不同</target>
-<source>Copy from right to left</source>
-<target>從右邊複製到左邊</target>
-<source>Copy from left to right</source>
-<target>從左邊複製到右邊</target>
-<source>Delete files/folders existing on left side only</source>
-<target>刪除只存在於左邊的檔案/資料夾</target>
-<source>Delete files/folders existing on right side only</source>
-<target>刪除只存在於右邊的檔案/資料夾</target>
-<source>Copy from right to left overwriting</source>
-<target>從右邊複製到左邊覆蓋檔案</target>
-<source>Copy from left to right overwriting</source>
-<target>從左邊複製到右邊覆蓋檔案</target>
+<source>Both sides are equal</source>
+<target>兩邊都相同</target>
+<source>Files/folders differ in attributes only</source>
+<target>檔案/資料夾僅在於不同的屬性</target>
+<source>Copy new file/folder to left</source>
+<target>複製新檔案/資料夾到左邊</target>
+<source>Copy new file/folder to right</source>
+<target>複製新檔案/資料夾到右邊</target>
+<source>Delete left file/folder</source>
+<target>刪除左邊檔案/資料夾</target>
+<source>Delete right file/folder</source>
+<target>刪除右邊檔案/資料夾</target>
+<source>Overwrite left file/folder with right one</source>
+<target>用適合檔案/資料夾覆蓋左邊檔案/資料夾</target>
+<source>Overwrite right file/folder with left one</source>
+<target>用適合檔案/資料夾覆蓋右邊檔案/資料夾</target>
 <source>Do nothing</source>
 <target>維持原狀</target>
-<source>Copy attributes only from right to left</source>
-<target>複製只有從右邊到左邊的屬性</target>
-<source>Copy attributes only from left to right</source>
-<target>複製只有從左邊到右邊的屬性</target>
+<source>Copy file attributes only to left</source>
+<target>只複製檔案屬性到左邊</target>
+<source>Copy file attributes only to right</source>
+<target>只複製檔案屬性到右邊</target>
 <source>Deleting file %x</source>
 <target>正在刪除檔案 %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -998,6 +1002,8 @@ Transfer file and directory permissions
 <target>更新 %x 個的屬性</target>
 <source>Source directory does not exist anymore:</source>
 <target>來源目錄不存在：</target>
+<source>Generating database...</source>
+<target>產生資料庫...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>根據配置没有任何同步！</target>
 <source>Target directory name must not be empty!</source>
@@ -1022,8 +1028,6 @@ Transfer file and directory permissions
 <target>一個目錄將被修改，這是多對資料夾的一部份！請檢閱同步設定！</target>
 <source>Processing folder pair:</source>
 <target>處理一對資料夾：</target>
-<source>Generating database...</source>
-<target>產生資料庫...</target>
 <source>Error copying locked file %x!</source>
 <target>複製已鎖定檔案錯誤 %x！</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng
index 16ac3707..367221a2 100644
--- a/BUILD/Languages/czech.lng
+++ b/BUILD/Languages/czech.lng
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Automatická synchronizace</target>
 <source>Browse</source>
 <target>Procházet</target>
+<source>Invalid commandline: "%x"</source>
+<target>Neplatný příkaz: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Chyba odkazu zástupce:</target>
+<source>Show popup</source>
+<target>Zobrazit okno</target>
+<source>Show popup on errors or warnings</source>
+<target>Zobrazit hlášení při chybě nebo varování</target>
+<source>Ignore errors</source>
+<target>Ignorovat 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 synchronization settings</source>
 <target>Vyberte alternativní nastavení synchronizace</target>
 <source>No filter selected</source>
@@ -123,14 +137,12 @@
 <target>Info</target>
 <source>Fatal Error</source>
 <target>Závažná chyba</target>
+<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 writing file:</source>
-<target>Chyba zápisu souboru:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>Chybný konfigurační soubor FreeFileSync!</target>
 <source>/sec</source>
 <target>/s</target>
 <source>
@@ -222,8 +234,6 @@ Příkazová řádka je spuštěna pokaždé když:
 <target>Sledování zapnuto...</target>
 <source>Waiting for missing directories...</source>
 <target>Čekání na nedostupné adresáře...</target>
-<source>Command line is empty!</source>
-<target>Příkazová řádka je prázdná!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Nelze nastavit monitorování adresáře:</target>
 <source>A directory input field is empty.</source>
@@ -264,12 +274,18 @@ Příkazová řádka je spuštěna pokaždé když:
 <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>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>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 setting privilege:</source>
 <target>Chyba nastavení práv:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -294,18 +310,6 @@ Příkazová řádka je spuštěna pokaždé když:
 <target>%x%</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>Show popup</source>
-<target>Zobrazit okno</target>
-<source>Show popup on errors or warnings</source>
-<target>Zobrazit hlášení při chybě nebo varování</target>
-<source>Ignore errors</source>
-<target>Ignorovat 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>Logging</source>
 <target>Zaznamenávání</target>
 <source>FreeFileSync batch file</source>
@@ -410,8 +414,8 @@ Příkazová řádka je spuštěna pokaždé když:
 <target>Pravý</target>
 <source>Batch job</source>
 <target>Dávkový soubor</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Vytvoření dávkového souboru pro automatický provoz. Ke spuštění dávky jednoduše její jméno zadejte jako parametr při spuštění FreeFileSync: FreeFileSync.exe <batchfile>.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Vytvoří dávkový souboru pro automatický provoz. Ke spuštění dávky jednoduše poklikejte na vytvořený soubor nebo jejho jméno zadejte jako parametr při spuštění FreeFileSync: FreeFileSync.exe <batchfile>. Stejně tak můžete ke spuštění využít plánovač úloh vašeho operačního systému.</target>
 <source>Help</source>
 <target>Nápověda</target>
 <source>Configuration overview:</source>
@@ -478,17 +482,17 @@ Příkazová řádka je spuštěna pokaždé když:
 <target>Kategorie</target>
 <source>Action</source>
 <target>Akce</target>
-<source>Files/folders that exist on left side only</source>
+<source>File/folder exists on left side only</source>
 <target>Soubory/adresáře, které existují pouze vlevo</target>
-<source>Files/folders that exist on right side only</source>
+<source>File/folder exists on right side only</source>
 <target>Soubory/adresáře, které existují pouze vpravo</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Soubory, které existují na obou stranách, z nichž vlevo je novější</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Soubory, které existují na obou stranách, z nichž vpravo je novější</target>
-<source>Files that have different content</source>
+<source>Left file is newer</source>
+<target>Levý soubor je novější</target>
+<source>Right file is newer</source>
+<target>Pravý soubor je novější</target>
+<source>Files have different content</source>
 <target>Soubory, které mají rozdílný obsah</target>
-<source>Conflicts/files that cannot be categorized</source>
+<source>Conflict/file cannot be categorized</source>
 <target>Konflikty/soubory které nelze zařadit</target>
 <source>Compare by...</source>
 <target>Porovnat ...</target>
@@ -544,8 +548,8 @@ je stejný
 <target>- existuje pouze na levé straně</target>
 <source>- exists right only</source>
 <target>- existuje pouze na pravé straně</target>
-<source>- conflict</source>
-<target>- konflikt</target>
+<source>- conflict (same date, different size)</source>
+<target>- konflikt (stejné datum, jiná velikost)</target>
 <source>Compare by "File content"</source>
 <target>Porovnat "podle obsahu souboru"</target>
 <source>
@@ -712,10 +716,8 @@ Přenést přístupová oprávnění souborů a adresářů
 <target><vícenásobný výběr></target>
 <source>D-Click</source>
 <target>Dvojklik</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Vložit do schránky	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Smazat soubory	DEL</target>
+<source>Delete</source>
+<target>Smazat</target>
 <source>Customize...</source>
 <target>Vlastní....</target>
 <source>Auto-adjust columns</source>
@@ -862,14 +864,10 @@ Přenést přístupová oprávnění souborů a adresářů
 <target>soubor existuje na obou stranách</target>
 <source>on one side only</source>
 <target>pouze na jedné straně</target>
-<source>- left</source>
-<target>- vlevo</target>
-<source>- right</source>
-<target>- vpravo</target>
-<source>different</source>
-<target>rozdílný</target>
-<source>- conflict (same date, different size)</source>
-<target>- konflikt (stejné datum, jiná velikost)</target>
+<source>same date</source>
+<target>stejné datum</target>
+<source>different date</source>
+<target>rozdílné datum</target>
 <source>Inactive</source>
 <target>Vypnuto</target>
 <source>Second</source>
@@ -982,28 +980,28 @@ Přenést přístupová oprávnění souborů a adresářů
 <target>Vytváření seznamu souborů...</target>
 <source>Multiple...</source>
 <target>Několikanásobný...</target>
-<source>Files that are equal on both sides</source>
-<target>Soubory shodné na obou stranách</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Stejné soubory/adresáře, které se liší pouze ve vlastnostech</target>
-<source>Copy from right to left</source>
-<target>Kopírovat z prava do leva</target>
-<source>Copy from left to right</source>
-<target>Kopírovat z leva do prava</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Smazat soubory/adresáře existující pouze na levé straně</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Smazat soubory/adresáře existující pouze na pravé straně</target>
-<source>Copy from right to left overwriting</source>
-<target>Kopírovat z prava do leva přepisem</target>
-<source>Copy from left to right overwriting</source>
-<target>Kopírovat z leva do prava přepisem</target>
+<source>Both sides are equal</source>
+<target>Obě strany jsou shodné</target>
+<source>Files/folders differ in attributes only</source>
+<target>Soubory/adresáře se liší pouze ve vlastnostech</target>
+<source>Copy new file/folder to left</source>
+<target>Kopírovat nový soubor/adresář do leva</target>
+<source>Copy new file/folder to right</source>
+<target>Kopírovat nový soubor/adresář do prava</target>
+<source>Delete left file/folder</source>
+<target>Smazat soubor/adresář z leva</target>
+<source>Delete right file/folder</source>
+<target>Smazat soubor/adresáře z prava</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Přepsat levý soubor/adresář tím z prava</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Přepsat pravý soubor/adresář tím z leva</target>
 <source>Do nothing</source>
 <target>Nic nedělat</target>
-<source>Copy attributes only from right to left</source>
-<target>Kopírovat vlastnosti jen z prava do leva</target>
-<source>Copy attributes only from left to right</source>
-<target>Kopírovat vlastnosti jen z leva do prava</target>
+<source>Copy file attributes only to left</source>
+<target>Kopírovat vlastnosti souboru pouze do leva</target>
+<source>Copy file attributes only to right</source>
+<target>Kopírovat vlastnosti souboru pouze do prava</target>
 <source>Deleting file %x</source>
 <target>Mazání souboru %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1034,6 +1032,8 @@ Přenést přístupová oprávnění souborů a adresářů
 <target>Aktualizace atributů souboru %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>Zdrojový adresář již neexistuje:</target>
+<source>Generating database...</source>
+<target>Vytváření databáze...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Podle dané konfigurace není co synchronizovat!</target>
 <source>Target directory name must not be empty!</source>
@@ -1058,8 +1058,6 @@ Přenést přístupová oprávnění souborů a adresářů
 <target>Bude změně adresář, který je součástí adresářového páru vícenásobného porovnání! Prosím zkontrolujte si nastavení synchronizace!</target>
 <source>Processing folder pair:</source>
 <target>Zpracovávání adresářové páru:</target>
-<source>Generating database...</source>
-<target>Vytváření databáze...</target>
 <source>Error copying locked file %x!</source>
 <target>Chyba kopírování zamčeného souboru %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/danish.lng b/BUILD/Languages/danish.lng
new file mode 100644
index 00000000..4c0c3f65
--- /dev/null
+++ b/BUILD/Languages/danish.lng
@@ -0,0 +1,1053 @@
+<header>
+	<language name>Dansk</language name>
+	<translator>Kim Monberg</translator>
+	<locale>da_DK</locale>
+	<flag file>denmark.png</flag file>
+	<plural forms>2</plural forms>
+	<plural definition>n == 1 ? 0 : 1</plural definition>
+</header>
+
+<source>Show in Explorer</source>
+<target>Vis i Explorer</target>
+<source>Open with default application</source>
+<target>Åben med standard program</target>
+<source>Browse directory</source>
+<target>Gennemse Bibliotek</target>
+<source>RealtimeSync - Automated Synchronization</source>
+<target>RealtimeSynk - Automatisk Synkronisering</target>
+<source>Browse</source>
+<target>Gennemse</target>
+<source>Invalid commandline: "%x"</source>
+<target>Ugyldig kommando: "%x"</target>
+<source>Error resolving symbolic link:</source>
+<target>Error resolving symbolic link:</target>
+<source>Show popup</source>
+<target>Vis popup</target>
+<source>Show popup on errors or warnings</source>
+<target>Vis popup 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 synchronization settings</source>
+<target>Vælg alternative indstillinger</target>
+<source>No filter selected</source>
+<target>Intet filter valgt</target>
+<source>Filter is active</source>
+<target>Filter er aktivt</target>
+<source>Clear filter settings</source>
+<target>Ryd filter indstillinger</target>
+<source>Remove alternate settings</source>
+<target>Fjern alternative indstillinger</target>
+<source>Create a batch job</source>
+<target>Lav et batch job</target>
+<source>Synchronization settings</source>
+<target>Synkroniserings indstillinger</target>
+<source>Comparison settings</source>
+<target>Sammenlignings indstillinger</target>
+<source>About</source>
+<target>Om</target>
+<source>Error</source>
+<target>Fejl</target>
+<source>Warning</source>
+<target>Advarsel</target>
+<source>Question</source>
+<target>Spørgsmål</target>
+<source>Confirm</source>
+<target>Bekræft</target>
+<source>Configure filter</source>
+<target>Indstil filter</target>
+<source>Customize columns</source>
+<target>Rediger kolonner</target>
+<source>Global settings</source>
+<target>Fælles indstillinger</target>
+<source>Synchronization Preview</source>
+<target>Vis Synkronisering</target>
+<source>Find</source>
+<target>Find</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>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
+</target>
+<source><Symlink></source>
+<target><Symlink></target>
+<source><Directory></source>
+<target><Directory></target>
+<source>Size</source>
+<target>Størrelse</target>
+<source>Date</source>
+<target>Dato</target>
+<source>Full path</source>
+<target>Fuld Sti</target>
+<source>Filename</source>
+<target>Filnavne</target>
+<source>Relative path</source>
+<target>Filsti</target>
+<source>Directory</source>
+<target>Bibliotek</target>
+<source>Extension</source>
+<target>Udvidelse</target>
+<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>One of the FreeFileSync database entries within the following file is not yet existing:</source>
+<target>En af FreeFileSync database posterne i den følgende fil findes ikke endnu:</target>
+<source>Error reading from synchronization database:</source>
+<target>Fejl i læsning fra synkroniserings databasen:</target>
+<source>An exception occurred!</source>
+<target>En undtagelse er opstået!</target>
+<source>Error deleting file:</source>
+<target>Fejl i sletning af fil:</target>
+<source>Error reading file attributes:</source>
+<target>Fejl i læsning af atributter:</target>
+<source>Waiting while directory is locked (%x)...</source>
+<target>Venter mens biblioteket er låst (%x)...</target>
+<source>Error setting directory lock:</source>
+<target>Fejl i at låse bibliotek:</target>
+<source>
+<pluralform>1 sec</pluralform>
+<pluralform>%x sec</pluralform>
+</source>
+<target>
+<pluralform>1 sek</pluralform>
+<pluralform>%x sek</pluralform>
+</target>
+<source>Info</source>
+<target>Info</target>
+<source>Fatal Error</source>
+<target>Uoprettelig Fejl</target>
+<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>/sec</source>
+<target>/sek</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>S&ave configuration...</source>
+<target>G&em konfiguration...</target>
+<source>&Load configuration...</source>
+<target>&Hent konfiguration...</target>
+<source>&Quit</source>
+<target>&Afslut</target>
+<source>&File</source>
+<target>&Fil</target>
+<source>&Content</source>
+<target>&Indhold</target>
+<source>&About...</source>
+<target>&Om...</target>
+<source>&Help</source>
+<target>&Hjælp</target>
+<source>Usage:</source>
+<target>Forbrug:</target>
+<source>1. Select directories to monitor.</source>
+<target>1. Vælg biblioteker at holde øje med.</target>
+<source>2. Enter a command line.</source>
+<target>2. Skriv en kommando linje.</target>
+<source>3. Press 'Start'.</source>
+<target>3. Tryk '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>
+Kommando linjen bliver afviklet hver gang:
+- Alle biblioteker bliver tilgængelige (eks. USB stick sættes i)
+- Filer i disse biblioteker eller underbiblioteker bliver ændret
+</target>
+<source>Directories to watch</source>
+<target>Biblioteker at overvåge</target>
+<source>Add folder</source>
+<target>Tilføj mappe</target>
+<source>Remove folder</source>
+<target>Fjern mappe</target>
+<source>Select a folder</source>
+<target>Vælg en mappe</target>
+<source>Command line</source>
+<target>Kommando linje</target>
+<source>Minimum Idle Time [seconds]</source>
+<target>Minimum pausetid [sekunder]</target>
+<source>Idle time between detection of last change and execution of command line in seconds</source>
+<target>Tid imellem sidste ændring og afvikling af kommando linjen i sekunder</target>
+<source>Start</source>
+<target>Start</target>
+<source>(Build: %x)</source>
+<target>(Build: %x)</target>
+<source>RealtimeSync configuration</source>
+<target>RealtimeSynk konfiguration</target>
+<source>File already exists. Overwrite?</source>
+<target>Filen findes. Overskriv?</target>
+<source>&Restore</source>
+<target>&Gendan</target>
+<source>&Exit</source>
+<target>&Afslut</target>
+<source>Monitoring active...</source>
+<target>Overvågning aktiv...</target>
+<source>Waiting for missing directories...</source>
+<target>Venter på manglende biblioteker...</target>
+<source>Could not initialize directory monitoring:</source>
+<target>Kunne ikke initialiserer biblioteks overvågningen:</target>
+<source>A directory input field is empty.</source>
+<target>Et biblioteks felt er tomt.</target>
+<source>Error when monitoring directories.</source>
+<target>Fejl i overvågning af biblioteker.</target>
+<source>Drag && drop</source>
+<target>Træk && slip</target>
+<source>Conversion error:</source>
+<target>Konverterings fejl:</target>
+<source>Error moving file:</source>
+<target>Fejl i flytning af fil:</target>
+<source>Operation aborted!</source>
+<target>Operation afbrudt!</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>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>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 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 starting Volume Shadow Copy Service!</source>
+<target>Fejl i start af Drev Spejl Kopierings 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>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>
+<source>FreeFileSync batch file</source>
+<target>FreeFileSync batch fil</target>
+<source>FreeFileSync configuration</source>
+<target>FreeFileSync konfiguration</target>
+<source>FreeFileSync Batch Job</source>
+<target>FreeFileSync Batch Job</target>
+<source>Unable to create logfile!</source>
+<target>Kan ikke oprette logfil!</target>
+<source>Batch execution</source>
+<target>Batch afvikling</target>
+<source>Log-messages:</source>
+<target>Log-beskeder:</target>
+<source>Stop</source>
+<target>Stop</target>
+<source>Total time:</source>
+<target>Samlet tid:</target>
+<source>Synchronization aborted!</source>
+<target>Synkronisering afbrudt!</target>
+<source>Synchronization completed with errors!</source>
+<target>Synkronisering afsluttet med fejl!</target>
+<source>Synchronization completed successfully!</source>
+<target>Synkronisering afsluttet uden fejl!</target>
+<source>Press "Switch" to open FreeFileSync GUI mode.</source>
+<target>Tryk "Skift" for at åbne FreeFileSync i GUI mode.</target>
+<source>Switching to FreeFileSync GUI mode...</source>
+<target>Skifter til FreeFileSync GUI mode...</target>
+<source>Unable to connect to sourceforge.net!</source>
+<target>Kan ikke forbinde til sourceforge.net!</target>
+<source>A newer version of FreeFileSync is available:</source>
+<target>En nyere version af FreeFileSync er tilgængelig:</target>
+<source>Download now?</source>
+<target>Download nu?</target>
+<source>Information</source>
+<target>Information</target>
+<source>FreeFileSync is up to date!</source>
+<target>FreeFileSync er opdateret!</target>
+<source>Do you want FreeFileSync to automatically check for updates every week?</source>
+<target>Skal FreeFileSync automatisk checke efter opdateringer hver uge?</target>
+<source>(Requires an Internet connection!)</source>
+<target>(Kræver en Internet forbindelse!)</target>
+<source>1. &Compare</source>
+<target>1. &Sammenlign</target>
+<source>2. &Synchronize...</source>
+<target>2. &Synkroniser...</target>
+<source>S&witch view</source>
+<target>S&kift udseende</target>
+<source>&New</source>
+<target>&Ny</target>
+<source>&Program</source>
+<target>&Program</target>
+<source>&Language</source>
+<target>&Sprog</target>
+<source>&Global settings...</source>
+<target>&Fælles indstillinger...</target>
+<source>&Create batch job...</source>
+<target>&Opret batch job...</target>
+<source>&Export file list...</source>
+<target>&Eksporter fil liste...</target>
+<source>&Advanced</source>
+<target>&Avanceret</target>
+<source>&Check for new version</source>
+<target>&Kig efter ny version</target>
+<source>Compare</source>
+<target>Sammenlign</target>
+<source>Compare both sides</source>
+<target>Sammenlign begge sider</target>
+<source>&Abort</source>
+<target>&Afbryd</target>
+<source>Synchronize...</source>
+<target>Synkroniser...</target>
+<source>Start synchronization</source>
+<target>Start synkronisering</target>
+<source>Swap sides</source>
+<target>Byt sider</target>
+<source>Add folder pair</source>
+<target>Tilføj mappe par</target>
+<source>Remove folder pair</source>
+<target>Fjern mappe par</target>
+<source>Save current configuration to file</source>
+<target>Gem nuværende konfiguration i fil</target>
+<source>Load configuration from file</source>
+<target>Læs konfiguration fra fil</target>
+<source>Last used configurations (press DEL to remove from list)</source>
+<target>Senest brugte konfigurationer (tryk DEL for at fjerne fra listen)</target>
+<source>Hide excluded items</source>
+<target>Skjul udelukkede emner</target>
+<source>Hide filtered or temporarily excluded files</source>
+<target>Skjul filtrerede eller midlertidigt udelukkede filer</target>
+<source>Number of files and directories that will be created</source>
+<target>Antal filer og biblioteker der vil blive oprettet</target>
+<source>Number of files that will be overwritten</source>
+<target>Antal filer der vil blive overskrevet</target>
+<source>Number of files and directories that will be deleted</source>
+<target>Antal filer og biblioteker der vil blive slettet</target>
+<source>Total amount of data that will be transferred</source>
+<target>Samlet antal data der vil blive overført</target>
+<source>Left</source>
+<target>Venstre</target>
+<source>Right</source>
+<target>Højre</target>
+<source>Batch job</source>
+<target>Batch job</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Opret en batch fil til automatisk synkronisering. For at starte i batch mode dobbelt-click på filen eller afvikle med kommandoen: FreeFileSync.exe <batchfil>. Dette kan også planlægges i dit systems opgavestyring.</target>
+<source>Help</source>
+<target>Hjælp</target>
+<source>Configuration overview:</source>
+<target>Overblik over konfiguration:</target>
+<source>Filter files</source>
+<target>Filter filer</target>
+<source>Status feedback</source>
+<target>Status feedback</target>
+<source>Silent mode</source>
+<target>Lydløs tilstand</target>
+<source>Start minimized and write status information to a logfile</source>
+<target>Start minimeret og skriv status information til en log fil</target>
+<source>Error handling</source>
+<target>Fejl håndtering</target>
+<source>Overview</source>
+<target>Overblik</target>
+<source>Select logfile directory:</source>
+<target>Vælg log fil bibliotek:</target>
+<source>Maximum number of logfiles:</source>
+<target>Maksimalt antal log filer:</target>
+<source>&Save</source>
+<target>&Gem</target>
+<source>&Load</source>
+<target>&Hent</target>
+<source>&Cancel</source>
+<target>&Anuller</target>
+<source>Elements found:</source>
+<target>Enheder fundet:</target>
+<source>Elements 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>Operation:</source>
+<target>Igang:</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>Mirror ->></source>
+<target>Spejl ->></target>
+<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
+<target>Spejling af venstre mappe. Højre mappe tilpasses så den ligner den venstre efter synkronisering.</target>
+<source>Update -></source>
+<target>Opdater -></target>
+<source>Copy new or updated files to right folder.</source>
+<target>Kopier nye eller opdaterede filer til højre mappe.</target>
+<source>Custom</source>
+<target>Brugerdefineret</target>
+<source>Configure your own synchronization rules.</source>
+<target>Konfigurer dine egne synkroniserings regler.</target>
+<source>Deletion handling</source>
+<target>Slette håndtering</target>
+<source>&OK</source>
+<target>&OK</target>
+<source>Configuration</source>
+<target>Konfiguration</target>
+<source>Category</source>
+<target>Kategori</target>
+<source>Action</source>
+<target>Handling</target>
+<source>File/folder exists on left side only</source>
+<target>Fil/mappe findes kun til venstre</target>
+<source>File/folder exists on right side only</source>
+<target>Fil/mappe findes kun til højre</target>
+<source>Left file is newer</source>
+<target>Fil til venstre er nyere</target>
+<source>Right file is newer</source>
+<target>Fil til højre er nyere</target>
+<source>Files have different content</source>
+<target>Filer har forskelligt indhold</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Konflikt/filen kan ikke kategoriseres</target>
+<source>Compare by...</source>
+<target>Sammenlign ved...</target>
+<source>
+Files are found equal if
+     - file size
+     - last write time and date
+are the same
+</source>
+<target>
+Filer er ens hvis
+     - fil størrelse
+     - gemme tid og dato
+er det samme
+</target>
+<source>File size and date</source>
+<target>Fil størrelse og dato</target>
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Filer er ens hvis
+     - fil indhold
+er det samme
+</target>
+<source>File content</source>
+<target>Fil indhold</target>
+<source>Symbolic Link handling</source>
+<target>Link håndtering</target>
+<source>Synchronizing...</source>
+<target>Synkroniserer...</target>
+<source>Elements processed:</source>
+<target>Enheder behandlet:</target>
+<source>&Pause</source>
+<target>&Pause</target>
+<source>Compare by "File size and date"</source>
+<target>Sammenlign ved "Fil størelse og dato"</target>
+<source>This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.</source>
+<target>Denne variant vurderer to filer med samme navn som værende ens når de har samme fil størelse OG gemt på samme dato og tid.</target>
+<source>When the comparison is started with this option set the following decision tree is processed:</source>
+<target>Når der sammenlignes ved denne mulighed bruges følgende fremgangsmetode:</target>
+<source>As a result the files are separated into the following categories:</source>
+<target>Som resultat bliver filerne delt op i følgende kategorier:</target>
+<source>- equal</source>
+<target>- ens</target>
+<source>- left newer</source>
+<target>- venstre nyest</target>
+<source>- right newer</source>
+<target>- højre nyest</target>
+<source>- exists left only</source>
+<target>- findes kun til venstre</target>
+<source>- exists right only</source>
+<target>- findes kun til køjre</target>
+<source>- conflict (same date, different size)</source>
+<target>- konflikt (samme dato, forskellig størrelse)</target>
+<source>Compare by "File content"</source>
+<target>Sammenlign ved "Fil indhold"</target>
+<source>
+As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.
+
+With this option enabled the decision tree is smaller:
+</source>
+<target>
+Som navnet antyder, to filer der deler samme navn findes ens hvis de har samme indhold. Denne mulighed er god til at checke indhold i stedet for at udføre backup. Derfor bliver dato og tid ikke taget i betragtning.
+
+Ved denne mulighed er beslutningstræet mindre:
+</target>
+<source>- different</source>
+<target>- forskellig</target>
+<source>Source code written in C++ utilizing:</source>
+<target>Source code skrevet i C++:</target>
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Stor tak for lokalisering af FreeFileSync går til:</target>
+<source>Feedback and suggestions are welcome at:</source>
+<target>Feedback og forslag er velkommen på:</target>
+<source>FreeFileSync at Sourceforge</source>
+<target>FreeFileSync på Sourceforge</target>
+<source>Homepage</source>
+<target>Hjemmeside</target>
+<source>If you like FFS</source>
+<target>Hvis du kan lide FFS</target>
+<source>Donate with PayPal</source>
+<target>Doner med PayPal</target>
+<source>Email</source>
+<target>E-mail</target>
+<source>Report translation error</source>
+<target>Rapporter oversættelses fejl</target>
+<source>Published under the GNU General Public License:</source>
+<target>Udgivet under GNU General Public Licence:</target>
+<source>Ignore subsequent errors</source>
+<target>Ignorer underliggende fejl</target>
+<source>Hide further error messages during the current process</source>
+<target>Skjul yderligere fejl beskeder under nuværende opgave</target>
+<source>&Ignore</source>
+<target>&Ignorer</target>
+<source>&Retry</source>
+<target>&Prøv igen</target>
+<source>Do not show this dialog again</source>
+<target>Vis ikke denne dialog igen</target>
+<source>&Switch</source>
+<target>&Skift</target>
+<source>&Yes</source>
+<target>&Ja</target>
+<source>&No</source>
+<target>&Nej</target>
+<source>Delete on both sides</source>
+<target>Slet på begge sider</target>
+<source>Delete on both sides even if the file is selected on one side only</source>
+<target>Slet på begge sider selvom der kun er valgt en side</target>
+<source>Use Recycle Bin</source>
+<target>Brug skraldespanden</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>
+Kun filer/biblioteker der passer til alle filter indstillinger vil blive valgt til synkronisering.
+Bemærk: Navnefilteret skal være faktisk specificeret(!) til hoved synkroniserings bibliotekerne.
+</target>
+<source>Hints:</source>
+<target>Vejledninger:</target>
+<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
+<target>1. Skriv faktiske fil eller bibliotek navne adskilt af ';' eller en ny linje.</target>
+<source>2. Use wildcard characters '*' and '?'.</source>
+<target>2. Brug wildcard tegn '*' og '?'.</target>
+<source>3. Exclude files directly on main grid via context menu.</source>
+<target>3. Udeluk filer direkte.</target>
+<source>Example</source>
+<target>Eksempel</target>
+<source>
+Include: *.doc;*.zip;*.exe
+Exclude: \stuff\temp\*
+</source>
+<target>
+Inkluder: *.doc;*.zip;*.exe
+Udeluk: \ting\temp\*
+</target>
+<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
+<target>Synkroniserer alle .doc, .zip and .exe filer pånær alt i undermappen "temp".</target>
+<source>Include</source>
+<target>Inkluder</target>
+<source>Exclude</source>
+<target>Udeluk</target>
+<source>Select time span:</source>
+<target>Fælg tidsrum:</target>
+<source>Minimum file size:</source>
+<target>Mindste fil størelse:</target>
+<source>Maximum file size:</source>
+<target>Største fil størelse:</target>
+<source>&Default</source>
+<target>&Standard</target>
+<source>Move column up</source>
+<target>Flyt kolonne op</target>
+<source>Move column down</source>
+<target>Flyt kolonne ned</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 filesystem permissions</source>
+<target>Kopier filsystem 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>Hidden dialogs:</source>
+<target>Skjulte dialoger:</target>
+<source>Reset</source>
+<target>Nulstil</target>
+<source>Show hidden dialogs</source>
+<target>Vi skjulte dialoger</target>
+<source>External applications</source>
+<target>Eksterne programmer</target>
+<source>Description</source>
+<target>Beskrivelse</target>
+<source>Variant</source>
+<target>Variation</target>
+<source>Statistics</source>
+<target>Statestik</target>
+<source>Find what:</source>
+<target>Find:</target>
+<source>Match case</source>
+<target>Sammenlign stor og små bogstaver</target>
+<source>&Find next</source>
+<target>&Find næste</target>
+<source>You may try to synchronize remaining items again (WITHOUT having to re-compare)!</source>
+<target>Du kan prøve at synkroniserer igen (UDEN at skulle sammenligne igen)!</target>
+<source>Batch file created successfully!</source>
+<target>Batch fil oprettet!</target>
+<source>Main bar</source>
+<target>Hoved værktøjslinjen</target>
+<source>Folder pairs</source>
+<target>Mappe par</target>
+<source>Select view</source>
+<target>Vælg udseende</target>
+<source>Folder Comparison and Synchronization</source>
+<target>Mappe sammenligning og synkronisering</target>
+<source>Recycle Bin not yet supported for this system!</source>
+<target>Skraldespanden er ikke understøttet for dette system endnu!</target>
+<source>Set direction:</source>
+<target>Sæt handlevejen:</target>
+<source>Exclude temporarily</source>
+<target>Ekskluder midlertidigt</target>
+<source>Include temporarily</source>
+<target>Inkluder midlertidigt</target>
+<source>Exclude via filter:</source>
+<target>Ekskluder via filter:</target>
+<source><multiple selection></source>
+<target><flere valg></target>
+<source>D-Click</source>
+<target>Dobbelt-klik</target>
+<source>Delete</source>
+<target>Slet</target>
+<source>Customize...</source>
+<target>Tilpas...</target>
+<source>Auto-adjust columns</source>
+<target>Auto-juster kolonner</target>
+<source>Include all rows</source>
+<target>Inkluder alle rækker</target>
+<source>Exclude all rows</source>
+<target>Ekskluder alle rækker</target>
+<source>Reset view</source>
+<target>Nulstil udseende</target>
+<source>Show "%x"</source>
+<target>Vis "%x"</target>
+<source><Last session></source>
+<target><Sidste opgave></target>
+<source>Configuration saved!</source>
+<target>Konfiguration gemt!</target>
+<source>Save changes to current configuration?</source>
+<target>Gem ændringer til nuværende konfiguration?</target>
+<source>Configuration loaded!</source>
+<target>Konfiguration hentet!</target>
+<source>Hide files that exist on left side only</source>
+<target>Skjul filder der kun findes på venstre side</target>
+<source>Show files that exist on left side only</source>
+<target>Vis filer der kun findes på venstre side</target>
+<source>Hide files that exist on right side only</source>
+<target>Skjul filer der kun findes på højre side</target>
+<source>Show files that exist on right side only</source>
+<target>Vis filer der kun findes på højre side</target>
+<source>Hide files that are newer on left</source>
+<target>Skjul filer der er nyere til venstre</target>
+<source>Show files that are newer on left</source>
+<target>Vis filer der er nyere til venstre</target>
+<source>Hide files that are newer on right</source>
+<target>Skjul filer der er nyere til højre</target>
+<source>Show files that are newer on right</source>
+<target>Vis filer der er nyere til højre</target>
+<source>Hide files that are equal</source>
+<target>Skjul ens filer</target>
+<source>Show files that are equal</source>
+<target>Vis ens filer</target>
+<source>Hide files that are different</source>
+<target>Skjul uens filer</target>
+<source>Show files that are different</source>
+<target>Vis uens filer</target>
+<source>Hide conflicts</source>
+<target>Skjul konflikter</target>
+<source>Show conflicts</source>
+<target>Vis konflikter</target>
+<source>Hide files that will be created on the left side</source>
+<target>Skjul filer der vil blive oprettet til venstre</target>
+<source>Show files that will be created on the left side</source>
+<target>Vis filer der vil blive oprettet til venstre</target>
+<source>Hide files that will be created on the right side</source>
+<target>Skjul filer der vil blive oprettet til højre</target>
+<source>Show files that will be created on the right side</source>
+<target>Vis filer der vil blive oprettet til højre</target>
+<source>Hide files that will be deleted on the left side</source>
+<target>Skjul filer der bliver slettet til venstre</target>
+<source>Show files that will be deleted on the left side</source>
+<target>Vis filer der bliver slettet til venstre</target>
+<source>Hide files that will be deleted on the right side</source>
+<target>Skjul filer der bliver slettet til højre</target>
+<source>Show files that will be deleted on the right side</source>
+<target>Vis filer der bliver slettet til højre</target>
+<source>Hide files that will be overwritten on left side</source>
+<target>Skjul filer der bliver overskrevet til venstre</target>
+<source>Show files that will be overwritten on left side</source>
+<target>Vis filer der bliver overskrevet til venstre</target>
+<source>Hide files that will be overwritten on right side</source>
+<target>Skjul filer der bliver overskrevet til højre</target>
+<source>Show files that will be overwritten on right side</source>
+<target>Vis filer der bliver overskrevet til højre</target>
+<source>Hide files that won't be copied</source>
+<target>Skjul filer der ikke bliver kopieret</target>
+<source>Show files that won't be copied</source>
+<target>Vis filer der ikke bliver kopieret</target>
+<source>All directories in sync!</source>
+<target>Alle biblioteker er synkroniseret!</target>
+<source>Please run a Compare first before synchronizing!</source>
+<target>Kør venligst en sammenligning inden synkronisering!</target>
+<source>Comma separated list</source>
+<target>Komma separeret list</target>
+<source>Legend</source>
+<target>Legend</target>
+<source>File list exported!</source>
+<target>Fil listen er eksporteret!</target>
+<source>
+<pluralform>Object deleted successfully!</pluralform>
+<pluralform>%x objects deleted successfully!</pluralform>
+</source>
+<target>
+<pluralform>Emnet er slettet!</pluralform>
+<pluralform>%x emner er slettet!</pluralform>
+</target>
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 bibliotek</pluralform>
+<pluralform>%x biblioteker</pluralform>
+</target>
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 fil</pluralform>
+<pluralform>%x filer</pluralform>
+</target>
+<source>
+<pluralform>%x of 1 row in view</pluralform>
+<pluralform>%x of %y rows in view</pluralform>
+</source>
+<target>
+<pluralform>%x af 1 række</pluralform>
+<pluralform>%x af %y rækker</pluralform>
+</target>
+<source>Scanning...</source>
+<target>Skanner...</target>
+<source>Comparing content...</source>
+<target>Sammenligner indhold...</target>
+<source>Paused</source>
+<target>Pauset</target>
+<source>Aborted</source>
+<target>Afbrudt</target>
+<source>Completed</source>
+<target>Fuldført</target>
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Afbrydelse: Venter på nuværende opgave afsluttes...</target>
+<source>Continue</source>
+<target>Fortsæt</target>
+<source>Pause</source>
+<target>Pause</target>
+<source>Cannot find %x</source>
+<target>Kan ikke finde %x</target>
+<source>DECISION TREE</source>
+<target>BESLUTNINGS TRÆ</target>
+<source>file exists on both sides</source>
+<target>fil findes på begge sider</target>
+<source>on one side only</source>
+<target>kun på en side</target>
+<source>same date</source>
+<target>samme dato</target>
+<source>different date</source>
+<target>forskellig dato</target>
+<source>Inactive</source>
+<target>Inaktiv</target>
+<source>Second</source>
+<target>Sekund</target>
+<source>Minute</source>
+<target>Minut</target>
+<source>Hour</source>
+<target>Time</target>
+<source>Day</source>
+<target>Dag</target>
+<source>Byte</source>
+<target>Byte</target>
+<source>KB</source>
+<target>KB</target>
+<source>MB</source>
+<target>MB</target>
+<source>Filter: All pairs</source>
+<target>Filter: Alle par</target>
+<source>Filter: Single pair</source>
+<target>Filter: Par</target>
+<source>Ignore</source>
+<target>Ignorer</target>
+<source>Direct</source>
+<target>Direkte</target>
+<source>Follow</source>
+<target>Følg</target>
+<source>Integrate external applications into context menu. The following macros are available:</source>
+<target>Integrere eksterne programme. Følgende macroer er mulige:</target>
+<source>- full file or directory name</source>
+<target>- komplet fil eller bibliotek navn</target>
+<source>- directory part only</source>
+<target>- kun bibliotek</target>
+<source>- Other side's counterpart to %name</source>
+<target>- Modsatte sides modpart til %name</target>
+<source>- Other side's counterpart to %dir</source>
+<target>- Modsatte sides modpart til %dir</target>
+<source>Restore all hidden dialogs?</source>
+<target>Gendan alle skjulte dialoger?</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>Vil du flytte emnet til skraldespanden?</pluralform>
+<pluralform>Vil du flytte følgende %x emner til skraldespanden?</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>Vil du slette følgende emne?</pluralform>
+<pluralform>Vil du slette følgende %x emner?</pluralform>
+</target>
+<source>Leave as unresolved conflict</source>
+<target>Efterlad som uløste konflikter</target>
+<source>Delete permanently</source>
+<target>Slet permanent</target>
+<source>Delete or overwrite files permanently</source>
+<target>Slet eller overskriv filer permanent</target>
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Brug skraldespand ved sletning eller overskrivning</target>
+<source>Versioning</source>
+<target>Versionering</target>
+<source>Move files into a time-stamped subdirectory</source>
+<target>Flyt filer til et datomærket underbibliotek</target>
+<source>Cannot determine sync-direction:</source>
+<target>Kan ikke bestemme synkroniseringsvej:</target>
+<source>Filter settings have changed!</source>
+<target>Filter indstillinger er ændret!</target>
+<source>Both sides have changed since last synchronization!</source>
+<target>Begge sider er ændret siden sidste synkronisering!</target>
+<source>No change since last synchronization!</source>
+<target>Ingen ændringer siden sidste synkronisering!</target>
+<source>The file was not processed by last synchronization!</source>
+<target>filen blev ikke behandlet ved sidste synkronisering!</target>
+<source>Planned directory deletion is in conflict with its subdirectories and -files!</source>
+<target>Planlagt sletning af biblioteket er i konflikt med underbiblioteker og filer!</target>
+<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
+<target>Sætter standard synkroniseringsvej: Gamle filer bliver overskrevet med nyere.</target>
+<source>The file does not contain a valid configuration:</source>
+<target>Filen indeholder ikke en gyldig konfiguration:</target>
+<source>Scanning:</source>
+<target>Skanner:</target>
+<source>Encoding extended time information: %x</source>
+<target>Finder udvidet tids information: %x</target>
+<source>You can ignore this error to consider the directory as empty.</source>
+<target>Du kan ignorer denne fejl, og opfatte biblioteket som tomt.</target>
+<source>Directory does not exist:</source>
+<target>Biblioteket findes ikke:</target>
+<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>
+<source>File %x has an invalid date!</source>
+<target>Filen %x har en ugyldig dato!</target>
+<source>Conflict detected:</source>
+<target>Konflik fundet:</target>
+<source>Files %x have the same date but a different size!</source>
+<target>Filerne %x har den samme dato men forskellig størrelse!</target>
+<source>Symlinks %x have the same date but a different target!</source>
+<target>Links %x har den samme dato men forskellige destinationerl!</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>
+<source>Files/folders differ in attributes only</source>
+<target>Filer/mapper har forskellige attributter</target>
+<source>Copy new file/folder to left</source>
+<target>Kopiere ny fil/mappe til venstre</target>
+<source>Copy new file/folder to right</source>
+<target>Kopiere ny fil/mappe til højre</target>
+<source>Delete left file/folder</source>
+<target>Slet venstre fil/mappe</target>
+<source>Delete right file/folder</source>
+<target>Slet højre fil/mappe</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Overskriv venstre fil/mappe med højre</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Overskriv højre fil/mappe med venstre</target>
+<source>Do nothing</source>
+<target>Gør intet</target>
+<source>Copy file attributes only to left</source>
+<target>Kopiere fil attributter kun til venstre</target>
+<source>Copy file attributes only to right</source>
+<target>Kopiere fil attributter kun til højre</target>
+<source>Deleting file %x</source>
+<target>Sletter fil %x</target>
+<source>Deleting Symbolic Link %x</source>
+<target>Sletter Link %x</target>
+<source>Deleting folder %x</source>
+<target>Sletter mappe %x</target>
+<source>Moving %x to Recycle Bin</source>
+<target>Flytter %x til skraldespanden</target>
+<source>Moving file %x to user-defined directory %y</source>
+<target>Flytter fil %x til bruger-defineret bibliotek %y</target>
+<source>Moving folder %x to user-defined directory %y</source>
+<target>Flytter mappe %x til bruger-defineret bibliotek %y</target>
+<source>Moving Symbolic Link %x to user-defined directory %y</source>
+<target>Flytter Link %x til bruger-defineret bibliotek %y</target>
+<source>Copying new file %x to %y</source>
+<target>Kopierer ny fil %x til %y</target>
+<source>Copying new Symbolic Link %x to %y</source>
+<target>Kopierer nyt Link %x til %y</target>
+<source>Overwriting file %x in %y</source>
+<target>Overskriver fil %x i %y</target>
+<source>Overwriting Symbolic Link %x in %y</source>
+<target>Overskriver Link %x i %y</target>
+<source>Creating folder %x</source>
+<target>Opretter mappe %x</target>
+<source>Verifying file %x</source>
+<target>Verificerer fil %x</target>
+<source>Updating attributes of %x</source>
+<target>Opdaterer attributter af %x</target>
+<source>Source directory does not exist anymore:</source>
+<target>Kilde biblioteket findes ikke mere:</target>
+<source>Generating database...</source>
+<target>Opretter database...</target>
+<source>Nothing to synchronize according to configuration!</source>
+<target>Intet at synkroniserer ifølge dokumentationen!</target>
+<source>Target directory name must not be empty!</source>
+<target>Navnet på destinations biblioteket må ikke være tomt!</target>
+<source>User-defined directory for deletion was not specified!</source>
+<target>Bruger-defineret bibliotek til sletning ikke defineret!</target>
+<source>Unresolved conflicts existing!</source>
+<target>Er er uløste konflikter!</target>
+<source>You can ignore conflicts and continue synchronization.</source>
+<target>Du kan ignorere konflikter og fortsætte synkronisering.</target>
+<source>Significant difference detected:</source>
+<target>Betydelig forskel fundet:</target>
+<source>More than 50% of the total number of files will be copied or deleted!</source>
+<target>Mere end 50% af det samlede antal filer vil blive kopieret eller slettet!</target>
+<source>Not enough free disk space available in:</source>
+<target>Ikke nok ledig diskplads på:</target>
+<source>Free disk space required:</source>
+<target>Krævet ledig diskplads:</target>
+<source>Free disk space available:</source>
+<target>Ledig diskplads tilgængelig:</target>
+<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
+<target>Et bibliotek vil blive ændret som er en del af et mappe par! Gennemse venligst synkroniserings indstillingerne!</target>
+<source>Processing folder pair:</source>
+<target>Behandler mappe par:</target>
+<source>Error copying locked file %x!</source>
+<target>Fejl i kopiering af låst fil %x!</target>
+<source>Data verification error: Source and target file have different content!</source>
+<target>Data godkendelses fejl: Kilde og destinations fil har forskelligt indhold!</target>
diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng
index 1c284a7a..f7000f4d 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -1,6 +1,6 @@
 <header>
 	<language name>Nederlands</language name>
-	<translator>Dion van Lieshout</translator>
+	<translator>Rogier Wijker</translator>
 	<locale>nl_NL</locale>
 	<flag file>holland.png</flag file>
 	<plural forms>2</plural forms>
@@ -8,7 +8,7 @@
 </header>
 
 <source>Show in Explorer</source>
-<target></target>
+<target>Toon in de verkenner</target>
 <source>Open with default application</source>
 <target>Open met standaardapplicatie</target>
 <source>Browse directory</source>
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Geautomatiseerde Synchronisatie</target>
 <source>Browse</source>
 <target>Verkennen</target>
+<source>Invalid commandline: "%x"</source>
+<target>Ongeldige invoer: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Fout tijdens opzoeken van symbolische koppeling:</target>
+<source>Show popup</source>
+<target>Toon opspringvenster</target>
+<source>Show popup on errors or warnings</source>
+<target>Toon opspringvenster bij fouten of waarschuwingen</target>
+<source>Ignore errors</source>
+<target>Negeer foutmeldingen</target>
+<source>Hide all error and warning messages</source>
+<target>Verberg alle fout- en waarschuwingsberichten</target>
+<source>Exit instantly</source>
+<target>Sluit meteen af</target>
+<source>Abort synchronization immediately</source>
+<target>Stop synchronisatie onmiddelijk</target>
 <source>Select alternate synchronization settings</source>
 <target>Selecteer alternatieve synchronisatie instellingen</target>
 <source>No filter selected</source>
@@ -58,7 +72,7 @@
 <source>%x MB</source>
 <target>%x MB</target>
 <source>%x KB</source>
-<target></target>
+<target>%x KB</target>
 <source>%x GB</source>
 <target>%x GB</target>
 <source>
@@ -66,6 +80,8 @@
 <pluralform>%x Bytes</pluralform>
 </source>
 <target>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
 </target>
 <source><Symlink></source>
 <target><Symlink></target>
@@ -112,19 +128,19 @@
 <pluralform>%x sec</pluralform>
 </source>
 <target>
+<pluralform>1 sec</pluralform>
+<pluralform>%x sec</pluralform>
 </target>
 <source>Info</source>
 <target>Info</target>
 <source>Fatal Error</source>
 <target>Fatale fout</target>
+<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 writing file:</source>
-<target>Fout tijdens schrijven van bestand:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>Foutief FreeFileSync configuratiebestand!</target>
 <source>/sec</source>
 <target>/sec</target>
 <source>
@@ -132,21 +148,27 @@
 <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>S&ave configuration...</source>
-<target>S&la configuratie op...</target>
+<target>Sl&a configuratie op...</target>
 <source>&Load configuration...</source>
 <target>&Laad configuratie...</target>
 <source>&Quit</source>
@@ -207,8 +229,6 @@ De opdrachtregel wordt telkens uitgevoerd indien:
 <target>Observeren actief...</target>
 <source>Waiting for missing directories...</source>
 <target>Wacht op missende mappen...</target>
-<source>Command line is empty!</source>
-<target>Opdrachtregel is leeg!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Initaliseren van map-observatie niet mogelijk:</target>
 <source>A directory input field is empty.</source>
@@ -249,12 +269,18 @@ De opdrachtregel wordt telkens uitgevoerd indien:
 <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>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>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 setting privilege:</source>
 <target>Fout tijdens instellen van privileges:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -279,18 +305,6 @@ De opdrachtregel wordt telkens uitgevoerd indien:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>Kon geen waarden inlezen voor de volgende XML punten:</target>
-<source>Show popup</source>
-<target>Toon opspringvenster</target>
-<source>Show popup on errors or warnings</source>
-<target>Toon opspringvenster bij fouten of waarschuwingen</target>
-<source>Ignore errors</source>
-<target>Negeer foutmeldingen</target>
-<source>Hide all error and warning messages</source>
-<target>Verberg alle fout- en waarschuwingsberichten</target>
-<source>Exit instantly</source>
-<target>Sluit meteen af</target>
-<source>Abort synchronization immediately</source>
-<target>Stop synchronisatie onmiddelijk</target>
 <source>Logging</source>
 <target>Loggen</target>
 <source>FreeFileSync batch file</source>
@@ -395,8 +409,8 @@ De opdrachtregel wordt telkens uitgevoerd indien:
 <target>Rechts</target>
 <source>Batch job</source>
 <target>Taaklijst</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Creëer een taakbestand voor automatische synchronisatie. Om in taakmodus te starten is het voldoende om de bestandsnaam achter de FreeFileSync toepassing te zetten: FreeFileSync.exe <taakbestand>. Het is ook mogelijk dit in de systeemtaakplanner in te plannen.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Creëer een taakbestand voor geautomatiseerde synchronisatie. Om te starten in taakmodus dubbelklik op het bestand of uitvoeren via opdrachtregel: FreeFileSync.exe <takenbestand>. Dit kan ook gepland worden met de taakplanner van uw OS.</target>
 <source>Help</source>
 <target>Help</target>
 <source>Configuration overview:</source>
@@ -463,18 +477,18 @@ De opdrachtregel wordt telkens uitgevoerd indien:
 <target>Categorie</target>
 <source>Action</source>
 <target>Actie</target>
-<source>Files/folders that exist on left side only</source>
-<target>Bestanden/mappen die alleen aan de linkerzijde bestaan</target>
-<source>Files/folders that exist on right side only</source>
-<target>Bestanden/mappen die alleen aan de rechterzijde bestaan</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Bestanden die aan beide zijdes bestaan, maar waarvan de linkerzijde nieuwer is</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Bestanden die aan beide zijdes bestaan, maar waarvan de rechterzijde nieuwer is</target>
-<source>Files that have different content</source>
-<target>Bestanden die andere inhoud hebben</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Conflicten/bestanden die niet kunnen worden gecategoriseerd</target>
+<source>File/folder exists on left side only</source>
+<target>Bestand/Map bestaat alleen aan de linkerkant</target>
+<source>File/folder exists on right side only</source>
+<target>Bestand/Map bestaat alleen aan de rechterkant</target>
+<source>Left file is newer</source>
+<target>Linker bestand is nieuwer</target>
+<source>Right file is newer</source>
+<target>Rechter bestand is nieuwer</target>
+<source>Files have different content</source>
+<target>Bestanden hebben verschillende inhoud</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Conflict/Bestand kan niet worden gecategoriseerd</target>
 <source>Compare by...</source>
 <target>Vergelijk met...</target>
 <source>
@@ -529,8 +543,8 @@ overeenkomt
 <target>- bestaat alleen links</target>
 <source>- exists right only</source>
 <target>- bestaat alleen rechts</target>
-<source>- conflict</source>
-<target>- conflict</target>
+<source>- conflict (same date, different size)</source>
+<target>- conflict (zelfde datum, verschillende grootte)</target>
 <source>Compare by "File content"</source>
 <target>Vergelijk met "bestandsinhoud"</target>
 <source>
@@ -546,7 +560,7 @@ Zoals de naam suggereert worden twee bestanden met dezelfde naam alleen als geli
 <source>- different</source>
 <target>- verschillend</target>
 <source>Source code written in C++ utilizing:</source>
-<target></target>
+<target>Broncode geschreven in C++ met behulp van:</target>
 <source>Big thanks for localizing FreeFileSync goes out to:</source>
 <target>Extra dank voor het vertalen van FreeFileSync gaat naar:</target>
 <source>Feedback and suggestions are welcome at:</source>
@@ -591,7 +605,10 @@ Zoals de naam suggereert worden twee bestanden met dezelfde naam alleen als geli
 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></target>
+<target>
+Alleen bestanden/mappen die overeenkomen met de filter instellingen worden geselecteerd voor synchronisatie.
+Aantekening: De naam van de filter moet relatief gespecificeerd zijn (!) aan de hoofd synchronisatie map.
+</target>
 <source>Hints:</source>
 <target>Tips:</target>
 <source>1. Enter relative file or directory names separated by ';' or a new line.</source>
@@ -606,7 +623,10 @@ Note: The name filter must be specified relative(!) to main synchronization dire
 Include: *.doc;*.zip;*.exe
 Exclude: \stuff\temp\*
 </source>
-<target></target>
+<target>
+Opnemen: *.doc;*.zip;*.exe
+Uitsluiten: \stuff\temp\*
+</target>
 <source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
 <target>Synchroniseer alle .doc, .zip en .exe bestanden behalve wat in submap "temp" staat.</target>
 <source>Include</source>
@@ -614,11 +634,11 @@ Exclude: \stuff\temp\*
 <source>Exclude</source>
 <target>Uitsluiten</target>
 <source>Select time span:</source>
-<target></target>
+<target>Slecteer tijdspanne:</target>
 <source>Minimum file size:</source>
-<target></target>
+<target>Minimum bestandsgrootte:</target>
 <source>Maximum file size:</source>
-<target></target>
+<target>Maximum bestandsgrootte:</target>
 <source>&Default</source>
 <target>&Standaard</target>
 <source>Move column up</source>
@@ -691,10 +711,8 @@ Zet bestand en map permissies over
 <target><meervoudige selectie></target>
 <source>D-Click</source>
 <target>Dubbele klik</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Kopieer naar het klembord	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Verwijder bestanden	DEL</target>
+<source>Delete</source>
+<target>Verwijderen</target>
 <source>Customize...</source>
 <target>Aanpassen...</target>
 <source>Auto-adjust columns</source>
@@ -786,24 +804,32 @@ Zet bestand en map permissies over
 <pluralform>%x objects deleted successfully!</pluralform>
 </source>
 <target>
+<pluralform>Object succesvol verwijderd!</pluralform>
+<pluralform>%x objecten succesvol verwijderd!</pluralform>
 </target>
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
 <target>
+<pluralform>1 map</pluralform>
+<pluralform>%x mappen</pluralform>
 </target>
 <source>
 <pluralform>1 file</pluralform>
 <pluralform>%x files</pluralform>
 </source>
 <target>
+<pluralform>1 bestand</pluralform>
+<pluralform>%x bestanden</pluralform>
 </target>
 <source>
 <pluralform>%x of 1 row in view</pluralform>
 <pluralform>%x of %y rows in view</pluralform>
 </source>
 <target>
+<pluralform>%x van 1 rij in het overzicht</pluralform>
+<pluralform>%x van %y rijen in het overzicht</pluralform>
 </target>
 <source>Scanning...</source>
 <target>Doorzoekt...</target>
@@ -829,30 +855,26 @@ Zet bestand en map permissies over
 <target>bestand bestaat aan beide zijdes</target>
 <source>on one side only</source>
 <target>alleen aan één zijde</target>
-<source>- left</source>
-<target>- links</target>
-<source>- right</source>
-<target>- rechts</target>
-<source>different</source>
-<target>verschillend</target>
-<source>- conflict (same date, different size)</source>
-<target>- conflict (zelfde datum, verschillende grootte)</target>
+<source>same date</source>
+<target>dezelfde datum</target>
+<source>different date</source>
+<target>verschillende datum</target>
 <source>Inactive</source>
-<target></target>
+<target>Niet actief</target>
 <source>Second</source>
-<target></target>
+<target>Seconde</target>
 <source>Minute</source>
-<target></target>
+<target>Minuut</target>
 <source>Hour</source>
-<target></target>
+<target>Uur</target>
 <source>Day</source>
-<target></target>
+<target>Dag</target>
 <source>Byte</source>
-<target></target>
+<target>Byte</target>
 <source>KB</source>
-<target></target>
+<target>KB</target>
 <source>MB</source>
-<target></target>
+<target>MB</target>
 <source>Filter: All pairs</source>
 <target>Filter: Alle paren</target>
 <source>Filter: Single pair</source>
@@ -880,12 +902,16 @@ Zet bestand en map permissies over
 <pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
 </source>
 <target>
+<pluralform>Weet u zeker dat u dit object naar de Prullenbak wil verplaatsen?</pluralform>
+<pluralform>Weet u zeker dat u deze %x objecten naar de Prullenbak wil verplaatsen?</pluralform>
 </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>Weet u zeker dat u dit object wilt verwijderen?</pluralform>
+<pluralform>Weet u zeker dat u deze %x objecten wilt verwijderen?</pluralform>
 </target>
 <source>Leave as unresolved conflict</source>
 <target>Beschouw als onopgelost conflict</target>
@@ -943,28 +969,28 @@ Zet bestand en map permissies over
 <target>Genereren van bestandslijst...</target>
 <source>Multiple...</source>
 <target>Meerdere...</target>
-<source>Files that are equal on both sides</source>
-<target>Bestanden die aan beide zijdes gelijk zijn</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Alleen gelijke bestanden/mappen die verschillen van attributen</target>
-<source>Copy from right to left</source>
-<target>Kopieer van rechts naar links</target>
-<source>Copy from left to right</source>
-<target>Kopieer van links naar rechts</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Verwijder bestanden/mappen die alleen aan de linkerzijde voorkomen</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Verwijder bestanden/mappen die alleen aan de rechterzijde voorkomen</target>
-<source>Copy from right to left overwriting</source>
-<target>Kopieer en overschrijf van rechts naar links</target>
-<source>Copy from left to right overwriting</source>
-<target>Kopieer en overschrijf van links naar rechts</target>
+<source>Both sides are equal</source>
+<target>Beide kanten zijn gelijk</target>
+<source>Files/folders differ in attributes only</source>
+<target>Bestanden/Mappen verschillen alleen in attributen</target>
+<source>Copy new file/folder to left</source>
+<target>Kopieer nieuw bestand/map naar links</target>
+<source>Copy new file/folder to right</source>
+<target>Kopieer nieuw bestand/map naar rechts</target>
+<source>Delete left file/folder</source>
+<target>Verwijder linker bestand/map</target>
+<source>Delete right file/folder</source>
+<target>Verwijder rechter bestand/map</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Overschrijf linker bestand/map met de rechter</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Overschrijf rechter bestand/map met de linker</target>
 <source>Do nothing</source>
 <target>Geen actie ondernemen</target>
-<source>Copy attributes only from right to left</source>
-<target>Kopieer attributen alleen van rechts naar links</target>
-<source>Copy attributes only from left to right</source>
-<target>Kopieer attributen alleen van links naar rechts</target>
+<source>Copy file attributes only to left</source>
+<target>Kopieer bestandsattributen alleen naar links</target>
+<source>Copy file attributes only to right</source>
+<target>Kopieer bestandsattributen allen naar rechts</target>
 <source>Deleting file %x</source>
 <target>Verwijderen van bestand %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -995,10 +1021,12 @@ Zet bestand en map permissies over
 <target>Attributen bijwerken van %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>Bronmap bestaat niet meer:</target>
+<source>Generating database...</source>
+<target>Genereren van database...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Volgens de configuratie hoeft er niets gesynchroniseerd te worden!</target>
 <source>Target directory name must not be empty!</source>
-<target></target>
+<target>Doel mapnaam mag niet leeg zijn!</target>
 <source>User-defined directory for deletion was not specified!</source>
 <target>De door de gebruiker gedefinieerde map ter verwijdering was niet opgegeven!</target>
 <source>Unresolved conflicts existing!</source>
@@ -1019,8 +1047,6 @@ Zet bestand en map permissies over
 <target>Een map wordt bewerkt die deel is van meerdere mappen! Controleer de synchronisatie instellingen!</target>
 <source>Processing folder pair:</source>
 <target>Verwerking van gekoppelde mappen:</target>
-<source>Generating database...</source>
-<target>Genereren van database...</target>
 <source>Error copying locked file %x!</source>
 <target>Fout tijdens kopiëren van vergrendeld bestand %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index c323c26c..c2c776f9 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Automated Synchronisation</target>
 <source>Browse</source>
 <target>Browse</target>
+<source>Invalid commandline: "%x"</source>
+<target>Invalid commandline: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Error resolving symbolic link:</target>
+<source>Show popup</source>
+<target>Show popup</target>
+<source>Show popup on errors or warnings</source>
+<target>Show popup 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 synchronization settings</source>
 <target>Select alternate synchronisation settings</target>
 <source>No filter selected</source>
@@ -121,14 +135,12 @@
 <target>Info</target>
 <source>Fatal Error</source>
 <target>Fatal Error</target>
+<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 writing file:</source>
-<target>Error writing file:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>Invalid FreeFileSync config file!</target>
 <source>/sec</source>
 <target>/sec</target>
 <source>
@@ -217,8 +229,6 @@ The command line is executed each time:
 <target>Monitoring active...</target>
 <source>Waiting for missing directories...</source>
 <target>Waiting for missing directories...</target>
-<source>Command line is empty!</source>
-<target>Command line is empty!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Could not initialise directory monitoring:</target>
 <source>A directory input field is empty.</source>
@@ -259,12 +269,18 @@ The command line is executed each time:
 <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>Endless loop when traversing directory:</source>
 <target>Endless loop when traversing directory:</target>
 <source>Error traversing directory:</source>
 <target>Error traversing directory:</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 setting privilege:</source>
 <target>Error setting privilege:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -289,18 +305,6 @@ The command line is executed each time:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>Could not read values for the following XML nodes:</target>
-<source>Show popup</source>
-<target>Show popup</target>
-<source>Show popup on errors or warnings</source>
-<target>Show popup 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>Logging</source>
 <target>Logging</target>
 <source>FreeFileSync batch file</source>
@@ -405,8 +409,8 @@ The command line is executed each time:
 <target>Right</target>
 <source>Batch job</source>
 <target>Batch job</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Assemble a batch file for automated synchronisation. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Create a batch file for automated synchronisation. To start in batch mode simply double-click the file or execute via command line: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</target>
 <source>Help</source>
 <target>Help</target>
 <source>Configuration overview:</source>
@@ -473,18 +477,18 @@ The command line is executed each time:
 <target>Category</target>
 <source>Action</source>
 <target>Action</target>
-<source>Files/folders that exist on left side only</source>
-<target>Files/folders that exist on left side only</target>
-<source>Files/folders that exist on right side only</source>
-<target>Files/folders that exist on right side only</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Files that exist on both sides, left one is newer</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Files that exist on both sides, right one is newer</target>
-<source>Files that have different content</source>
-<target>Files that have different content</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Conflicts/files that cannot be categorised</target>
+<source>File/folder exists on left side only</source>
+<target>File/folder exists on left side only</target>
+<source>File/folder exists on right side only</source>
+<target>File/folder exists on right side only</target>
+<source>Left file is newer</source>
+<target>Left file is newer</target>
+<source>Right file is newer</source>
+<target>Right file is newer</target>
+<source>Files have different content</source>
+<target>Files have different content</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Conflict/file cannot be categorised</target>
 <source>Compare by...</source>
 <target>Compare by...</target>
 <source>
@@ -539,8 +543,8 @@ is the same
 <target>- exists left only</target>
 <source>- exists right only</source>
 <target>- exists right only</target>
-<source>- conflict</source>
-<target>- conflict</target>
+<source>- conflict (same date, different size)</source>
+<target>- conflict (same date, different size)</target>
 <source>Compare by "File content"</source>
 <target>Compare by "File content"</target>
 <source>
@@ -707,10 +711,8 @@ Transfer file and directory permissions
 <target><multiple selection></target>
 <source>D-Click</source>
 <target>D-Click</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Copy to clipboard	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Delete files	DEL</target>
+<source>Delete</source>
+<target>Delete</target>
 <source>Customize...</source>
 <target>Customise...</target>
 <source>Auto-adjust columns</source>
@@ -802,6 +804,8 @@ Transfer file and directory permissions
 <pluralform>%x objects deleted successfully!</pluralform>
 </source>
 <target>
+<pluralform>Object deleted successfully!</pluralform>
+<pluralform>%x objects deleted successfully!</pluralform>
 </target>
 <source>
 <pluralform>1 directory</pluralform>
@@ -851,14 +855,10 @@ Transfer file and directory permissions
 <target>file exists on both sides</target>
 <source>on one side only</source>
 <target>on one side only</target>
-<source>- left</source>
-<target>- left</target>
-<source>- right</source>
-<target>- right</target>
-<source>different</source>
-<target>different</target>
-<source>- conflict (same date, different size)</source>
-<target>- conflict (same date, different size)</target>
+<source>same date</source>
+<target>same date</target>
+<source>different date</source>
+<target>different date</target>
 <source>Inactive</source>
 <target>Inactive</target>
 <source>Second</source>
@@ -969,28 +969,28 @@ Transfer file and directory permissions
 <target>Generating file list...</target>
 <source>Multiple...</source>
 <target>Multiple...</target>
-<source>Files that are equal on both sides</source>
-<target>Files that are equal on both sides</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Equal files/folders that differ in attributes only</target>
-<source>Copy from right to left</source>
-<target>Copy from right to left</target>
-<source>Copy from left to right</source>
-<target>Copy from left to right</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Delete files/folders existing on left side only</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Delete files/folders existing on right side only</target>
-<source>Copy from right to left overwriting</source>
-<target>Copy from right to left overwriting</target>
-<source>Copy from left to right overwriting</source>
-<target>Copy from left to right overwriting</target>
+<source>Both sides are equal</source>
+<target>Both sides are equal</target>
+<source>Files/folders differ in attributes only</source>
+<target>Files/folders differ in attributes only</target>
+<source>Copy new file/folder to left</source>
+<target>Copy new file/folder to left</target>
+<source>Copy new file/folder to right</source>
+<target>Copy new file/folder to right</target>
+<source>Delete left file/folder</source>
+<target>Delete left file/folder</target>
+<source>Delete right file/folder</source>
+<target>Delete right file/folder</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Overwrite left file/folder with right one</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Overwrite right file/folder with left one</target>
 <source>Do nothing</source>
 <target>Do nothing</target>
-<source>Copy attributes only from right to left</source>
-<target>Copy attributes only from right to left</target>
-<source>Copy attributes only from left to right</source>
-<target>Copy attributes only from left to right</target>
+<source>Copy file attributes only to left</source>
+<target>Copy file attributes only to left</target>
+<source>Copy file attributes only to right</source>
+<target>Copy file attributes only to right</target>
 <source>Deleting file %x</source>
 <target>Deleting file %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1021,6 +1021,8 @@ Transfer file and directory permissions
 <target>Updating attributes of %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>Source directory does not exist anymore:</target>
+<source>Generating database...</source>
+<target>Generating database...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Nothing to synchronise according to configuration!</target>
 <source>Target directory name must not be empty!</source>
@@ -1045,8 +1047,6 @@ Transfer file and directory permissions
 <target>A directory will be modified which is part of multiple folder pairs! Please review synchronisation settings!</target>
 <source>Processing folder pair:</source>
 <target>Processing folder pair:</target>
-<source>Generating database...</source>
-<target>Generating database...</target>
 <source>Error copying locked file %x!</source>
 <target>Error copying locked file %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/finnish.lng b/BUILD/Languages/finnish.lng
index 20be9fe3..a0ddf34a 100644
--- a/BUILD/Languages/finnish.lng
+++ b/BUILD/Languages/finnish.lng
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Automaattinen täsmäytys</target>
 <source>Browse</source>
 <target>Selaa</target>
+<source>Invalid commandline: "%x"</source>
+<target>Virheellinen komento: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Virhe selvittäessä symbolista linkkiä:</target>
+<source>Show popup</source>
+<target>Näytä Popup</target>
+<source>Show popup on errors or warnings</source>
+<target>Näytä virheet ja varoitukset Popupissa</target>
+<source>Ignore errors</source>
+<target>Älä huomioi virheitä</target>
+<source>Hide all error and warning messages</source>
+<target>Piilota kaikki virhe- ja varoitusviestit</target>
+<source>Exit instantly</source>
+<target>Poistu välittömästi</target>
+<source>Abort synchronization immediately</source>
+<target>Lopeta täsmäytys välittömästi</target>
 <source>Select alternate synchronization settings</source>
 <target>Valitse toiset asetukset täsmäytykselles</target>
 <source>No filter selected</source>
@@ -70,7 +84,7 @@
 <pluralform>%x tavua</pluralform>
 </target>
 <source><Symlink></source>
-<target><Symlinkki></target>
+<target><Pikakuvake></target>
 <source><Directory></source>
 <target><Hakemisto></target>
 <source>Size</source>
@@ -121,14 +135,12 @@
 <target>Info</target>
 <source>Fatal Error</source>
 <target>Kohtalokas virhe</target>
+<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>
-<source>Error writing file:</source>
-<target>Virhe kirjottaessa tiedostoa:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>Virheellinen FreeFileSync asetustiedosto!</target>
 <source>/sec</source>
 <target>/s</target>
 <source>
@@ -217,8 +229,6 @@ Komento suoritetaan kun:
 <target>Seuranta käynnissä...</target>
 <source>Waiting for missing directories...</source>
 <target>Odottaa puuttuvia hakemistoja...</target>
-<source>Command line is empty!</source>
-<target>Tyhjä komentokehoite!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Hakemiston tarkkailua ei voitu käynnistää:</target>
 <source>A directory input field is empty.</source>
@@ -259,12 +269,18 @@ Komento suoritetaan kun:
 <target>Virhe kopioitaessa tiedostoa:</target>
 <source>Error opening file:</source>
 <target>Virhe avatessa tiedostoa:</target>
+<source>Error writing file:</source>
+<target>Virhe kirjottaessa tiedostoa:</target>
 <source>Error reading file:</source>
 <target>Virhe lukiessa 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>Windows Error Code %x:</source>
+<target>Windows virhekoodi %x:</target>
+<source>Linux Error Code %x:</source>
+<target>Linux virhekoodi %x:</target>
 <source>Error setting privilege:</source>
 <target>Virte oikeuksia asettaessa:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -289,18 +305,6 @@ Komento suoritetaan kun:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>Tietoja lukeminen epäonnistui, XML jäsen:</target>
-<source>Show popup</source>
-<target>Näytä Popup</target>
-<source>Show popup on errors or warnings</source>
-<target>Näytä virheet ja varoitukset Popupissa</target>
-<source>Ignore errors</source>
-<target>Älä huomioi virheitä</target>
-<source>Hide all error and warning messages</source>
-<target>Piilota kaikki virhe- ja varoitusviestit</target>
-<source>Exit instantly</source>
-<target>Poistu välittömästi</target>
-<source>Abort synchronization immediately</source>
-<target>Lopeta täsmäytys välittömästi</target>
 <source>Logging</source>
 <target>Kirjaa</target>
 <source>FreeFileSync batch file</source>
@@ -405,8 +409,8 @@ Komento suoritetaan kun:
 <target>Oikea</target>
 <source>Batch job</source>
 <target>Eräajo</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Luo komentotiedosto täsmäytyksen automaattiseen eräajoon. Käynnistä eräajo liittämällä FreeFileSync ohjelmalle komentotiedosto: FreeFileSync.exe <eräajotiedosto>. Tehtävän suoritusta voit ajoittaa käyttöjärjestelmän toimilla.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Luo automaattisen täsmäytyksen eräajotiedosto. Käynnistä se kaksois klikillä tai komennolla: FreeFileSync.exe <eräajotiedosto>. Käyttöjärjestelmän tehtävien ajoitustoiminnolla voit ajastaa suorittaminen.</target>
 <source>Help</source>
 <target>Ohje</target>
 <source>Configuration overview:</source>
@@ -473,18 +477,18 @@ Komento suoritetaan kun:
 <target>Luokka</target>
 <source>Action</source>
 <target>Suorita</target>
-<source>Files/folders that exist on left side only</source>
-<target>Tiedostoja/hakemistoja vain vasemmalla</target>
-<source>Files/folders that exist on right side only</source>
-<target>Tiedostoja/hakemistoja vain oikealla</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Tiedosto löytyy molemmilla puolilla, vasen on uudempi</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Tiedosto löytyy molemmilla puolilla, oikea on uudempi</target>
-<source>Files that have different content</source>
-<target>Tiedostoja joissa eri sisältö</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Ristiriita/tiedostoja joita ei voida luokitella</target>
+<source>File/folder exists on left side only</source>
+<target>Tiedosto/hakemisto löytyy vain vasemmalta</target>
+<source>File/folder exists on right side only</source>
+<target>Tiedosto/hakemisto löytyy vain vasemmalta</target>
+<source>Left file is newer</source>
+<target>Tiedosto vasemmalla on uudempi</target>
+<source>Right file is newer</source>
+<target>Tiedosto oikealla on uudempi</target>
+<source>Files have different content</source>
+<target>Tiedostojen sisältö on eri</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Poikeaman/tiedoston luokittelu ei onnistu</target>
 <source>Compare by...</source>
 <target>Vertaile...</target>
 <source>
@@ -514,7 +518,7 @@ on sama
 <source>File content</source>
 <target>Tiedoston sisältö</target>
 <source>Symbolic Link handling</source>
-<target>Symlinkkien hallinta</target>
+<target>Pikakuvakkeiden hallinta</target>
 <source>Synchronizing...</source>
 <target>Täsmäytetään...</target>
 <source>Elements processed:</source>
@@ -539,8 +543,8 @@ on sama
 <target>- olemassa vain vasemmalla</target>
 <source>- exists right only</source>
 <target>- olemassa vain oikealla</target>
-<source>- conflict</source>
-<target>- eroavuus</target>
+<source>- conflict (same date, different size)</source>
+<target>- eroavuus (sama päivämäärä, eri koko)</target>
 <source>Compare by "File content"</source>
 <target>Vertaa: "tietosisältöä"</target>
 <source>
@@ -662,11 +666,11 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 (Vaatii Järjestelmävalvojan oikeuksia)
 </target>
 <source>Hidden dialogs:</source>
-<target>Piilodialogit:</target>
+<target>Piiloitetut ikkunat:</target>
 <source>Reset</source>
 <target>Palauta</target>
 <source>Show hidden dialogs</source>
-<target>Näytä piilodialogit</target>
+<target>Näytä piiloitetut ikkunat</target>
 <source>External applications</source>
 <target>Ulkopuolinen sovellus</target>
 <source>Description</source>
@@ -684,7 +688,7 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <source>You may try to synchronize remaining items again (WITHOUT having to re-compare)!</source>
 <target>Yritä täsmäytystä lopuille uudestaan (ILMAN uutta vertailua)!</target>
 <source>Batch file created successfully!</source>
-<target>Eräajotiedosto luotu onnistuneesti!</target>
+<target>Eräajotiedoston luonti onnistui!</target>
 <source>Main bar</source>
 <target>Päävalikko</target>
 <source>Folder pairs</source>
@@ -698,7 +702,7 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <source>Set direction:</source>
 <target>Aseta suunta:</target>
 <source>Exclude temporarily</source>
-<target>Sulje pois tilapäisesti</target>
+<target>Sulje pois, tilapäisesti</target>
 <source>Include temporarily</source>
 <target>Sisällytä tilapäisesti</target>
 <source>Exclude via filter:</source>
@@ -706,11 +710,9 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <source><multiple selection></source>
 <target><monivalinta></target>
 <source>D-Click</source>
-<target>Klikkaa D</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Kopioi Leikepöydälle	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Poista tiedostoja	DEL</target>
+<target>2*Klikkaa</target>
+<source>Delete</source>
+<target>Poista</target>
 <source>Customize...</source>
 <target>Sovita...</target>
 <source>Auto-adjust columns</source>
@@ -718,7 +720,7 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <source>Include all rows</source>
 <target>Sisällytä kaikki rivit</target>
 <source>Exclude all rows</source>
-<target>Sulje pois kaikki rivit</target>
+<target>Sulje pois, kaikki rivit</target>
 <source>Reset view</source>
 <target>Palauta näkymä</target>
 <source>Show "%x"</source>
@@ -732,19 +734,19 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <source>Configuration loaded!</source>
 <target>Asetukset ladattu!</target>
 <source>Hide files that exist on left side only</source>
-<target>Piilota tiedostot jotka ovat vain vasemmalla</target>
+<target>Piilota vain vasemmalla olevat tiedostot</target>
 <source>Show files that exist on left side only</source>
 <target>Näytä vain vasemmalla esiintyvät tiedostot</target>
 <source>Hide files that exist on right side only</source>
-<target>Piilota tiedostot jotka ovat voin oikealla</target>
+<target>Piilota vain oikealla olevat tiedostot</target>
 <source>Show files that exist on right side only</source>
 <target>Näytä vain oikealla esiintyvät tiedostot</target>
 <source>Hide files that are newer on left</source>
-<target>Piilota tiedostot jotka ovat uudempia vasemmalla</target>
+<target>Piilota vasemalla olevat uudemmat tiedostot</target>
 <source>Show files that are newer on left</source>
-<target>Näytä uudemmat tiedostot vasemmalla</target>
+<target>Näytä vasemmalla olevat uudemmat tiedostot</target>
 <source>Hide files that are newer on right</source>
-<target>Piilota tiedostot jotka ovat uudempia oikealla</target>
+<target>Piilota oikealla olevat uudemmat tiedostot</target>
 <source>Show files that are newer on right</source>
 <target>Näytä uudemmat tiedostot oikealla</target>
 <source>Hide files that are equal</source>
@@ -760,31 +762,31 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <source>Show conflicts</source>
 <target>Näytä ristiriidat</target>
 <source>Hide files that will be created on the left side</source>
-<target>Piilota tiedostot jotka ovat luotu vasemmalla</target>
+<target>Piilota tiedostot jotka luodaan vasemmalle</target>
 <source>Show files that will be created on the left side</source>
 <target>Näytä vasemmalle luotavat tiedostot</target>
 <source>Hide files that will be created on the right side</source>
-<target>Piilota tiedostot jotka ovat luotu oikealla</target>
+<target>Piilota tiedostot jotka luodaan oikealla</target>
 <source>Show files that will be created on the right side</source>
 <target>Näytä oikealle luotavat tiedostot</target>
 <source>Hide files that will be deleted on the left side</source>
-<target>Piilota tiedostot jotka ovat poistettu vasemmalla</target>
+<target>Piilota tiedostot jotka poistetaan vasemmalta</target>
 <source>Show files that will be deleted on the left side</source>
-<target>Näytä vasemmalla poistettavat tiedostot</target>
+<target>Näytä vasemmallta poistettavat tiedostot</target>
 <source>Hide files that will be deleted on the right side</source>
-<target>Piilota tiedostot jotka ovat poistettu oikealla</target>
+<target>Piilota tiedostot jotka poistetaan oikealta</target>
 <source>Show files that will be deleted on the right side</source>
-<target>Näytä oikealla poistettavat tiedostot</target>
+<target>Näytä oikealta poistettavat tiedostot</target>
 <source>Hide files that will be overwritten on left side</source>
-<target>Piilota tiedostot jotka on ylikirjoitettu vasemmalla</target>
+<target>Piilota tiedostot jotka ylikirjoitetaan vasemmalla</target>
 <source>Show files that will be overwritten on left side</source>
 <target>Näytä vasemmalla ylikirjoitettavat tiedostot</target>
 <source>Hide files that will be overwritten on right side</source>
-<target>Piilota tiedostot jotka on ylikirjoitettu oikealla</target>
+<target>Piilota tiedostot jotka ylikirjoitetaan oikealla</target>
 <source>Show files that will be overwritten on right side</source>
 <target>Näytä oikealla ylikirjoitettavat tiedostot</target>
 <source>Hide files that won't be copied</source>
-<target>Piilota tiedostot jotka eivät kopioidu</target>
+<target>Piilota tiedostot jotka eivät kopioida</target>
 <source>Show files that won't be copied</source>
 <target>Näytä kopioimatta jäävät tiedostot</target>
 <source>All directories in sync!</source>
@@ -802,6 +804,8 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <pluralform>%x objects deleted successfully!</pluralform>
 </source>
 <target>
+<pluralform>Kohde poistettu onnistuneesti!</pluralform>
+<pluralform>%x kohdetta poistettu onnistuneesti!</pluralform>
 </target>
 <source>
 <pluralform>1 directory</pluralform>
@@ -838,7 +842,7 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <source>Completed</source>
 <target>Valmis</target>
 <source>Abort requested: Waiting for current operation to finish...</source>
-<target>Ohjelma on lopetettava: Odotetaan toiminnon loppumista...</target>
+<target>Keskeytys pyydetty: Odotetaan toiminnon loppumista...</target>
 <source>Continue</source>
 <target>Jatka</target>
 <source>Pause</source>
@@ -851,14 +855,10 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <target>tiedosto löytyy molemmilla puolilla</target>
 <source>on one side only</source>
 <target>vain yhdellä puolella</target>
-<source>- left</source>
-<target>- vasen</target>
-<source>- right</source>
-<target>- oikea</target>
-<source>different</source>
-<target>erilaiset</target>
-<source>- conflict (same date, different size)</source>
-<target>- eroavuus (sama päivämäärä, eri koko)</target>
+<source>same date</source>
+<target>sama päiväys</target>
+<source>different date</source>
+<target>eri päiväys</target>
 <source>Inactive</source>
 <target>Lepotilassa</target>
 <source>Second</source>
@@ -876,7 +876,7 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <source>MB</source>
 <target>MB</target>
 <source>Filter: All pairs</source>
-<target>Suodata: kaikki parit</target>
+<target>Suodata: Kaikki parit</target>
 <source>Filter: Single pair</source>
 <target>Suodata: Yksi pari</target>
 <source>Ignore</source>
@@ -896,7 +896,7 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <source>- Other side's counterpart to %dir</source>
 <target>- Toisen puolen vastaavuus on %dir</target>
 <source>Restore all hidden dialogs?</source>
-<target>Palauttetaanko kaikki piilodialoogit?</target>
+<target>Palauta piiloitetut ikkunat?</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>
@@ -926,7 +926,7 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <source>Move files into a time-stamped subdirectory</source>
 <target>Siirrä tiedostot aikaleimattuun hakemistoon</target>
 <source>Cannot determine sync-direction:</source>
-<target>Täsmäytys suuntä tuntematon:</target>
+<target>Tuntematon täsmäytys suunta:</target>
 <source>Filter settings have changed!</source>
 <target>Suodinasetukset muutettu!</target>
 <source>Both sides have changed since last synchronization!</source>
@@ -938,7 +938,7 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <source>Planned directory deletion is in conflict with its subdirectories and -files!</source>
 <target>Suunniteltu hakemiston poistaminen on ristiriidassa alihakemiston ja tiedostojen kanssa!</target>
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
-<target>Aseta oletu suunta täsmäytykselle: Vanhat tiedostot ylikirjoitetaan uudemilla tiedostoilla.</target>
+<target>Aseta oletettu suunta täsmäytykselle: Vanhat tiedostot ylikirjoitetaan uudemilla tiedostoilla.</target>
 <source>The file does not contain a valid configuration:</source>
 <target>Asetustiedosto ei ole kelvollinen:</target>
 <source>Scanning:</source>
@@ -946,7 +946,7 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <source>Encoding extended time information: %x</source>
 <target>Tulkitaan laajennettua aikatietoa: %x</target>
 <source>You can ignore this error to consider the directory as empty.</source>
-<target>Voit jättää tämä virhe huomiotta ja tulkita hakemisto tyhjäksi.</target>
+<target>Jätää virhe huomiotta ja tulkitse hakemisto tyhjäksi.</target>
 <source>Directory does not exist:</source>
 <target>Puuttuva hakemisto:</target>
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
@@ -960,81 +960,83 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <source>Conflict detected:</source>
 <target>Ristiriita todettu:</target>
 <source>Files %x have the same date but a different size!</source>
-<target>Tiedostot %x samalta päivältä mutta koko poikkeaa!</target>
+<target>Tiedostoilla %x on sama päiväys mutta eri koko!</target>
 <source>Symlinks %x have the same date but a different target!</source>
-<target>Symlinkki %x samalta päivältä mutta kohde on toinen!</target>
+<target>Pikakuvakkeilla %x on sama päiväys mutta kohde on toinen!</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>Files that are equal on both sides</source>
-<target>Tiedosto sama molemmilla puolilla</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Tiedostot/hakemistot ovat samat, ominaisuudet poikkeavat</target>
-<source>Copy from right to left</source>
-<target>Kopioidaan oikea -> vasen</target>
-<source>Copy from left to right</source>
-<target>Kopioidaan vasen -> oikea</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Poista vain tiedostoja/hakemistoja vasemmalta</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Poista vain tiedostoja/hakemistoja oikealta</target>
-<source>Copy from right to left overwriting</source>
-<target>Kopioidaan oikea -> vasen ylikirjoittaen</target>
-<source>Copy from left to right overwriting</source>
-<target>Kopioidaan vasen -> oikea ylikirjoittaen</target>
+<source>Both sides are equal</source>
+<target>Puolet ovat denttiset</target>
+<source>Files/folders differ in attributes only</source>
+<target>Tiedostot/hakemistot eroavat vain ominaisuuksissa</target>
+<source>Copy new file/folder to left</source>
+<target>Kopioi uusi tiedosto/hakemisto vasemmalle</target>
+<source>Copy new file/folder to right</source>
+<target>Kopioi uusi tiedosto/hakemisto oikealle</target>
+<source>Delete left file/folder</source>
+<target>Poista tiedosto/hakemisto vasemmalta</target>
+<source>Delete right file/folder</source>
+<target>Poista tiedosto/hakemisto oikealta</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Ylikirjoita oikea tiedosto/hakemista vasemanpuolisella</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Ylikirjoita vasen tiedosto/hakemista oikeannpuolisella</target>
 <source>Do nothing</source>
 <target>Älä tee mitään</target>
-<source>Copy attributes only from right to left</source>
-<target>Monista vain ominaisuudet oikea -> vasen</target>
-<source>Copy attributes only from left to right</source>
-<target>Monista vain ominaisuudet vasen -> oikea</target>
+<source>Copy file attributes only to left</source>
+<target>Monista tiedosto-ominaisuudet vasemmalle</target>
+<source>Copy file attributes only to right</source>
+<target>Monista tiedosto-ominaisuudet oikealle</target>
 <source>Deleting file %x</source>
 <target>Poista tiedosto %x</target>
 <source>Deleting Symbolic Link %x</source>
-<target>Poista Symlinkki %x</target>
+<target>Poista pikakuvake %x</target>
 <source>Deleting folder %x</source>
 <target>Poista hakemisto %x</target>
 <source>Moving %x to Recycle Bin</source>
 <target>Siirrä %x Roskakoriin</target>
 <source>Moving file %x to user-defined directory %y</source>
-<target>Siirretään tiedostoa %x valittuun hakemistoon %y</target>
+<target>Siirretään tiedostoa %x haluttuun hakemistoon %y</target>
 <source>Moving folder %x to user-defined directory %y</source>
-<target>Siirrä hakemisto %x valittuun hakemistoon %y</target>
+<target>Siirrä hakemisto %x haluttuun hakemistoon %y</target>
 <source>Moving Symbolic Link %x to user-defined directory %y</source>
-<target>Siirrä Symlinkki %x valittuun hakemistoon %y</target>
+<target>Siirrä pikakuvake %x haluttuun hakemistoon %y</target>
 <source>Copying new file %x to %y</source>
 <target>Kopioi uusi tiedosto %x -> %y</target>
 <source>Copying new Symbolic Link %x to %y</source>
-<target>Kopioi uusi Symlinkki %x -> %y</target>
+<target>Kopioi uusi pikakuvake %x -> %y</target>
 <source>Overwriting file %x in %y</source>
 <target>Ylikirjoita tiedosto %x kohdassa %y</target>
 <source>Overwriting Symbolic Link %x in %y</source>
-<target>Ylikirjoita Symlinkki %x kohdassa %y</target>
+<target>Ylikirjoita pikakuvake %x kohdassa %y</target>
 <source>Creating folder %x</source>
 <target>Luo hakemisto %x</target>
 <source>Verifying file %x</source>
-<target>Tarkistan tiedosto %x</target>
+<target>Tarkistan tiedostoa %x</target>
 <source>Updating attributes of %x</source>
-<target>Päivita %x:n ominaisuudet</target>
+<target>Päivitän %x:n ominaisuudet</target>
 <source>Source directory does not exist anymore:</source>
 <target>Lähdehakemisto puuttuu:</target>
+<source>Generating database...</source>
+<target>Luodaan tietokantaa...</target>
 <source>Nothing to synchronize according to configuration!</source>
-<target>Asetusten mukaan ei löydy täsmäytettävää !</target>
+<target>Asetusten mukaan ei löydy täsmäytettävää!</target>
 <source>Target directory name must not be empty!</source>
 <target>Kohdehakemisto ei saa olla tyhjä!</target>
 <source>User-defined directory for deletion was not specified!</source>
-<target>Hakemistoa ei valittu poistolle!</target>
+<target>Poistolle ei ole valittu hakemistoa!</target>
 <source>Unresolved conflicts existing!</source>
-<target>Ratkaisemattomia poikkeamia!</target>
+<target>Ratkaisemattomia ristiriitoja!</target>
 <source>You can ignore conflicts and continue synchronization.</source>
-<target>Voit jatkaa poikkeamista huolimatta täsmäytystä.</target>
+<target>Voit jatkaa täsmäytystä, ristiriidoista huolimatta.</target>
 <source>Significant difference detected:</source>
-<target>Merkittävä eroavaisuus todettu:</target>
+<target>Merkittävä eroavavuus todettu:</target>
 <source>More than 50% of the total number of files will be copied or deleted!</source>
-<target>Enemmän kuin 50% tiedostoista kopioidaan tai poistetaan!</target>
+<target>Yli 50% tiedostoista kopioidaan tai poistetaan!</target>
 <source>Not enough free disk space available in:</source>
 <target>Levytila ei riitä:</target>
 <source>Free disk space required:</source>
@@ -1045,8 +1047,6 @@ Siirrä tiedosto- ja hekimisto-oikeuksia
 <target>Moniosaisen hakemistoparin hakemisto muutetaan! Tarkista täsmäytys asetuksia!</target>
 <source>Processing folder pair:</source>
 <target>Käsitellään hakemistoparia:</target>
-<source>Generating database...</source>
-<target>Luodaan tietokantaa...</target>
 <source>Error copying locked file %x!</source>
 <target>Virhe kopioitaessa lukittua tiedostoa  %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng
index 1f1e280e..261503f3 100644
--- a/BUILD/Languages/french.lng
+++ b/BUILD/Languages/french.lng
@@ -12,13 +12,27 @@
 <source>Open with default application</source>
 <target>Ouvrir avec l'application par défaut</target>
 <source>Browse directory</source>
-<target>Prcourir le répertoire</target>
+<target>Parcourir le répertoire</target>
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Synchronisation Automatisée</target>
 <source>Browse</source>
 <target>Parcourir</target>
+<source>Invalid commandline: "%x"</source>
+<target>Ligne de commande invalide: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Erreur lors de la résolution du lien symbolique :</target>
+<source>Show popup</source>
+<target>Afficher la boîte de dialogue</target>
+<source>Show popup on errors or warnings</source>
+<target>Affiche la boîte de dialogue pour chaque erreur ou avertissement</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 synchronization settings</source>
 <target>Sélectionner une autre configuration de la synchronisation</target>
 <source>No filter selected</source>
@@ -121,14 +135,12 @@
 <target>Info</target>
 <source>Fatal Error</source>
 <target>Erreur Fatale</target>
+<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 writing file:</source>
-<target>Erreur lors de l'écriture du fichier :</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>Fichier de configuration FreeFileSync invalide !</target>
 <source>/sec</source>
 <target>/sec</target>
 <source>
@@ -217,8 +229,6 @@ La ligne de commande est exécutée chaque fois que :
 <target>Surveillance en cours...</target>
 <source>Waiting for missing directories...</source>
 <target>En attente des répertoires absents ...</target>
-<source>Command line is empty!</source>
-<target>La ligne de commande est vide !</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Impossible d'initialiser la surveillance des dossiers :</target>
 <source>A directory input field is empty.</source>
@@ -259,12 +269,18 @@ La ligne de commande est exécutée chaque fois que :
 <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>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>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 setting privilege:</source>
 <target>Erreur de paramétrage de privilège</target>
 <source>Error moving to Recycle Bin:</source>
@@ -289,18 +305,6 @@ La ligne de commande est exécutée chaque fois que :
 <target>%x %</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>Impossible de lire les valeurs des noeuds XML suivants :</target>
-<source>Show popup</source>
-<target>Afficher la boîte de dialogue</target>
-<source>Show popup on errors or warnings</source>
-<target>Affiche la boîte de dialogue pour chaque erreur ou avertissement</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>Logging</source>
 <target>Connexion</target>
 <source>FreeFileSync batch file</source>
@@ -405,8 +409,8 @@ La ligne de commande est exécutée chaque fois que :
 <target>Droite</target>
 <source>Batch job</source>
 <target>Fichier de commandes</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Crée un fichier de traitement par lots pour une synchronisation automatique. Pour démarrer en mode de traitement par lots, indiquer le nom du fichier à l'exécutable FreeFileSync : freefilesync.exe <fichier de commandes>. Ceci peut aussi être programmé dans le plannificateur de tâches.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Créer un fichier de commandes pour la synchronisation automatique. Pour démarrer en mode batch il suffit de double-cliquez sur le fichier de commandes ou d'exécuter en ligne de commande: FreeFileSync.exe <fichier de commandes>. Vous pouvez aussi le programmer à l'aide du planificateur de tâches de votre système d'exploitation.</target>
 <source>Help</source>
 <target>Aide</target>
 <source>Configuration overview:</source>
@@ -473,18 +477,18 @@ La ligne de commande est exécutée chaque fois que :
 <target>Catégorie</target>
 <source>Action</source>
 <target>Action</target>
-<source>Files/folders that exist on left side only</source>
-<target>Fichiers/répertoires existant seulement à gauche</target>
-<source>Files/folders that exist on right side only</source>
-<target>Fichiers/répertoires existant seulement à droite</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Fichiers existants des deux côtés, celui de gauche est plus récent</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Fichiers existants des deux côtés, celui de droite est plus récent</target>
-<source>Files that have different content</source>
-<target>Fichiers ayant un contenu différent</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Conflits/fichiers ne pouvant être catégorisés</target>
+<source>File/folder exists on left side only</source>
+<target>Fichier/Dossier existant seulement à gauche</target>
+<source>File/folder exists on right side only</source>
+<target>Fichier/Dossier existant seulement à droite</target>
+<source>Left file is newer</source>
+<target>Le fichier à gauche est nouveau</target>
+<source>Right file is newer</source>
+<target>Le fichier à droite est nouveau</target>
+<source>Files have different content</source>
+<target>Les fichiers ont un contenu différent</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Conflit ou fichier indéterminé</target>
 <source>Compare by...</source>
 <target>Comparaison par...</target>
 <source>
@@ -539,8 +543,8 @@ est identique
 <target>- le fichier existe seulement à gauche</target>
 <source>- exists right only</source>
 <target>- le fichier existe seulement à droite</target>
-<source>- conflict</source>
-<target>- conflit</target>
+<source>- conflict (same date, different size)</source>
+<target>- conflit (même date, taille différente)</target>
 <source>Compare by "File content"</source>
 <target>Comparaison par "Contenu des fichiers"</target>
 <source>
@@ -707,10 +711,8 @@ Transfert des attributs système des fichiers et des répertoires
 <target><sélection multiple></target>
 <source>D-Click</source>
 <target>Clic Droit</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Copier dans le presse-papiers	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Suppression des fichiers	DEL</target>
+<source>Delete</source>
+<target>Supprimer</target>
 <source>Customize...</source>
 <target>Personnaliser...</target>
 <source>Auto-adjust columns</source>
@@ -802,6 +804,8 @@ Transfert des attributs système des fichiers et des répertoires
 <pluralform>%x objects deleted successfully!</pluralform>
 </source>
 <target>
+<pluralform>Objet supprimé avec suucès!</pluralform>
+<pluralform>%x objets supprimés avec succès!</pluralform>
 </target>
 <source>
 <pluralform>1 directory</pluralform>
@@ -851,14 +855,10 @@ Transfert des attributs système des fichiers et des répertoires
 <target>le fichier existe des deux côtés</target>
 <source>on one side only</source>
 <target>le fichier existe d'un seul côté seulement</target>
-<source>- left</source>
-<target>- à gauche</target>
-<source>- right</source>
-<target>- à droite</target>
-<source>different</source>
-<target>fichiers différents</target>
-<source>- conflict (same date, different size)</source>
-<target>- conflit (même date, taille différente)</target>
+<source>same date</source>
+<target>même date</target>
+<source>different date</source>
+<target>date différente</target>
 <source>Inactive</source>
 <target>Inactif</target>
 <source>Second</source>
@@ -969,28 +969,28 @@ Transfert des attributs système des fichiers et des répertoires
 <target>Génération de la liste des fichiers...</target>
 <source>Multiple...</source>
 <target>Multiple...</target>
-<source>Files that are equal on both sides</source>
-<target>Fichiers identiques des deux côtés</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Fichiers/Dossiers identiques dont seuls les attributs diffèrent</target>
-<source>Copy from right to left</source>
-<target>Copie de droite à gauche</target>
-<source>Copy from left to right</source>
-<target>Copie de gauche à droite</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Suppression des fichiers/dossiers n'existant que sur le côté gauche</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Suppression des fichiers/dossiers n'existant que sur le côté droit</target>
-<source>Copy from right to left overwriting</source>
-<target>Copie de droite à gauche avec remplacement</target>
-<source>Copy from left to right overwriting</source>
-<target>Copie de gauche à droite avec remplacement</target>
+<source>Both sides are equal</source>
+<target>Les deux cotés sont identiques</target>
+<source>Files/folders differ in attributes only</source>
+<target>Fichiers/Dossiers différant seulement par leurs attributs</target>
+<source>Copy new file/folder to left</source>
+<target>Copier les nouveaux fichiers/dossiers à gauche</target>
+<source>Copy new file/folder to right</source>
+<target>Copier les nouveaux fichiers/dossiers à droite</target>
+<source>Delete left file/folder</source>
+<target>Supprimer les fichiers/dossiers de gauche</target>
+<source>Delete right file/folder</source>
+<target>Supprimer les fichiers/dossiers de droite</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Remplacer le fichier/dossier de gauche avec celui de droite</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Remplacer le fichier/dossier de droite avec celui de gauche</target>
 <source>Do nothing</source>
 <target>Ne rien faire</target>
-<source>Copy attributes only from right to left</source>
-<target>Copier uniquement les attributs de droite à gauche</target>
-<source>Copy attributes only from left to right</source>
-<target>Copier uniquement les attributs de gauche à droite</target>
+<source>Copy file attributes only to left</source>
+<target>Copier seulement les attributs du fichier à gauche</target>
+<source>Copy file attributes only to right</source>
+<target>Copier seulement les attributs du fichier à droite</target>
 <source>Deleting file %x</source>
 <target>Suppression du fichier %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1021,6 +1021,8 @@ Transfert des attributs système des fichiers et des répertoires
 <target>Mise à jour des attributs de %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>Le répertoire source n'existe plus :</target>
+<source>Generating database...</source>
+<target>Génération de la base de données...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Rien à synchroniser dans cette configuration !</target>
 <source>Target directory name must not be empty!</source>
@@ -1045,8 +1047,6 @@ Transfert des attributs système des fichiers et des répertoires
 <target>Un répertoire faisant partie de paires multiples doit être modifié ! Vérifiez les paramètres de la synchronisation !</target>
 <source>Processing folder pair:</source>
 <target>Traitement de la paire de dossiers :</target>
-<source>Generating database...</source>
-<target>Génération de la base de données...</target>
 <source>Error copying locked file %x!</source>
 <target>Erreur lors de la copie du fichier verrouillé %x !</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index 2070aae1..fa8031f9 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Automatisierte Synchronisation</target>
 <source>Browse</source>
 <target>Auswählen</target>
+<source>Invalid commandline: "%x"</source>
+<target>Ungültige Befehlszeile: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Fehler beim Auflösen des Symbolischen Links:</target>
+<source>Show popup</source>
+<target>Popup zeigen</target>
+<source>Show popup on errors or warnings</source>
+<target>Ein Auswahlfenster bei Fehlern oder Warnungen anzeigen</target>
+<source>Ignore errors</source>
+<target>Fehler ignorieren</target>
+<source>Hide all error and warning messages</source>
+<target>Alle Fehler- und Warnmeldungen unterdrücken</target>
+<source>Exit instantly</source>
+<target>Sofort beenden</target>
+<source>Abort synchronization immediately</source>
+<target>Synchronisation sofort abbrechen</target>
 <source>Select alternate synchronization settings</source>
 <target>Alternative Synchronisationseinstellungen auswählen</target>
 <source>No filter selected</source>
@@ -127,8 +141,6 @@
 <target>Die Datei existiert nicht:</target>
 <source>Error parsing configuration file:</source>
 <target>Fehler beim Auswerten der Konfigurationsdatei:</target>
-<source>Error writing file:</source>
-<target>Fehler beim Schreiben der Datei:</target>
 <source>/sec</source>
 <target>/s</target>
 <source>
@@ -217,8 +229,6 @@ Die Befehlszeile wird ausgeführt wenn:
 <target>Überwachung aktiv...</target>
 <source>Waiting for missing directories...</source>
 <target>Warte auf fehlende Verzeichnisse...</target>
-<source>Command line is empty!</source>
-<target>Die Befehlszeile ist leer!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Die Verzeichnisüberwachung konnte nicht gestartet werden:</target>
 <source>A directory input field is empty.</source>
@@ -259,12 +269,18 @@ Die Befehlszeile wird ausgeführt wenn:
 <target>Fehler beim Kopieren der Datei:</target>
 <source>Error opening file:</source>
 <target>Fehler beim Öffnen der Datei:</target>
+<source>Error writing file:</source>
+<target>Fehler beim Schreiben der Datei:</target>
 <source>Error reading file:</source>
 <target>Fehler beim Lesen 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>Windows Error Code %x:</source>
+<target>Windows Fehlercode %x:</target>
+<source>Linux Error Code %x:</source>
+<target>Linux Fehlercode %x:</target>
 <source>Error setting privilege:</source>
 <target>Fehler beim Setzen des Privilegs:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -289,18 +305,6 @@ Die Befehlszeile wird ausgeführt wenn:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>Die folgenden XML Knoten konnten nicht gelesen werden:</target>
-<source>Show popup</source>
-<target>Popup zeigen</target>
-<source>Show popup on errors or warnings</source>
-<target>Ein Auswahlfenster bei Fehlern oder Warnungen anzeigen</target>
-<source>Ignore errors</source>
-<target>Fehler ignorieren</target>
-<source>Hide all error and warning messages</source>
-<target>Alle Fehler- und Warnmeldungen unterdrücken</target>
-<source>Exit instantly</source>
-<target>Sofort beenden</target>
-<source>Abort synchronization immediately</source>
-<target>Synchronisation sofort abbrechen</target>
 <source>Logging</source>
 <target>Protokoll</target>
 <source>FreeFileSync batch file</source>
@@ -405,8 +409,8 @@ Die Befehlszeile wird ausgeführt wenn:
 <target>Rechts</target>
 <source>Batch job</source>
 <target>Batch-Job</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Erzeuge eine Batchdatei für die automatisierte Synchronisation. Um den Batch-Modus zu starten, muss nur der Dateiname an die Programmdatei übergeben werden: FreeFileSync.exe <Batchdatei>. Dies kann auch in den Taskplaner des Betriebssystems eingetragen werden.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Erzeuge eine Batchdatei für die automatisierte Synchronisation. Um den Batch-Modus zu starten, einfach auf die Datei doppelklicken oder über die Befehlszeile ausführen: FreeFileSync.exe <Batchdatei>. Dies kann auch in den Taskplaner des Betriebssystems eingetragen werden.</target>
 <source>Help</source>
 <target>Hilfe</target>
 <source>Configuration overview:</source>
@@ -473,18 +477,18 @@ Die Befehlszeile wird ausgeführt wenn:
 <target>Kategorie</target>
 <source>Action</source>
 <target>Aktion</target>
-<source>Files/folders that exist on left side only</source>
-<target>Nur links exisitierende Dateien/Verzeichnisse</target>
-<source>Files/folders that exist on right side only</source>
-<target>Nur rechts exisitierende Dateien/Verzeichnisse</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Auf beiden Seiten existierende Dateien; linke Datei ist neuer</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Auf beiden Seiten existierende Dateien; rechte Datei ist neuer</target>
-<source>Files that have different content</source>
-<target>Dateien mit verschiedenem Inhalt</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Konflikte/Dateien, die nicht eingeordnet werden können</target>
+<source>File/folder exists on left side only</source>
+<target>Datei/Ordner existiert nur links</target>
+<source>File/folder exists on right side only</source>
+<target>Datei/Ordner existiert nur rechts</target>
+<source>Left file is newer</source>
+<target>Linke Datei ist neuer</target>
+<source>Right file is newer</source>
+<target>Rechte Datei ist neuer</target>
+<source>Files have different content</source>
+<target>Dateien haben unterschiedlichen Inhalt</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Konflikt/Datei, die nicht eingeordnet werden kann</target>
 <source>Compare by...</source>
 <target>Vergleichen nach...</target>
 <source>
@@ -707,10 +711,8 @@ Transfer file and directory permissions
 <target><Mehrfachauswahl></target>
 <source>D-Click</source>
 <target>D-Klick</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>In die Zwischenablage kopieren	Strg+C</target>
-<source>Delete files	DEL</source>
-<target>Dateien löschen	Entf</target>
+<source>Delete</source>
+<target>Löschen</target>
 <source>Customize...</source>
 <target>Anpassen...</target>
 <source>Auto-adjust columns</source>
@@ -854,9 +856,9 @@ Transfer file and directory permissions
 <source>on one side only</source>
 <target>nur auf einer Seite</target>
 <source>same date</source>
-<target></target>
+<target>gleiches Datum</target>
 <source>different date</source>
-<target></target>
+<target>unterschiedliches Datum</target>
 <source>Inactive</source>
 <target>Inaktiv</target>
 <source>Second</source>
@@ -967,28 +969,28 @@ Transfer file and directory permissions
 <target>Erzeuge Dateiliste...</target>
 <source>Multiple...</source>
 <target>Verschiedene...</target>
-<source>Files that are equal on both sides</source>
-<target>Auf beiden Seiten gleiche Dateien</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Gleiche Dateien/Verzeichnisse mit unterschiedlichen Attributen</target>
-<source>Copy from right to left</source>
-<target>Von rechts nach links kopieren</target>
-<source>Copy from left to right</source>
-<target>Von links nach rechts kopieren</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Nur links existierende Dateien/Verzeichnisse löschen</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Nur rechts existierende Dateien/Verzeichnisse löschen</target>
-<source>Copy from right to left overwriting</source>
-<target>Von rechts nach links kopieren und überschreiben</target>
-<source>Copy from left to right overwriting</source>
-<target>Von links nach rechts kopieren und überschreiben</target>
+<source>Both sides are equal</source>
+<target>Beide Seiten sind gleich</target>
+<source>Files/folders differ in attributes only</source>
+<target>Dateien/Ordner unterscheiden sich nur in Attributen</target>
+<source>Copy new file/folder to left</source>
+<target>Kopiere neue Datei nach links</target>
+<source>Copy new file/folder to right</source>
+<target>Kopiere neue Datei nach rechts</target>
+<source>Delete left file/folder</source>
+<target>Lösche linke Datei</target>
+<source>Delete right file/folder</source>
+<target>Lösche rechte Datei</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Überschreibe linke Datei mit rechter</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Überschreibe rechte Datei mit linker</target>
 <source>Do nothing</source>
 <target>Nichts tun</target>
-<source>Copy attributes only from right to left</source>
-<target>Nur Attribute von rechts nach links kopieren</target>
-<source>Copy attributes only from left to right</source>
-<target>Nur Attribute von links nach rechts kopieren</target>
+<source>Copy file attributes only to left</source>
+<target>Kopiere nur die Dateiattribute nach links</target>
+<source>Copy file attributes only to right</source>
+<target>Kopiere nur die Dateiattribute nach rechts</target>
 <source>Deleting file %x</source>
 <target>Lösche Datei %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1019,6 +1021,8 @@ Transfer file and directory permissions
 <target>Aktualisiere Attribute von %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>Quellverzeichnis existiert nicht mehr:</target>
+<source>Generating database...</source>
+<target>Erzeuge Synchronisationsdatenbank...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Nichts zu synchronisieren gemäß den aktuellen Einstellungen!</target>
 <source>Target directory name must not be empty!</source>
@@ -1043,8 +1047,6 @@ Transfer file and directory permissions
 <target>Es wird ein Verzeichnis verändert werden, das Teil mehrerer Verzeichnispaare ist! Bitte die Synchronisationseinstellungen prüfen!</target>
 <source>Processing folder pair:</source>
 <target>Bearbeite Verzeichnispaar:</target>
-<source>Generating database...</source>
-<target>Erzeuge Synchronisationsdatenbank...</target>
 <source>Error copying locked file %x!</source>
 <target>Fehler beim Kopieren der gesperrten Datei %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/greek.lng b/BUILD/Languages/greek.lng
index 70fbe807..5cd4ca4c 100644
--- a/BUILD/Languages/greek.lng
+++ b/BUILD/Languages/greek.lng
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Αυτοματοποιημένος Συγχρονισμός</target>
 <source>Browse</source>
 <target>Αναζήτηση</target>
+<source>Invalid commandline: "%x"</source>
+<target>Εσφαλμένη εντολή: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Σφάλμα κατά την επίλυση του συμβολικού δεσμού:</target>
+<source>Show popup</source>
+<target>Εμφάνιση αναδυόμενου παράθυρου</target>
+<source>Show popup 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 synchronization settings</source>
 <target>Επιλογή διαφοροποιημένων ρυθμίσεων συγχρονισμού</target>
 <source>No filter selected</source>
@@ -121,14 +135,12 @@
 <target>Πληροφορίες</target>
 <source>Fatal Error</source>
 <target>Σημαντικό Σφάλμα</target>
+<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 writing file:</source>
-<target>Σφάλμα κατά την εγγραφή του αρχείου:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>Μη έγκυρο αρχείο διάταξης του FreeFileSync!</target>
 <source>/sec</source>
 <target>/δευτερόλεπτο</target>
 <source>
@@ -217,8 +229,6 @@ The command line is executed each time:
 <target>Ενεργή παρακολούθηση...</target>
 <source>Waiting for missing directories...</source>
 <target>Αναμονή για τους υποκαταλόγους που απουσιάζουν...</target>
-<source>Command line is empty!</source>
-<target>Η γραμμή εντολών είναι κενή!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Δεν ήταν δυνατό να γίνει έναρξη παρακολούθησης του υποκαταλόγου:</target>
 <source>A directory input field is empty.</source>
@@ -259,12 +269,18 @@ The command line is executed each time:
 <target>Σφάλμα κατά την αντιγραφή του αρχείου:</target>
 <source>Error opening file:</source>
 <target>Σφάλμα κατά το άνοιγμα του αρχείου:</target>
+<source>Error writing file:</source>
+<target>Σφάλμα κατά την εγγραφή του αρχείου:</target>
 <source>Error reading file:</source>
 <target>Σφάλμα κατά την ανάγνωση του αρχείου:</target>
 <source>Endless loop when traversing directory:</source>
 <target>Ατέρμονος βρόχος κατά την την ανάλυση του υποκαταλόγου:</target>
 <source>Error traversing directory:</source>
 <target>Σφάλμα κατά την ανάλυση του υποκαταλόγου:</target>
+<source>Windows Error Code %x:</source>
+<target>Κωδικός Σφάλματος των Windows %x:</target>
+<source>Linux Error Code %x:</source>
+<target>Κωδικός Σφάλματος του Linux %x:</target>
 <source>Error setting privilege:</source>
 <target>Σφάλμα κατά τον ορισμό δικαιωμάτων:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -289,18 +305,6 @@ The command line is executed each time:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>Δεν αναγνώστηκαν τιμές για τους ακόλουθους κόμβους XML:</target>
-<source>Show popup</source>
-<target>Εμφάνιση αναδυόμενου παράθυρου</target>
-<source>Show popup 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>Logging</source>
 <target>Καταγραφή μηνυμάτων</target>
 <source>FreeFileSync batch file</source>
@@ -405,8 +409,8 @@ The command line is executed each time:
 <target>Δεξιά</target>
 <source>Batch job</source>
 <target>Δέσμη ενεργειών</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Δημιουργία ενός αρχείου δέσμης ενεργειών για αυτόματο συγχρονισμό. Για την έναρξη σε λειτουργία δέσμης, δώστε το όνομα του αρχείου στο εκτελέσιμο του FreeFileSync: FreeFileSync.exe <αρχείο δέσμης>. Αυτή η λειτουργία μπορεί να προγραμματιστεί και στο χρονοδιάγραμμα εργασιών του λειτουργικού σας συστήματος.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Για την αυτοματοποίηση του συγχρονισμού δημιουργείστε ένα αρχείο δέσμης ενεργειών. Για να ξεκινήσετε σε κατάσταση λειτουργίας της δέσμης, απλώς κάντε διπλό κλικ στο αρχείο ή γράψτε στη γραμμή εντολών: FreeFileSync.exe <batchfile>. Μπορείτε επίσης το προγραμματίσετε αυτήν την εργασία, χρησιμοποιώντας το χρονοδιάγραμμα εργασιών του λειτουργικού σας συστήματος.</target>
 <source>Help</source>
 <target>Βοήθεια</target>
 <source>Configuration overview:</source>
@@ -473,18 +477,18 @@ The command line is executed each time:
 <target>Κατηγορία</target>
 <source>Action</source>
 <target>Ενέργεια</target>
-<source>Files/folders that exist on left side only</source>
-<target>Αρχεία/υποκατάλογοι που υπάρχουν μόνο στα αριστερά</target>
-<source>Files/folders that exist on right side only</source>
-<target>Αρχεία/υποκατάλογοι που υπάρχουν μόνο στα δεξιά</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Αρχεία που υπάρχουν και στις δυο πλευρές, αριστερά είναι πιο πρόσφατα</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Αρχεία που υπάρχουν και στις δυο πλευρές, δεξιά είναι πιο πρόσφατα</target>
-<source>Files that have different content</source>
-<target>Αρχεία που έχουν διαφορετικό περιεχόμενο</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Διενέξεις/αρχεία που δεν μπορούν να κατηγοριοποιηθούν</target>
+<source>File/folder exists on left side only</source>
+<target>Το αρχείο / ο υποκατάλογος υπάρχει μόνο στην αριστερή πλευρά</target>
+<source>File/folder exists on right side only</source>
+<target>Το αρχείο / ο υποκατάλογος υπάρχει μόνο στη δεξιά πλευρά</target>
+<source>Left file is newer</source>
+<target>Το αρχείο στα αριστερά είναι πιο πρόσφατο</target>
+<source>Right file is newer</source>
+<target>Το αρχείο στα δεξιά είναι πιο πρόσφατο</target>
+<source>Files have different content</source>
+<target>Τα αρχεία έχουν διαφορετικό περιεχόμενο</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Η διένεξη / το αρχείο δεν μπορεί να κατηγοριοποιηθεί</target>
 <source>Compare by...</source>
 <target>Σύγκριση με βάση το...</target>
 <source>
@@ -539,8 +543,8 @@ is the same
 <target>- υπάρχει μόνο στα αριστερά</target>
 <source>- exists right only</source>
 <target>- υπάρχει μόνο στα δεξιά</target>
-<source>- conflict</source>
-<target>- διένεξη</target>
+<source>- conflict (same date, different size)</source>
+<target>- διένεξη (ίδια ημερομηνία, διαφορετικό μέγεθος)</target>
 <source>Compare by "File content"</source>
 <target>Σύγκριση με βάση το "Περιεχόμενο αρχείων"</target>
 <source>
@@ -707,10 +711,8 @@ Transfer file and directory permissions
 <target><πολλαπλή επιλογή></target>
 <source>D-Click</source>
 <target>Διπλό κλικ</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Αντιγραφή στο πρόχειρο	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Διαγραφή αρχείων	DEL</target>
+<source>Delete</source>
+<target>Διαγραφή</target>
 <source>Customize...</source>
 <target>Προσαρμογή...</target>
 <source>Auto-adjust columns</source>
@@ -853,14 +855,10 @@ Transfer file and directory permissions
 <target>Το αρχείο υπάρχει και στις δυο πλευρές</target>
 <source>on one side only</source>
 <target>το αρχείο υπάρχει μόνο στη μια πλευρά</target>
-<source>- left</source>
-<target>- αριστερά</target>
-<source>- right</source>
-<target>- δεξιά</target>
-<source>different</source>
-<target>διαφορετικά</target>
-<source>- conflict (same date, different size)</source>
-<target>- διένεξη (ίδια ημερομηνία, διαφορετικό μέγεθος)</target>
+<source>same date</source>
+<target>ίδια ημερομηνία</target>
+<source>different date</source>
+<target>διαφορετική ημερομηνία</target>
 <source>Inactive</source>
 <target>Ανενεργό</target>
 <source>Second</source>
@@ -971,28 +969,28 @@ Transfer file and directory permissions
 <target>Δημιουργία καταλόγου αρχείων...</target>
 <source>Multiple...</source>
 <target>Πολλαπλές ρυθμίσεις...</target>
-<source>Files that are equal on both sides</source>
-<target>Αρχεία ίδια και στις δυο πλευρές</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Ίδια αρχεία/υποκατάλογοι που διαφέρουν μόνο στα χαρακτηριστικά αρχείου</target>
-<source>Copy from right to left</source>
-<target>Αντιγραφή από τα δεξιά προς τα αριστερά</target>
-<source>Copy from left to right</source>
-<target>Αντιγραφή από τα αριστερά προς τα δεξιά</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Διαγραφή των αρχείων/υποκαταλόγων που υπάρχουν μόνο στα αριστερά</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Διαγραφή των αρχείων/υποκαταλόγων που υπάρχουν μόνο στα δεξιά</target>
-<source>Copy from right to left overwriting</source>
-<target>Αντιγραφή από τα δεξιά προς τα αριστερά με αντικατάσταση</target>
-<source>Copy from left to right overwriting</source>
-<target>Αντιγραφή από τα αριστερά προς τα δεξιά με αντικατάσταση</target>
+<source>Both sides are equal</source>
+<target>Οι δυο πλευρές είναι ίδιες</target>
+<source>Files/folders differ in attributes only</source>
+<target>Τα αρχεία / οι υποκατάλογοι διαφέρουν μόνο στα χαρακτηριστικά τους</target>
+<source>Copy new file/folder to left</source>
+<target>Αντιγραφή του νέου αρχείου/υποκαταλόγου στα αριστερά</target>
+<source>Copy new file/folder to right</source>
+<target>Αντιγραφή του νέου αρχείου/υποκαταλόγου στα δεξιά</target>
+<source>Delete left file/folder</source>
+<target>Διαγραφή του αρχείου/υποκαταλόγου στα αριστερά</target>
+<source>Delete right file/folder</source>
+<target>Διαγραφή του αρχείου/υποκαταλόγου στα δεξιά</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Αντικατάσταση του αρχείου/υποκαταλόγου στα αριστερά από το(ν) αντίστοιχο στα δεξιά</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Αντικατάσταση του αρχείου/υποκαταλόγου στα δεξιά από το(ν) αντίστοιχο στα αριστερά</target>
 <source>Do nothing</source>
 <target>Καμία ενέργεια</target>
-<source>Copy attributes only from right to left</source>
-<target>Αντιγραφή των χαρακτηριστικών αρχείου μόνο από τα δεξιά προς τα αριστερά</target>
-<source>Copy attributes only from left to right</source>
-<target>Αντιγραφή των χαρακτηριστικών αρχείου μόνο από τα αριστερά προς τα δεξιά</target>
+<source>Copy file attributes only to left</source>
+<target>Αντιγραφή μόνο των χαρακτηριστικών του αρχείου στα αριστερά</target>
+<source>Copy file attributes only to right</source>
+<target>Αντιγραφή μόνο των χαρακτηριστικών του αρχείου στα δεξιά</target>
 <source>Deleting file %x</source>
 <target>Διαγραφή του αρχείου %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1023,6 +1021,8 @@ Transfer file and directory permissions
 <target>Ενημέρωση των χαρακτηριστικών αρχείου του %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>Ο υποκατάλογος προέλευσης δεν υπάρχει πλέον:</target>
+<source>Generating database...</source>
+<target>Δημιουργία βάσης δεδομένων...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Τίποτα προς συγχρονισμό με βάση τη διάταξη!</target>
 <source>Target directory name must not be empty!</source>
@@ -1047,8 +1047,6 @@ Transfer file and directory permissions
 <target>Θα τροποποιηθεί ένας υποκατάλογος που ανήκει σε πολλαπλά ζεύγη υποκαταλόγων! Παρακαλώ αναθεωρείστε τις ρυθμίσεις συγχρονισμού.</target>
 <source>Processing folder pair:</source>
 <target>Σύγκριση του ζεύγους υποκαταλόγων:</target>
-<source>Generating database...</source>
-<target>Δημιουργία βάσης δεδομένων...</target>
 <source>Error copying locked file %x!</source>
 <target>Σφάλμα κατά την αντιγραφή του κλειδωμένου αρχείου %x !</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/hebrew.lng b/BUILD/Languages/hebrew.lng
new file mode 100644
index 00000000..22de79f5
--- /dev/null
+++ b/BUILD/Languages/hebrew.lng
@@ -0,0 +1,1053 @@
+<header>
+	<language name>עברית</language name>
+	<translator>nitnit</translator>
+	<locale>he_IL</locale>
+	<flag file>isreal.png</flag file>
+	<plural forms>2</plural forms>
+	<plural definition>n == 1 ? 0 : 1</plural definition>
+</header>
+
+<source>Show in Explorer</source>
+<target>הראה בסייר הקבצים</target>
+<source>Open with default application</source>
+<target>פתח באמצאות האפליקציה המתאימה</target>
+<source>Browse directory</source>
+<target>עיין במחיצה</target>
+<source>RealtimeSync - Automated Synchronization</source>
+<target>RealtimeSync - סינכרון  אוטומטי</target>
+<source>Browse</source>
+<target>עיין</target>
+<source>Invalid commandline: "%x"</source>
+<target>שורת פקודות שגויה: "%x"</target>
+<source>Error resolving symbolic link:</source>
+<target>שגיאה בפענוח קישור סימבולי (Symbolic Link)</target>
+<source>Show popup</source>
+<target>הראה חלונות קופצים</target>
+<source>Show popup 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 synchronization settings</source>
+<target>בחר הגדרות סנכרון אלטרנטיביות</target>
+<source>No filter selected</source>
+<target>לא נבחר מסנן פעיל</target>
+<source>Filter is active</source>
+<target>מסנן פעיל</target>
+<source>Clear filter settings</source>
+<target>נקה בחירת מסנן</target>
+<source>Remove alternate settings</source>
+<target>הסר הגדרות תצורה אלטרנטיבית</target>
+<source>Create a batch job</source>
+<target>יוצר עבודת אצווה</target>
+<source>Synchronization settings</source>
+<target>הגדרות סנכרון</target>
+<source>Comparison settings</source>
+<target>הגדרות השוואה</target>
+<source>About</source>
+<target>אודות</target>
+<source>Error</source>
+<target>שגיאה</target>
+<source>Warning</source>
+<target>אזהרה</target>
+<source>Question</source>
+<target>שאלה</target>
+<source>Confirm</source>
+<target>אשר</target>
+<source>Configure filter</source>
+<target>תצורת מסנן</target>
+<source>Customize columns</source>
+<target>סדר עמודות</target>
+<source>Global settings</source>
+<target>משתנים גלובליים</target>
+<source>Synchronization Preview</source>
+<target>תצוגה מקדימה של סנכרון</target>
+<source>Find</source>
+<target>חפש</target>
+<source>%x MB</source>
+<target>%x מגה בייט</target>
+<source>%x KB</source>
+<target>%x קילו בייט</target>
+<source>%x GB</source>
+<target>%x גיגה בייט</target>
+<source>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
+</source>
+<target>
+<pluralform>1 בייט</pluralform>
+<pluralform>%x בייט</pluralform>
+</target>
+<source><Symlink></source>
+<target><קשור סימבולי></target>
+<source><Directory></source>
+<target><מחיצה></target>
+<source>Size</source>
+<target>גודל</target>
+<source>Date</source>
+<target>תארין</target>
+<source>Full path</source>
+<target>נתיב מלא</target>
+<source>Filename</source>
+<target>שם קובץ</target>
+<source>Relative path</source>
+<target>נתיב יחסי</target>
+<source>Directory</source>
+<target>מחיצה</target>
+<source>Extension</source>
+<target>סיומת</target>
+<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>One of the FreeFileSync database entries within the following file is not yet existing:</source>
+<target>אחת מהכניסות בבסיס הנתונים בקובץ הבא עדיין לא קיימת</target>
+<source>Error reading from synchronization database:</source>
+<target>שגיאה בקריאה מבסיס הנתונים של הסנכרון:</target>
+<source>An exception occurred!</source>
+<target>אירוע חריג!</target>
+<source>Error deleting file:</source>
+<target>שגיאה במחיקת קובץ:</target>
+<source>Error reading file attributes:</source>
+<target>שגיאה בקריאת תכונות קובץ:</target>
+<source>Waiting while directory is locked (%x)...</source>
+<target>ממתין כאשר  מחיצה נעולה (%x)...</target>
+<source>Error setting directory lock:</source>
+<target>שגיאה בנעילת מחיצה:</target>
+<source>
+<pluralform>1 sec</pluralform>
+<pluralform>%x sec</pluralform>
+</source>
+<target>
+<pluralform>1 שנייה</pluralform>
+<pluralform>%x שניות</pluralform>
+</target>
+<source>Info</source>
+<target>מידע</target>
+<source>Fatal Error</source>
+<target>שגיאה פטלית</target>
+<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>/sec</source>
+<target>/שנ</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>S&ave configuration...</source>
+<target>&שמור תצורה...</target>
+<source>&Load configuration...</source>
+<target>&טען תצורה...</target>
+<source>&Quit</source>
+<target>&יציאה</target>
+<source>&File</source>
+<target>&קובץ</target>
+<source>&Content</source>
+<target>&תוכן</target>
+<source>&About...</source>
+<target>&אודות...</target>
+<source>&Help</source>
+<target>&עזרה</target>
+<source>Usage:</source>
+<target>שימוש:</target>
+<source>1. Select directories to monitor.</source>
+<target>1. בחר מחיצות לניטור.</target>
+<source>2. Enter a command line.</source>
+<target>2. הקש שורת פקודות.</target>
+<source>3. Press 'Start'.</source>
+<target>3. לחץ 'הפעל'.</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>
+שורת הפקודה מבוצעת בכל פעם כאשר:
+- כל המחיצות הופכות זמינות (לדוגמה חיבור זכרון נתיק)
+- קבצים במחיצות אלו משתנים
+</target>
+<source>Directories to watch</source>
+<target>מחיצות לניטור</target>
+<source>Add folder</source>
+<target>הוסף מחיצה</target>
+<source>Remove folder</source>
+<target>הסר מחיצה</target>
+<source>Select a folder</source>
+<target>בחר מחיצה</target>
+<source>Command line</source>
+<target>שורת פקודות</target>
+<source>Minimum Idle Time [seconds]</source>
+<target>זמן מנוחה מינימלי [שניות]</target>
+<source>Idle time between detection of last change and execution of command line in seconds</source>
+<target>זמן מנוחה מגילוי שינוי אחרון עד לביצוע שורת פקודה בשניות</target>
+<source>Start</source>
+<target>התחל</target>
+<source>(Build: %x)</source>
+<target>(מבנה: %x)</target>
+<source>RealtimeSync configuration</source>
+<target>RealtimeSync בקרת תצורה</target>
+<source>File already exists. Overwrite?</source>
+<target>קובץ קיים האם לדרוס?</target>
+<source>&Restore</source>
+<target>&טען מחדש</target>
+<source>&Exit</source>
+<target>&יציאה</target>
+<source>Monitoring active...</source>
+<target>נטר ארכיב...</target>
+<source>Waiting for missing directories...</source>
+<target>מחכה למחיצות חסרות...</target>
+<source>Could not initialize directory monitoring:</source>
+<target>לא יכול לאתחל ניטור מחיצה:</target>
+<source>A directory input field is empty.</source>
+<target>שדה כניסת מחיצה ריק.</target>
+<source>Error when monitoring directories.</source>
+<target>שגיאה בזמן ניטור מחיצות.</target>
+<source>Drag && drop</source>
+<target>גרור והשלך</target>
+<source>Conversion error:</source>
+<target>שגיאה בהסבה:</target>
+<source>Error moving file:</source>
+<target>שגיאה בהעברת קובץ:</target>
+<source>Operation aborted!</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>Endless loop when traversing directory:</source>
+<target>נוצרת לולאה אינסופית בחצית מחיצות</target>
+<source>Error traversing directory:</source>
+<target>שגיאה בהצלבת מחיצות</target>
+<source>Windows Error Code %x:</source>
+<target>קוד שגיאת חלונות %x:</target>
+<source>Linux Error Code %x:</source>
+<target>קוד שגיאת לינוקס %x:</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 starting 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>Could not read values for the following XML nodes:</source>
+<target>XML לא יכול לקרא ערכים מצמתי :</target>
+<source>Logging</source>
+<target>רישום ביומן</target>
+<source>FreeFileSync batch file</source>
+<target>FreeFileSync קובץ אצווה</target>
+<source>FreeFileSync configuration</source>
+<target>FreeFileSync הגדרות</target>
+<source>FreeFileSync Batch Job</source>
+<target>FreeFileSync עבודת אצווה</target>
+<source>Unable to create logfile!</source>
+<target>לא מסוגל ליצור יומן!</target>
+<source>Batch execution</source>
+<target>פעולת אצווה</target>
+<source>Log-messages:</source>
+<target>הודעת יומן:</target>
+<source>Stop</source>
+<target>עצור</target>
+<source>Total time:</source>
+<target>זמן כולל:</target>
+<source>Synchronization aborted!</source>
+<target>סינכרון בוטל!</target>
+<source>Synchronization completed with errors!</source>
+<target>סנכרון הושלם עם שגיאות!</target>
+<source>Synchronization completed successfully!</source>
+<target>סינכרון הושלם בהצלחה!</target>
+<source>Press "Switch" to open FreeFileSync GUI mode.</source>
+<target>"לחץ" לפתיחת FreeFileSync בממשק גרפי.</target>
+<source>Switching to FreeFileSync GUI mode...</source>
+<target>החלף לתצורת ממשק חזותי...</target>
+<source>Unable to connect to sourceforge.net!</source>
+<target>אין תקשורת ל sourceforge.net!</target>
+<source>A newer version of FreeFileSync is available:</source>
+<target>קיימת גירסה חדשה יותר:</target>
+<source>Download now?</source>
+<target>הורד עכשיו?</target>
+<source>Information</source>
+<target>מידע</target>
+<source>FreeFileSync is up to date!</source>
+<target>FreeFileSync מעודכן לגירסה האחרונה!</target>
+<source>Do you want FreeFileSync to automatically check for updates every week?</source>
+<target>האם ברצונך שהתוכנה תבדוק לעדכון בכל שבוע?</target>
+<source>(Requires an Internet connection!)</source>
+<target>(מחייב קישור אינטרנטי פעיל!)</target>
+<source>1. &Compare</source>
+<target>1. &השווה</target>
+<source>2. &Synchronize...</source>
+<target>2. &סנכרן...</target>
+<source>S&witch view</source>
+<target>החל&ף תצוגה</target>
+<source>&New</source>
+<target>&חדש</target>
+<source>&Program</source>
+<target>&תוכנה</target>
+<source>&Language</source>
+<target>&שפה</target>
+<source>&Global settings...</source>
+<target>&משתנים גלובליים...</target>
+<source>&Create batch job...</source>
+<target>&צור קובץ אצווה...</target>
+<source>&Export file list...</source>
+<target>&יצא רשימת קבצים...</target>
+<source>&Advanced</source>
+<target>&מתקדם</target>
+<source>&Check for new version</source>
+<target>&בדוק לגירסא חדשה</target>
+<source>Compare</source>
+<target>השוואה</target>
+<source>Compare both sides</source>
+<target>השווה בין שני הצדדים</target>
+<source>&Abort</source>
+<target>&נטוש</target>
+<source>Synchronize...</source>
+<target>...סנכרן</target>
+<source>Start synchronization</source>
+<target>התחל סנכרון</target>
+<source>Swap sides</source>
+<target>החלף צדדים</target>
+<source>Add folder pair</source>
+<target>הוסף זוג מחיצות</target>
+<source>Remove folder pair</source>
+<target>הסר זוג מחיצות</target>
+<source>Save current configuration to file</source>
+<target>שמור תצורה נוכחית לקובץ</target>
+<source>Load configuration from file</source>
+<target>טען קונפיגורציה מקובץ</target>
+<source>Last used configurations (press DEL to remove from list)</source>
+<target>תצורות אחרונות שהיו בשמוש (לחץ DEL להסרה מהרשימה)</target>
+<source>Hide excluded items</source>
+<target>החבא פריטים נשללים</target>
+<source>Hide filtered or temporarily excluded files</source>
+<target>החבא קבצים מסוננים או נשללים</target>
+<source>Number of files and directories that will be created</source>
+<target>מספר התקיות והקבצים אשר עומדים להיוצר</target>
+<source>Number of files that will be overwritten</source>
+<target>מספר הקבצים העומדים להיכתב מחדש</target>
+<source>Number of files and directories that will be deleted</source>
+<target>מספר הקבצים והתיקיות העומדים להימחק</target>
+<source>Total amount of data that will be transferred</source>
+<target>סך הכל נתונים להעברה</target>
+<source>Left</source>
+<target>שמאל</target>
+<source>Right</source>
+<target>ימין</target>
+<source>Batch job</source>
+<target>עבודת אצווה</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>יצור קובץ אצווה לסנכרון אוטומטי. להפעלה באצווה העבר את שם הקובץ כפרמטר לתוכנה FreeFileSync.exe <batchfile>. אפשר גם להשתמש במנהל המשימות המתוזמנות של המערכת.</target>
+<source>Help</source>
+<target>עזרה</target>
+<source>Configuration overview:</source>
+<target>סקירת תצורה:</target>
+<source>Filter files</source>
+<target>קבצי המסנן</target>
+<source>Status feedback</source>
+<target>משוב מצב</target>
+<source>Silent mode</source>
+<target>אופן פעולה שקט</target>
+<source>Start minimized and write status information to a logfile</source>
+<target>הפעל במצב ממוזער ורשום מצב לקובץ יומן</target>
+<source>Error handling</source>
+<target>טיפול בשגיאות</target>
+<source>Overview</source>
+<target>מבט כללי</target>
+<source>Select logfile directory:</source>
+<target>בחר מחיצה לקבצי יומן</target>
+<source>Maximum number of logfiles:</source>
+<target>מספר מכסימלי של קבצי יומן</target>
+<source>&Save</source>
+<target>&שמירה</target>
+<source>&Load</source>
+<target>&טען</target>
+<source>&Cancel</source>
+<target>&בטל</target>
+<source>Elements found:</source>
+<target>אלמנטים נמצאו:</target>
+<source>Elements remaining:</source>
+<target>אלמנתים נותרו:</target>
+<source>Speed:</source>
+<target>מהירות:</target>
+<source>Time remaining:</source>
+<target>זמן נותר:</target>
+<source>Time elapsed:</source>
+<target>זמן עבר:</target>
+<source>Operation:</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>Mirror ->></source>
+<target><<- מראה</target>
+<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
+<target>גיבוי מראה של מחיצה שמאלית. מחיצה ימנית תהיה זהה לשמאלית לאחר הסינכרון.</target>
+<source>Update -></source>
+<target><- שדרג</target>
+<source>Copy new or updated files to right folder.</source>
+<target>העתק קבצים חדשים או מעודכנים למחיצה הימנית.</target>
+<source>Custom</source>
+<target>מותאם</target>
+<source>Configure your own synchronization rules.</source>
+<target>סדר את כללי הסנכרון שלך.</target>
+<source>Deletion handling</source>
+<target>טיפול במחיקות</target>
+<source>&OK</source>
+<target>&אשר</target>
+<source>Configuration</source>
+<target>תצורה</target>
+<source>Category</source>
+<target>קטגוריה</target>
+<source>Action</source>
+<target>פעולה</target>
+<source>File/folder exists on left side only</source>
+<target>קובץ\מחיצה קיים בצד שמאל בלבד</target>
+<source>File/folder exists on right side only</source>
+<target>קובץ\מחיצה קיים בצד ימין בלבד</target>
+<source>Left file is newer</source>
+<target>צד שמאל חדש יותר</target>
+<source>Right file is newer</source>
+<target>צד ימין חדש יותר</target>
+<source>Files have different content</source>
+<target>הקבצים בעלי תכולה שונה</target>
+<source>Conflict/file cannot be categorized</source>
+<target>קונפליקט\קובץ אינו יכול לקבל סיווג</target>
+<source>Compare by...</source>
+<target>השווה ע"י...</target>
+<source>
+Files are found equal if
+     - file size
+     - last write time and date
+are the same
+</source>
+<target>
+קבצים מוגדרים כזהים אם
+     - גודל הקובץ
+     - זמן ותאריך שמירה אחרונים
+הם זהים
+</target>
+<source>File size and date</source>
+<target>גודל קובץ ותאריך</target>
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+קבצים מוגדרים כזהים אם
+     - תכולת הקובץ
+היא זהה
+</target>
+<source>File content</source>
+<target>תכולת הקובץ</target>
+<source>Symbolic Link handling</source>
+<target>טיפול בקישור סימבולי</target>
+<source>Synchronizing...</source>
+<target>מסנכרן...</target>
+<source>Elements processed:</source>
+<target>אלמנטים עובדו:</target>
+<source>&Pause</source>
+<target>&עצור</target>
+<source>Compare by "File size and date"</source>
+<target>"File size and date" השווה ע"י גודל הקובץ ותאריך</target>
+<source>This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.</source>
+<target>הוריאציה הזאת מעריכה את 2 הקבצים במידה שווה כאשר שמם זהה ויש להם גודל זהה ותאריך הרישום האחרון זהה</target>
+<source>When the comparison is started with this option set the following decision tree is processed:</source>
+<target>כאשר ההשוואה מתחילה בעזרת הבחירות הנבחרות עץ ההחלטות הבא מתבצע:</target>
+<source>As a result the files are separated into the following categories:</source>
+<target>כתוצאה הקבצים סווגו לפי הקטגוריות הבאות:</target>
+<source>- equal</source>
+<target>- שווה</target>
+<source>- left newer</source>
+<target>- שמאלי חדש יותר</target>
+<source>- right newer</source>
+<target>- ימני חדש יותר</target>
+<source>- exists left only</source>
+<target>- נמצא משמאל בלבד</target>
+<source>- exists right only</source>
+<target>- נמצא מימין בלבד</target>
+<source>- conflict (same date, different size)</source>
+<target>- תאריך זהה - גודל שונה) קונפליקט)</target>
+<source>Compare by "File content"</source>
+<target>"File content" השווה ע"י תכולת הקובץ</target>
+<source>
+As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.
+
+With this option enabled the decision tree is smaller:
+</source>
+<target>
+כמשתמע, שני קבצים החולקים שם זהה מסומנים כזהים אם ורק אם הם בעלי תכולה זהה. פעולה זו שימושית לבדיקת עקביות יותר מאשר לעולות גיבוי. לכן תגי הזמן אינם משמשים כלל לצורך הבדיקה.
+
+כאשר אפשרות זו פעילה עץ ההחלטות הוא קטן יותר:
+</target>
+<source>- different</source>
+<target>- שונה</target>
+<source>Source code written in C++ utilizing:</source>
+<target>קוד מקור נכתב ב- C++ באמצעות:</target>
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>תודות עבור עבודות התרגום של תוכנת הסנכרון:</target>
+<source>Feedback and suggestions are welcome at:</source>
+<target>תגובות והצעות ותקבלו בברכה:</target>
+<source>FreeFileSync at Sourceforge</source>
+<target>FreeFileSync ב Sourceforge</target>
+<source>Homepage</source>
+<target>אתר-הבית:</target>
+<source>If you like FFS</source>
+<target>במידה ו-FFS מוצאת חן בעינכם</target>
+<source>Donate with PayPal</source>
+<target>תרום עם פייפל</target>
+<source>Email</source>
+<target>דוא"ל:</target>
+<source>Report translation error</source>
+<target>דווח שגיאת תרגום:</target>
+<source>Published under the GNU General Public License:</source>
+<target>מפורסם במסגרת GNU General Public License:</target>
+<source>Ignore subsequent errors</source>
+<target>התעלם משגיאות נישנות</target>
+<source>Hide further error messages during the current process</source>
+<target>הסתר הודעות שגיאה נוספות בהמשך התהליך הנוכחי</target>
+<source>&Ignore</source>
+<target>&התעלם</target>
+<source>&Retry</source>
+<target>&נסה שנית</target>
+<source>Do not show this dialog again</source>
+<target>אל תראה מסך זה שנית</target>
+<source>&Switch</source>
+<target>&החלפה</target>
+<source>&Yes</source>
+<target>&כן</target>
+<source>&No</source>
+<target>&לא</target>
+<source>Delete on both sides</source>
+<target>מחק בשני הצדדים</target>
+<source>Delete on both sides even if the file is selected on one side only</source>
+<target>מחק בשני הצדדים אף אם הקובץ נבחר בצד אחד בלבד</target>
+<source>Use Recycle Bin</source>
+<target>השתמש בסל המיחזור</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>
+רק קבצים\מחיצות המתאימים לכל הגדרות המסנן יסומנו לסינכרון.
+הערה: השם לסינון חייב להיות מוגדר באוםן יחסי (!) למחיצות הראשיות לסינכרון.
+</target>
+<source>Hints:</source>
+<target>טיפים:</target>
+<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
+<target>1. הכנס שם קובץ או שם תיקיה מופרדים ע"י ';' או דורה חדשה</target>
+<source>2. Use wildcard characters '*' and '?'.</source>
+<target>2. השתמש באשפים '*' או '?'לבחירה מרובה.</target>
+<source>3. Exclude files directly on main grid via context menu.</source>
+<target>3. הוצא קבצים היישר באסכלה עיקרית דרך תפריט הקשר.</target>
+<source>Example</source>
+<target>דוגמה</target>
+<source>
+Include: *.doc;*.zip;*.exe
+Exclude: \stuff\temp\*
+</source>
+<target>
+כלול: *.doc;*.zip;*.exe
+אל תכלול: \stuff\temp\*
+</target>
+<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
+<target>סנכרן .doc, .zip und .exe כל הקבצים בתיקית משנה "temp".</target>
+<source>Include</source>
+<target>כלול</target>
+<source>Exclude</source>
+<target>אל תכלול</target>
+<source>Select time span:</source>
+<target>סמן טווח זמן</target>
+<source>Minimum file size:</source>
+<target>גודל קובץ מינימלי</target>
+<source>Maximum file size:</source>
+<target>גודל קובץ מכסימלי</target>
+<source>&Default</source>
+<target>&ברירת מחדל</target>
+<source>Move column up</source>
+<target>העלה עמודה</target>
+<source>Move column down</source>
+<target>הורד עמודה</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 filesystem permissions</source>
+<target>העתק הרשאות של מערכת הקבצים</target>
+<source>
+Transfer file and directory permissions
+(Requires Administrator rights)
+</source>
+<target>
+העבר הרשאות קבצים ומחיצות
+(דורש הרשאות מנהל מערכת)
+</target>
+<source>Hidden dialogs:</source>
+<target>דיאלוגים מוסתרים:</target>
+<source>Reset</source>
+<target>אפס</target>
+<source>Show hidden dialogs</source>
+<target>הראה דיאלוגים נסתרים</target>
+<source>External applications</source>
+<target>תוכנה חיצונית</target>
+<source>Description</source>
+<target>תאור</target>
+<source>Variant</source>
+<target>משתנה</target>
+<source>Statistics</source>
+<target>סטטיסטיקה</target>
+<source>Find what:</source>
+<target>חפש מה:</target>
+<source>Match case</source>
+<target>התאם רישיות</target>
+<source>&Find next</source>
+<target>&מצא הבא</target>
+<source>You may try to synchronize remaining items again (WITHOUT having to re-compare)!</source>
+<target>!באפשרותך לנסות לסנכרן את העצמים הנותרים מבלי להשוות מחדש</target>
+<source>Batch file created successfully!</source>
+<target>קובץ אצווה נוצר בהצלחה!</target>
+<source>Main bar</source>
+<target>סרגל ראשי</target>
+<source>Folder pairs</source>
+<target>זוגות מחיצות</target>
+<source>Select view</source>
+<target>בחר תצוגה</target>
+<source>Folder Comparison and Synchronization</source>
+<target>סנכרון קבצים ומחיצות</target>
+<source>Recycle Bin not yet supported for this system!</source>
+<target>סל המחזור לא נתמך כרגע במערכת הפעלה זו!</target>
+<source>Set direction:</source>
+<target>בחר כוון:</target>
+<source>Exclude temporarily</source>
+<target>אל תכלול זמנית</target>
+<source>Include temporarily</source>
+<target>כלול זמנית</target>
+<source>Exclude via filter:</source>
+<target>אל תכלול בעזרת סנן:</target>
+<source><multiple selection></source>
+<target><בחירה מרובה></target>
+<source>D-Click</source>
+<target>לחיצה-כפולה</target>
+<source>Delete</source>
+<target>מחק</target>
+<source>Customize...</source>
+<target>מותאם אישית...</target>
+<source>Auto-adjust columns</source>
+<target>עימוד אוטומטי</target>
+<source>Include all rows</source>
+<target>כלול את כל השורות</target>
+<source>Exclude all rows</source>
+<target>אל תכלול את כל השורות</target>
+<source>Reset view</source>
+<target>אפס תצוגה</target>
+<source>Show "%x"</source>
+<target>הראה "%x"</target>
+<source><Last session></source>
+<target><פעילות אחרונה></target>
+<source>Configuration saved!</source>
+<target>תצורה נשמרה!</target>
+<source>Save changes to current configuration?</source>
+<target>שמור שינויים לתצורה נוכחית?</target>
+<source>Configuration loaded!</source>
+<target>תצורה הוטענה!</target>
+<source>Hide files that exist on left side only</source>
+<target>הסתר קבצים הקימים אך ורק בצד שמאל</target>
+<source>Show files that exist on left side only</source>
+<target>הראה קבצים הנמצאים אך ורק בצד שמאל</target>
+<source>Hide files that exist on right side only</source>
+<target>הסתר קבצים הקימים אך ורק בצד ימין</target>
+<source>Show files that exist on right side only</source>
+<target>הראה קבצים הנמצאים אך ורק בצד ימין</target>
+<source>Hide files that are newer on left</source>
+<target>הסתר קבצים חדשים יותר בצד שמאל</target>
+<source>Show files that are newer on left</source>
+<target>הראה קבצים חדשים יותר בצד שמאל</target>
+<source>Hide files that are newer on right</source>
+<target>הסתר קבצים חדשים יותר בצד ימין</target>
+<source>Show files that are newer on right</source>
+<target>הראה קבצים חדשים יותר בצד ימין</target>
+<source>Hide files that are equal</source>
+<target>הסתר קבצים שאינם שווים</target>
+<source>Show files that are equal</source>
+<target>הראה קבצים שווים</target>
+<source>Hide files that are different</source>
+<target>הסתר קבצים שונים</target>
+<source>Show files that are different</source>
+<target>הראה קבצים שונים</target>
+<source>Hide conflicts</source>
+<target>הסתר קונפליקטים</target>
+<source>Show conflicts</source>
+<target>הראה קונפליקטים</target>
+<source>Hide files that will be created on the left side</source>
+<target>הסתר קבצים שייוצרו בצד שמאל</target>
+<source>Show files that will be created on the left side</source>
+<target>הראה קבצים שיווצרו בצד שמאל</target>
+<source>Hide files that will be created on the right side</source>
+<target>הסתר קבצים שייוצרו בצד ימין</target>
+<source>Show files that will be created on the right side</source>
+<target>הראה קבצים שיווצרו בצד ימין</target>
+<source>Hide files that will be deleted on the left side</source>
+<target>הסתר קבצים שימחקו בצד שמאל</target>
+<source>Show files that will be deleted on the left side</source>
+<target>הראה קבצים שימחקו בצד שמאל</target>
+<source>Hide files that will be deleted on the right side</source>
+<target>הסתר קבצים שימחקו בצד ימין</target>
+<source>Show files that will be deleted on the right side</source>
+<target>הראה קבצים שימחקו בצד ימין</target>
+<source>Hide files that will be overwritten on left side</source>
+<target>הסתר קבצים שידרסו בצד שמאל</target>
+<source>Show files that will be overwritten on left side</source>
+<target>הראה קבצים שידרסו בצד שמאל</target>
+<source>Hide files that will be overwritten on right side</source>
+<target>הסתר קבצים שידרסו בצד ימין</target>
+<source>Show files that will be overwritten on right side</source>
+<target>הראה קבצים שידרסו בצד ימין</target>
+<source>Hide files that won't be copied</source>
+<target>הסתר קבצים אשר לא יועתקו</target>
+<source>Show files that won't be copied</source>
+<target>הראה קבצים שלא יועתקו</target>
+<source>All directories in sync!</source>
+<target>כל המחיצות מסונכרנות!</target>
+<source>Please run a Compare first before synchronizing!</source>
+<target>הרץ השוואה לפני סנכרון!</target>
+<source>Comma separated list</source>
+<target>רשימה מופרדת פסיקים</target>
+<source>Legend</source>
+<target>מקרא</target>
+<source>File list exported!</source>
+<target>רשימת קבצים יוצאה!</target>
+<source>
+<pluralform>Object deleted successfully!</pluralform>
+<pluralform>%x objects deleted successfully!</pluralform>
+</source>
+<target>
+<pluralform>העצם נמחק בהצלחה!</pluralform>
+<pluralform>%x עצמים נמחקו בהצלחה!</pluralform>
+</target>
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 מחיצה</pluralform>
+<pluralform>%x מחיצות</pluralform>
+</target>
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 קובץ</pluralform>
+<pluralform>%x קבצים</pluralform>
+</target>
+<source>
+<pluralform>%x of 1 row in view</pluralform>
+<pluralform>%x of %y rows in view</pluralform>
+</source>
+<target>
+<pluralform>%x מתוך 1 שורה בתצוגה</pluralform>
+<pluralform>%x מתוך %y שורות בתצוגה</pluralform>
+</target>
+<source>Scanning...</source>
+<target>סורק...</target>
+<source>Comparing content...</source>
+<target>משווה תכולה...</target>
+<source>Paused</source>
+<target>עצור</target>
+<source>Aborted</source>
+<target>הופסק</target>
+<source>Completed</source>
+<target>הושלם</target>
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>התקבלה בקשת ביטול: מחכה לפעולה הנוכחית להסתיים...</target>
+<source>Continue</source>
+<target>המשך</target>
+<source>Pause</source>
+<target>עצור</target>
+<source>Cannot find %x</source>
+<target>לא מוצא %x</target>
+<source>DECISION TREE</source>
+<target>עץ-החלטה</target>
+<source>file exists on both sides</source>
+<target>קובץ נמצא בשני הצדדים</target>
+<source>on one side only</source>
+<target>בצד אחד בלבד</target>
+<source>same date</source>
+<target>תאריך זהה</target>
+<source>different date</source>
+<target>תאריך שונה</target>
+<source>Inactive</source>
+<target>בלתי פעיל</target>
+<source>Second</source>
+<target>שנייה</target>
+<source>Minute</source>
+<target>דקה</target>
+<source>Hour</source>
+<target>שעה</target>
+<source>Day</source>
+<target>יממה</target>
+<source>Byte</source>
+<target>בייט</target>
+<source>KB</source>
+<target>קילו-בייט</target>
+<source>MB</source>
+<target>מגה-בייט</target>
+<source>Filter: All pairs</source>
+<target>כל הזוגות :מסונן</target>
+<source>Filter: Single pair</source>
+<target>זוג אחד :מסונן</target>
+<source>Ignore</source>
+<target>התעלם</target>
+<source>Direct</source>
+<target>כוון</target>
+<source>Follow</source>
+<target>עקוב</target>
+<source>Integrate external applications into context menu. The following macros are available:</source>
+<target>הטמע תוכנות חיצוניות. תפריטי המקרו הבאים זמינים:</target>
+<source>- full file or directory name</source>
+<target>- שם מלא של קובץ או תיקיה</target>
+<source>- directory part only</source>
+<target>- חלק התיקיה בלבד</target>
+<source>- Other side's counterpart to %name</source>
+<target>- הצד השני מקביל ל- %name</target>
+<source>- Other side's counterpart to %dir</source>
+<target>- הצד השני מקביל ל- %dir</target>
+<source>Restore all hidden dialogs?</source>
+<target>שחזר כל הדיאלוגים הנסתרים?</target>
+<source>
+<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>האם להעביר את העצם הבא לסל המיחזור?</pluralform>
+<pluralform>האם להעביר את %x העצמים הבאים לסל המיחזור?</pluralform>
+</target>
+<source>
+<pluralform>Do you really want to delete the following object?</pluralform>
+<pluralform>Do you really want to delete the following %x objects?</pluralform>
+</source>
+<target>
+<pluralform>האם למחוק את העצם הבא?</pluralform>
+<pluralform>האם למחוק את %x העצמים הבאים?</pluralform>
+</target>
+<source>Leave as unresolved conflict</source>
+<target>השאר כקונפליקט לא מטופל</target>
+<source>Delete permanently</source>
+<target>מחק לצמיתות</target>
+<source>Delete or overwrite files permanently</source>
+<target>מחק או דרוס קבצים לצמיתות</target>
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>השתמש בסל המיחזור כאשר מוחק או דורס קבצים</target>
+<source>Versioning</source>
+<target>עדכון גרסאות</target>
+<source>Move files into a time-stamped subdirectory</source>
+<target>העבר קבצים לתוך מחיצות עם שם המכיל טביעת זמן ותאריך</target>
+<source>Cannot determine sync-direction:</source>
+<target>לא מזהה כוון סנכרון:</target>
+<source>Filter settings have changed!</source>
+<target>קביעת המסנן שונו!</target>
+<source>Both sides have changed since last synchronization!</source>
+<target>שני הצדדים שונו מאז הסנכרון האחרון!</target>
+<source>No change since last synchronization!</source>
+<target>אין שינוי מאז הסנכרון האחרון!</target>
+<source>The file was not processed by last synchronization!</source>
+<target>קובץ זה לא טופל בסנכרון האחרון!</target>
+<source>Planned directory deletion is in conflict with its subdirectories and -files!</source>
+<target>מחיצה המיועדת למחיקה מצויה בסתירה לתקיות המשנה ולקבצים!</target>
+<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
+<target>בחר ברירת מחדל של סנכרון: קבצים ישנים ידרסו ע"י קבצים חדשים יותר.</target>
+<source>The file does not contain a valid configuration:</source>
+<target>קובץ זה לא מכיל קונפיגורציה ברת תוקף</target>
+<source>Scanning:</source>
+<target>סורק:</target>
+<source>Encoding extended time information: %x</source>
+<target>מקודד אינפורמצית זמן מורחבת: %x</target>
+<source>You can ignore this error to consider the directory as empty.</source>
+<target>אפשר להתעלם משגיאה זו ולהניח כי המחיצה ריקה.</target>
+<source>Directory does not exist:</source>
+<target>מחיצה לא קיימת:</target>
+<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>
+<source>File %x has an invalid date!</source>
+<target>קובץ %x מכיל תאריך שגוי!</target>
+<source>Conflict detected:</source>
+<target>התגלה קונפליקט:</target>
+<source>Files %x have the same date but a different size!</source>
+<target>קובץ %x בעל תאריך זהה אך גודל שונה!</target>
+<source>Symlinks %x have the same date but a different target!</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>
+<source>Files/folders differ in attributes only</source>
+<target>קבצים\מחיצות שונים בערכי התכונות בלבד</target>
+<source>Copy new file/folder to left</source>
+<target>העתק קובץ\מחיצה חדש\ה מימין לשמאל</target>
+<source>Copy new file/folder to right</source>
+<target>העתק קובץ\מחיצה חדש\ה משמאל לימין</target>
+<source>Delete left file/folder</source>
+<target>מחק קובץ\מחיצה בצד שמאל</target>
+<source>Delete right file/folder</source>
+<target>מחק קובץ\מחיצה בצד ימין</target>
+<source>Overwrite left file/folder with right one</source>
+<target>העתק ודרוס קובץ\מחיצה מימין לשמאל</target>
+<source>Overwrite right file/folder with left one</source>
+<target>העתק ודרוס קובץ\מחיצה משמאל לימין</target>
+<source>Do nothing</source>
+<target>אל תעשה כלום</target>
+<source>Copy file attributes only to left</source>
+<target>העתק תכונות קובץ בלבד מימין לשמאל</target>
+<source>Copy file attributes only to right</source>
+<target>העתק תכונות קובץ בלבד משמאל לימין</target>
+<source>Deleting file %x</source>
+<target>מוחק קובץ %x</target>
+<source>Deleting Symbolic Link %x</source>
+<target>מוחק קישור סימבולי %x</target>
+<source>Deleting folder %x</source>
+<target>מוחק מחיצה %x</target>
+<source>Moving %x to Recycle Bin</source>
+<target>מעביר %x לסל המיחזור</target>
+<source>Moving file %x to user-defined directory %y</source>
+<target>מעביר קובץ %x למחיצה מוגדרת משתמש %y</target>
+<source>Moving folder %x to user-defined directory %y</source>
+<target>מעביר תיקיה %x למחיצה מוגדרת משתמש %y</target>
+<source>Moving Symbolic Link %x to user-defined directory %y</source>
+<target>מעביר קישור סימבולי %x למחיצה מוגדרת משתמש %y</target>
+<source>Copying new file %x to %y</source>
+<target>מעתיק קובץ חדש %x אל %y</target>
+<source>Copying new Symbolic Link %x to %y</source>
+<target>מעתיק קישור סימבולי חדש %x אל %y</target>
+<source>Overwriting file %x in %y</source>
+<target>דורס קובץ %x ב %y</target>
+<source>Overwriting Symbolic Link %x in %y</source>
+<target>דורס קיור סימבולי %x ב %y</target>
+<source>Creating folder %x</source>
+<target>יוצר מחיצה %x</target>
+<source>Verifying file %x</source>
+<target>מאמת קובץ %x</target>
+<source>Updating attributes of %x</source>
+<target>מעדכן תכונות של %x</target>
+<source>Source directory does not exist anymore:</source>
+<target>מחיצת המקור לא נמצאת:</target>
+<source>Generating database...</source>
+<target>מיצר בסיס נתונים...</target>
+<source>Nothing to synchronize according to configuration!</source>
+<target>אין מה לסנכרן ע"פ הקונפיגורציה!</target>
+<source>Target directory name must not be empty!</source>
+<target>שם של מחיצת מטרה אינו יכול להיות ריק!</target>
+<source>User-defined directory for deletion was not specified!</source>
+<target>מחיצה מוגדרת משתמש למחיקה לא מוגדרת!</target>
+<source>Unresolved conflicts existing!</source>
+<target>קיים קונפליקט לא פתור!</target>
+<source>You can ignore conflicts and continue synchronization.</source>
+<target>באפשרותך להתעלם מהקונפליקטים ולהמשיך בסנכרון.</target>
+<source>Significant difference detected:</source>
+<target>התגלה שוני גדול מידי:</target>
+<source>More than 50% of the total number of files will be copied or deleted!</source>
+<target>יותר מ 50% מהקבצים ימחקו או יועתקו!</target>
+<source>Not enough free disk space available in:</source>
+<target>אין מספיק מקום דיסק פנוי ב:</target>
+<source>Free disk space required:</source>
+<target>מקום דיסק פנוי נדרש:</target>
+<source>Free disk space available:</source>
+<target>מקום פנוי בדיסק:</target>
+<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
+<target>מחיצה שתשתנה היא חלק מריבוי זוגות מחיצות! בבקשה בדוק הגדרות סינכרון!</target>
+<source>Processing folder pair:</source>
+<target>מבצע זוג מחיצות:</target>
+<source>Error copying locked file %x!</source>
+<target>שגיאה בהעתקת קובץ נעול %x!</target>
+<source>Data verification error: Source and target file have different content!</source>
+<target>שגיאה של אימות נתונים קובץ מקור ומטרה בעלי תכולת נתונים שונה!</target>
diff --git a/BUILD/Languages/hungarian.lng b/BUILD/Languages/hungarian.lng
index 093db082..2ab1e43f 100644
--- a/BUILD/Languages/hungarian.lng
+++ b/BUILD/Languages/hungarian.lng
@@ -8,7 +8,7 @@
 </header>
 
 <source>Show in Explorer</source>
-<target></target>
+<target>Mutatás az Intézőben</target>
 <source>Open with default application</source>
 <target>Megnyitás az alapértelmezett alkalmazással</target>
 <source>Browse directory</source>
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Automatikus szinkronizálás</target>
 <source>Browse</source>
 <target>Tallózás</target>
+<source>Invalid commandline: "%x"</source>
+<target>Érvénytelen parancssor: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>A szimbolikus link feloldása sikertelen:</target>
+<source>Show popup</source>
+<target>Felbukkanó ablak mutatása</target>
+<source>Show popup on errors or warnings</source>
+<target>Értesítés felbukkanó ablakban a hibákról és figyelmeztetésekről</target>
+<source>Ignore errors</source>
+<target>Hibák figyelmen kívül hagyása</target>
+<source>Hide all error and warning messages</source>
+<target>Összes hibaüzenet és figyelmeztetés elrejtése</target>
+<source>Exit instantly</source>
+<target>Kilépés azonnal</target>
+<source>Abort synchronization immediately</source>
+<target>Szinkronizáció azonnali megszakítása</target>
 <source>Select alternate synchronization settings</source>
 <target>Alternatív szinkronizációs beállítások kiválasztása</target>
 <source>No filter selected</source>
@@ -58,7 +72,7 @@
 <source>%x MB</source>
 <target>%x MB</target>
 <source>%x KB</source>
-<target></target>
+<target>%x KB</target>
 <source>%x GB</source>
 <target>%x GB</target>
 <source>
@@ -66,6 +80,8 @@
 <pluralform>%x Bytes</pluralform>
 </source>
 <target>
+<pluralform>1 Bájt</pluralform>
+<pluralform>%x Bájt</pluralform>
 </target>
 <source><Symlink></source>
 <target><Symlink></target>
@@ -112,19 +128,19 @@
 <pluralform>%x sec</pluralform>
 </source>
 <target>
+<pluralform>1 másodperc</pluralform>
+<pluralform>%x másodperc</pluralform>
 </target>
 <source>Info</source>
 <target>Információ</target>
 <source>Fatal Error</source>
 <target>Kritikus hiba</target>
+<source>Invalid FreeFileSync config file!</source>
+<target>Érvénytelen a FreeFileSync beállításait tartalmazó fájl!</target>
 <source>File does not exist:</source>
 <target>A következő fájl nem létezik:</target>
 <source>Error parsing configuration file:</source>
 <target>A beállításokat tartalmazó fájl feldolgozása sikertelen:</target>
-<source>Error writing file:</source>
-<target>A fájl írása sikertelen:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>Érvénytelen a FreeFileSync beállításait tartalmazó fájl!</target>
 <source>/sec</source>
 <target>/másodperc</target>
 <source>
@@ -132,18 +148,24 @@
 <pluralform>%x min</pluralform>
 </source>
 <target>
+<pluralform>1 perc</pluralform>
+<pluralform>%x perc</pluralform>
 </target>
 <source>
 <pluralform>1 hour</pluralform>
 <pluralform>%x hours</pluralform>
 </source>
 <target>
+<pluralform>1 óra</pluralform>
+<pluralform>%x óra</pluralform>
 </target>
 <source>
 <pluralform>1 day</pluralform>
 <pluralform>%x days</pluralform>
 </source>
 <target>
+<pluralform>1 nap</pluralform>
+<pluralform>%x nap</pluralform>
 </target>
 <source>S&ave configuration...</source>
 <target>Beállítások mentés&e...</target>
@@ -207,8 +229,6 @@ A parancssor végrehajtódik minden alkalommal, ha:
 <target>Figyelés aktív...</target>
 <source>Waiting for missing directories...</source>
 <target>Várakozás a hiányzó mappákra...</target>
-<source>Command line is empty!</source>
-<target>A parancssor üres!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>A mappafigyelés inicializálása sikertelen:</target>
 <source>A directory input field is empty.</source>
@@ -249,12 +269,18 @@ A parancssor végrehajtódik minden alkalommal, ha:
 <target>A fájl másolása sikertelen:</target>
 <source>Error opening file:</source>
 <target>A fájl megnyitása sikertelen:</target>
+<source>Error writing file:</source>
+<target>A fájl írása sikertelen:</target>
 <source>Error reading file:</source>
 <target>A fájl olvasá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>Windows Error Code %x:</source>
+<target>Windows hibakód %x:</target>
+<source>Linux Error Code %x:</source>
+<target>Linux hibakód %x:</target>
 <source>Error setting privilege:</source>
 <target>Hiba történt a jogok beállítása közben:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -279,18 +305,6 @@ A parancssor végrehajtódik minden alkalommal, ha:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>A következő XML-csomópontok értékének beolvasása sikertelen:</target>
-<source>Show popup</source>
-<target>Felbukkanó ablak mutatása</target>
-<source>Show popup on errors or warnings</source>
-<target>Értesítés felbukkanó ablakban a hibákról és figyelmeztetésekről</target>
-<source>Ignore errors</source>
-<target>Hibák figyelmen kívül hagyása</target>
-<source>Hide all error and warning messages</source>
-<target>Összes hibaüzenet és figyelmeztetés elrejtése</target>
-<source>Exit instantly</source>
-<target>Kilépés azonnal</target>
-<source>Abort synchronization immediately</source>
-<target>Szinkronizáció azonnali megszakítása</target>
 <source>Logging</source>
 <target>Naplózás</target>
 <source>FreeFileSync batch file</source>
@@ -395,8 +409,8 @@ A parancssor végrehajtódik minden alkalommal, ha:
 <target>Jobb oldal</target>
 <source>Batch job</source>
 <target>Kötegelt feladat</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Egy kötegelt feladat fájl létrehozása az automatizált szinkronizációhoz. Kötegelt feladat módban való indításhoz egyszerűen meg kell adni a fájl nevét a FreeFileSync.exe-nek: FreeFileSync.exe <kötegelt feladat fájl>. Ezt ütemezni is lehet az operációs rendszer feladatkezelőjével.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Kötegelt feladat fájl létrehozása az automatizált szinkronizációhoz. Kötegelt feladat módban való indításhoz csak simán duplát kell kattintani a fájlon vagy a parancssorból kell futtatni: FreeFileSync.exe <kötegelt feladat fájl>.futtasd egyszerűen meg kell adni a fájl nevét a FreeFileSync.exe-nek: FreeFileSync.exe <kötegelt feladat fájl>. Ezt ütemezni is lehet az operációs rendszer feladatkezelőjével.</target>
 <source>Help</source>
 <target>Súgó</target>
 <source>Configuration overview:</source>
@@ -463,17 +477,17 @@ A parancssor végrehajtódik minden alkalommal, ha:
 <target>Kategória</target>
 <source>Action</source>
 <target>Művelet</target>
-<source>Files/folders that exist on left side only</source>
+<source>File/folder exists on left side only</source>
 <target>Csak a bal oldalon létező fájlok/mappák</target>
-<source>Files/folders that exist on right side only</source>
+<source>File/folder exists on right side only</source>
 <target>Csak a jobb oldalon létező fájlok/mappák</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Mindkét oldalon létező fájlok, de a bal oldali újabb</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Mindkét oldalon létező fájlok, de a jobb oldali újabb</target>
-<source>Files that have different content</source>
-<target>Fájlok, amelyeknek különböző a tartalmuk:</target>
-<source>Conflicts/files that cannot be categorized</source>
+<source>Left file is newer</source>
+<target>A bal oldalon lévő fájl újabb</target>
+<source>Right file is newer</source>
+<target>A jobb oldalon lévő fájl újabb</target>
+<source>Files have different content</source>
+<target>A fájlok tartalma különböző</target>
+<source>Conflict/file cannot be categorized</source>
 <target>Kategorizálhatatlan ütközések/fájlok</target>
 <source>Compare by...</source>
 <target>Összehasonlítás</target>
@@ -484,7 +498,7 @@ Files are found equal if
 are the same
 </source>
 <target>
-A fájlok megegyező ha
+A fájlok megegyeznek, ha
   - a fájlméret
   - az utolsó módosítás dátuma
 megegyezik
@@ -497,7 +511,7 @@ Files are found equal if
 is the same
 </source>
 <target>
-A fájlok megegyező ha
+A fájlok megegyeznek, ha
   - a fájlok tartalma
 megegyezik
 </target>
@@ -529,8 +543,8 @@ megegyezik
 <target>- csak a bal oldalon létezik</target>
 <source>- exists right only</source>
 <target>- csak a jobb oldalon létezik</target>
-<source>- conflict</source>
-<target>- ütközés</target>
+<source>- conflict (same date, different size)</source>
+<target>- ütközés (ugyanaz a dátum, különböző méret)</target>
 <source>Compare by "File content"</source>
 <target>Összehasonlítás "fájltartalom" alapján</target>
 <source>
@@ -546,7 +560,7 @@ Ennek az opciónak az engedélyezésével a döntési fa kisebb lesz:
 <source>- different</source>
 <target>- különböző</target>
 <source>Source code written in C++ utilizing:</source>
-<target></target>
+<target>A programot C++-ban fejlesztették a következők felhasználásával:</target>
 <source>Big thanks for localizing FreeFileSync goes out to:</source>
 <target>
 Nagy köszönet a FreeFileSync lokalizációjáért
@@ -594,7 +608,10 @@ a következő személyeknek:
 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></target>
+<target>
+Csak azok a fájlok/mappák lesznek kiválasztva a szinkronizáláshoz, amelyek minden szűrőbeállításnak megfelelnek.
+Megjegyzés: A névszűrésnek relatívnak(!) kell lennie a fő szinkronizációs mappához képest.
+</target>
 <source>Hints:</source>
 <target>Tippek:</target>
 <source>1. Enter relative file or directory names separated by ';' or a new line.</source>
@@ -609,19 +626,22 @@ Note: The name filter must be specified relative(!) to main synchronization dire
 Include: *.doc;*.zip;*.exe
 Exclude: \stuff\temp\*
 </source>
-<target></target>
+<target>
+Csatolni: *.doc; *.zip; *.exe
+Kizárni: \stuff\temp\*
+</target>
 <source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
 <target>Minden .doc, .zip és .exe fájl szinkronizálása a "temp" almappában találhatók kivételével.</target>
 <source>Include</source>
-<target>Csatol</target>
+<target>Csatolni</target>
 <source>Exclude</source>
-<target>Kizár</target>
+<target>Kizárni</target>
 <source>Select time span:</source>
-<target></target>
+<target>Időtartam kiválasztása:</target>
 <source>Minimum file size:</source>
-<target></target>
+<target>Minimális fájlméret</target>
 <source>Maximum file size:</source>
-<target></target>
+<target>Maximális fájlméret:</target>
 <source>&Default</source>
 <target>&Alapértelmezett</target>
 <source>Move column up</source>
@@ -694,10 +714,8 @@ Fájlok és mappák jogosultságainak átvitele
 <target><többszörös kijelölés></target>
 <source>D-Click</source>
 <target>D-Klikk</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Másolás a vágólapra	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Fájlok törlése	DEL</target>
+<source>Delete</source>
+<target>Törlés</target>
 <source>Customize...</source>
 <target>Testreszabás...</target>
 <source>Auto-adjust columns</source>
@@ -789,24 +807,32 @@ Fájlok és mappák jogosultságainak átvitele
 <pluralform>%x objects deleted successfully!</pluralform>
 </source>
 <target>
+<pluralform>Sikeresen töröltük az objektumot!</pluralform>
+<pluralform>Sikeresen töröltünk %x objektumot!</pluralform>
 </target>
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
 <target>
+<pluralform>1 mappát</pluralform>
+<pluralform>%x mappát</pluralform>
 </target>
 <source>
 <pluralform>1 file</pluralform>
 <pluralform>%x files</pluralform>
 </source>
 <target>
+<pluralform>1 fájlt</pluralform>
+<pluralform>%x fájlt</pluralform>
 </target>
 <source>
 <pluralform>%x of 1 row in view</pluralform>
 <pluralform>%x of %y rows in view</pluralform>
 </source>
 <target>
+<pluralform>%x/1 sor a nézetben</pluralform>
+<pluralform>%x/%y sor a nézetben</pluralform>
 </target>
 <source>Scanning...</source>
 <target>Vizsgálat folyamatban...</target>
@@ -832,30 +858,26 @@ Fájlok és mappák jogosultságainak átvitele
 <target>mindkét oldalon létező fájlok</target>
 <source>on one side only</source>
 <target>csak az egy oldalon létező fájlok</target>
-<source>- left</source>
-<target>- bal oldali</target>
-<source>- right</source>
-<target>- jobb oldali</target>
-<source>different</source>
-<target>különböző</target>
-<source>- conflict (same date, different size)</source>
-<target>- ütközés (ugyanaz a dátum, különböző méret)</target>
+<source>same date</source>
+<target>megegyező dátum</target>
+<source>different date</source>
+<target>különböző dátum</target>
 <source>Inactive</source>
-<target></target>
+<target>Inaktív</target>
 <source>Second</source>
-<target></target>
+<target>Másodperc</target>
 <source>Minute</source>
-<target></target>
+<target>Perc</target>
 <source>Hour</source>
-<target></target>
+<target>Óra</target>
 <source>Day</source>
-<target></target>
+<target>Nap</target>
 <source>Byte</source>
-<target></target>
+<target>Bájt</target>
 <source>KB</source>
-<target></target>
+<target>KB</target>
 <source>MB</source>
-<target></target>
+<target>MB</target>
 <source>Filter: All pairs</source>
 <target>Szűrő: Minden pár</target>
 <source>Filter: Single pair</source>
@@ -883,12 +905,16 @@ Fájlok és mappák jogosultságainak átvitele
 <pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
 </source>
 <target>
+<pluralform>Valóban a Lomtárba akarod mozgatni a következő objektumot?</pluralform>
+<pluralform>Valóban a Lomtárba akarod mozgatni a következő %x objektumot?</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>Valóban törölni akarod a következő objektumot?</pluralform>
+<pluralform>Valóban törölni akarod a következő %x objektumot?</pluralform>
 </target>
 <source>Leave as unresolved conflict</source>
 <target>Feloldatlan ütközésként hagyni</target>
@@ -946,28 +972,28 @@ Fájlok és mappák jogosultságainak átvitele
 <target>Fájllista generálása...</target>
 <source>Multiple...</source>
 <target>Sokszorosítás</target>
-<source>Files that are equal on both sides</source>
-<target>Megegyező fájlok mindkét oldalon</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Egyforma fájlok/mappák, melyek csak attribútumaikban különböznek</target>
-<source>Copy from right to left</source>
-<target>Másolás a jobb oldalról a bal oldalra</target>
-<source>Copy from left to right</source>
-<target>Másolás a bal oldalról a jobb oldalra</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Csak a bal oldalon létező fájlok/mappák törlése</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Csak a jobb oldalon létező fájlok/mappák törlése</target>
-<source>Copy from right to left overwriting</source>
-<target>Másolás a jobb oldalról a bal oldalra felülírással</target>
-<source>Copy from left to right overwriting</source>
-<target>Másolás a bal oldalról a jobb oldalra felülírással</target>
+<source>Both sides are equal</source>
+<target>Mindkét oldal egyforma</target>
+<source>Files/folders differ in attributes only</source>
+<target>Csak attribútumokban különböző fájlok/mappák</target>
+<source>Copy new file/folder to left</source>
+<target>Új fájl/mappa másolása a bal oldalra</target>
+<source>Copy new file/folder to right</source>
+<target>Új fájl/mappa másolása a jobb oldalra</target>
+<source>Delete left file/folder</source>
+<target>Bal oldali fájl/mappa törlése</target>
+<source>Delete right file/folder</source>
+<target>Jobb oldali fájl/mappa törlése</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Bal oldali fájl/mappa felülírása a jobb oldalival</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Jobb oldali fájl/mappa felülírása a bal oldalival</target>
 <source>Do nothing</source>
 <target>Nincs mit csinálni</target>
-<source>Copy attributes only from right to left</source>
-<target>Attribútumok másolása kizárólag jobbról balra</target>
-<source>Copy attributes only from left to right</source>
-<target>Attribútumok másolása kizárólag balról jobbra</target>
+<source>Copy file attributes only to left</source>
+<target>Fájl attribútumok másolása csak a bal oldalra</target>
+<source>Copy file attributes only to right</source>
+<target>Fájl attribútumok másolása csak a jobb oldalra</target>
 <source>Deleting file %x</source>
 <target>Fájl törlése %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -998,10 +1024,12 @@ Fájlok és mappák jogosultságainak átvitele
 <target>A(z) %x attribútumainak frissítése</target>
 <source>Source directory does not exist anymore:</source>
 <target>A forrásként megadott mappa többé nem létezik:</target>
+<source>Generating database...</source>
+<target>Adatbázis generálása...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>A beállításoknak megfelelően nincs mit szinkronizálni!</target>
 <source>Target directory name must not be empty!</source>
-<target></target>
+<target>A célmappa neve nem lehet üres!</target>
 <source>User-defined directory for deletion was not specified!</source>
 <target>A törléshez nem lett mappa megadva a felhasználó által!</target>
 <source>Unresolved conflicts existing!</source>
@@ -1022,8 +1050,6 @@ Fájlok és mappák jogosultságainak átvitele
 <target>Egy olyan mappa kerül módosításra, amely tagja több mappa párosnak! Kérjük, nézd át a szinkronizációs beállításokat!</target>
 <source>Processing folder pair:</source>
 <target>Mappapár feldolgozása:</target>
-<source>Generating database...</source>
-<target>Adatbázis generálása...</target>
 <source>Error copying locked file %x!</source>
 <target>Hiba történt a(z) %x zárolt fájl másolása közben!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng
index 404d1fb5..32324996 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -8,7 +8,7 @@
 </header>
 
 <source>Show in Explorer</source>
-<target></target>
+<target>Mostra in Esplora Risorse</target>
 <source>Open with default application</source>
 <target>Apri con applicazione di default</target>
 <source>Browse directory</source>
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Sincronizzazione Automatizzata</target>
 <source>Browse</source>
 <target>Sfoglia</target>
+<source>Invalid commandline: "%x"</source>
+<target>Comando non valido: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Errore nella risoluzione di collegamento simbolico:</target>
+<source>Show popup</source>
+<target>Mostra popup</target>
+<source>Show popup on errors or warnings</source>
+<target>Mostra popup degli 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 synchronization settings</source>
 <target>Seleziona impostazioni di sincronizzazione alternative</target>
 <source>No filter selected</source>
@@ -58,7 +72,7 @@
 <source>%x MB</source>
 <target>%x MB</target>
 <source>%x KB</source>
-<target></target>
+<target>%x KB</target>
 <source>%x GB</source>
 <target>%x GB</target>
 <source>
@@ -66,6 +80,8 @@
 <pluralform>%x Bytes</pluralform>
 </source>
 <target>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Byte</pluralform>
 </target>
 <source><Symlink></source>
 <target><Symlink></target>
@@ -112,19 +128,19 @@
 <pluralform>%x sec</pluralform>
 </source>
 <target>
+<pluralform>1 sec</pluralform>
+<pluralform>%x sec</pluralform>
 </target>
 <source>Info</source>
 <target>Info</target>
 <source>Fatal Error</source>
-<target>Fatal Error</target>
+<target>Errore Fatale</target>
+<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 writing file:</source>
-<target>Errore durante la scrittura del file:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>File di configurazione FreeFileSync non valido!</target>
 <source>/sec</source>
 <target>/sec</target>
 <source>
@@ -132,18 +148,24 @@
 <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>S&ave configuration...</source>
 <target>S&alva la configurazione...</target>
@@ -207,8 +229,6 @@ La linea di comando è eseguita ogni volta che:
 <target>Monitoraggio attivo...</target>
 <source>Waiting for missing directories...</source>
 <target>In attesa delle directory mancanti...</target>
-<source>Command line is empty!</source>
-<target>Linea di comando e' vuota!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Monitoraggio directory non inizializzabile:</target>
 <source>A directory input field is empty.</source>
@@ -249,12 +269,18 @@ La linea di comando è eseguita ogni volta che:
 <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>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>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 setting privilege:</source>
 <target>Errore nell'impostazione dei privilegi:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -279,18 +305,6 @@ La linea di comando è eseguita ogni volta che:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>Impossibile leggere i valori per i seguenti nodi XML:</target>
-<source>Show popup</source>
-<target>Mostra popup</target>
-<source>Show popup on errors or warnings</source>
-<target>Mostra popup degli 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>Logging</source>
 <target>Logging</target>
 <source>FreeFileSync batch file</source>
@@ -395,8 +409,8 @@ La linea di comando è eseguita ogni volta che:
 <target>Destra</target>
 <source>Batch job</source>
 <target>Batch job</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Componi un file batch per la sincronia automatica. Per partire in modalità batch fai semplicemente seguire il nome del file all'eseguibile di FreeFileSync: FreeFileSync.exe <nomefilebatch>. Puoi anche schedulare l'operazione nelle operazioni pianificate del sistema operativo.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Crea un file batch per sincronizzazione automatica. Per partire in modalità batch effettua semplicemente doppio click sul file o esegui da linea di comando: FreeFileSync.exe <batchfile>. Puoi anche schedulare il batch nelle operazioni pianificate del tuo sistema operativo.</target>
 <source>Help</source>
 <target>Aiuto</target>
 <source>Configuration overview:</source>
@@ -463,18 +477,18 @@ La linea di comando è eseguita ogni volta che:
 <target>Categoria</target>
 <source>Action</source>
 <target>Azioni</target>
-<source>Files/folders that exist on left side only</source>
-<target>Files/cartelle esistenti solo a sinistra</target>
-<source>Files/folders that exist on right side only</source>
-<target>Files/cartelle esistenti solo a destra</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Files esistenti su entrambi i lati, più recenti a sinistra</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Files esistenti su entrambi i lati, più recenti a destra</target>
-<source>Files that have different content</source>
-<target>Files con contenuto differente</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Conflitti/files senza categoria di appartenenza</target>
+<source>File/folder exists on left side only</source>
+<target>File/cartella esiste solo sul lato sinistro</target>
+<source>File/folder exists on right side only</source>
+<target>File/cartella esiste solo sul lato destro</target>
+<source>Left file is newer</source>
+<target>File di sinistra è più recente</target>
+<source>Right file is newer</source>
+<target>File di destra è più recente</target>
+<source>Files have different content</source>
+<target>I file hanno differente contenuto</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Conflitti/file non possono essere categorizzati</target>
 <source>Compare by...</source>
 <target>Compara per...</target>
 <source>
@@ -528,8 +542,8 @@ I file sono considerati identici se
 <target>- il file esiste solo a sinistra</target>
 <source>- exists right only</source>
 <target>- il file esiste solo a destra</target>
-<source>- conflict</source>
-<target>- conflitto</target>
+<source>- conflict (same date, different size)</source>
+<target>- conflitto (stessa data, dimensione diversa)</target>
 <source>Compare by "File content"</source>
 <target>Compara per "Contenuto dei file"</target>
 <source>
@@ -545,7 +559,7 @@ Abilitando questa opzione l'albero delle decisioni è semplificato:
 <source>- different</source>
 <target>- file diversi</target>
 <source>Source code written in C++ utilizing:</source>
-<target></target>
+<target>Codice sorgente scritto in C++ utilizzando:</target>
 <source>Big thanks for localizing FreeFileSync goes out to:</source>
 <target>Per la traduzione di FreeFileSync, un grazie va a:</target>
 <source>Feedback and suggestions are welcome at:</source>
@@ -590,7 +604,10 @@ Abilitando questa opzione l'albero delle decisioni è semplificato:
 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></target>
+<target>
+Solo file/cartelle che corrispondono a tutti i filtri impostati saranno selezionati per la sincronizzazione.
+Nota: Il nome filtro deve essere specificato relativo(!) nelle directory principali di sincronizzazione.
+</target>
 <source>Hints:</source>
 <target>Consigli:</target>
 <source>1. Enter relative file or directory names separated by ';' or a new line.</source>
@@ -605,7 +622,10 @@ Note: The name filter must be specified relative(!) to main synchronization dire
 Include: *.doc;*.zip;*.exe
 Exclude: \stuff\temp\*
 </source>
-<target></target>
+<target>
+Includi: *.doc;*.zip;*.exe
+Escludi: \stuff\temp\*
+</target>
 <source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
 <target>Sincronizza tutti i file .doc, .zip e .exe eccetto tutti quelli nella cartella "temp".</target>
 <source>Include</source>
@@ -613,11 +633,11 @@ Exclude: \stuff\temp\*
 <source>Exclude</source>
 <target>Escludi</target>
 <source>Select time span:</source>
-<target></target>
+<target>Seleziona intervallo temporale:</target>
 <source>Minimum file size:</source>
-<target></target>
+<target>Dimensione minima file:</target>
 <source>Maximum file size:</source>
-<target></target>
+<target>Dimensione massima file:</target>
 <source>&Default</source>
 <target>&Default</target>
 <source>Move column up</source>
@@ -690,10 +710,8 @@ Trasferisci file e permessi sulle cartelle
 <target><selezione multipla></target>
 <source>D-Click</source>
 <target>D-Click</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Copia nella clipboard	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Elimina file	DEL</target>
+<source>Delete</source>
+<target>Cancella</target>
 <source>Customize...</source>
 <target>Personalizza...</target>
 <source>Auto-adjust columns</source>
@@ -785,27 +803,35 @@ Trasferisci file e permessi sulle cartelle
 <pluralform>%x objects deleted successfully!</pluralform>
 </source>
 <target>
+<pluralform>Eliminazione oggetto riuscita!</pluralform>
+<pluralform>%x oggetti eliminati con successo!</pluralform>
 </target>
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
 <target>
+<pluralform>1 cartella</pluralform>
+<pluralform>%x cartelle</pluralform>
 </target>
 <source>
 <pluralform>1 file</pluralform>
 <pluralform>%x files</pluralform>
 </source>
 <target>
+<pluralform>1 file</pluralform>
+<pluralform>%x file</pluralform>
 </target>
 <source>
 <pluralform>%x of 1 row in view</pluralform>
 <pluralform>%x of %y rows in view</pluralform>
 </source>
 <target>
+<pluralform>%x di 1 riga in vista</pluralform>
+<pluralform>%x di %y righe in vista</pluralform>
 </target>
 <source>Scanning...</source>
-<target>Analisi in corso...</target>
+<target>Scansione in corso...</target>
 <source>Comparing content...</source>
 <target>Comparazione contenuto...</target>
 <source>Paused</source>
@@ -828,30 +854,26 @@ Trasferisci file e permessi sulle cartelle
 <target>file esistente su entrambi i lati</target>
 <source>on one side only</source>
 <target>file esistente su un solo lato</target>
-<source>- left</source>
-<target>- a sinistra</target>
-<source>- right</source>
-<target>- a destra</target>
-<source>different</source>
-<target>file differenti</target>
-<source>- conflict (same date, different size)</source>
-<target>- conflitto (stessa data, dimensione diversa)</target>
+<source>same date</source>
+<target>stessa data</target>
+<source>different date</source>
+<target>data diversa</target>
 <source>Inactive</source>
-<target></target>
+<target>Inattivo</target>
 <source>Second</source>
-<target></target>
+<target>Secondo</target>
 <source>Minute</source>
-<target></target>
+<target>Minuto</target>
 <source>Hour</source>
-<target></target>
+<target>Ora</target>
 <source>Day</source>
-<target></target>
+<target>Giorno</target>
 <source>Byte</source>
-<target></target>
+<target>Byte</target>
 <source>KB</source>
-<target></target>
+<target>KB</target>
 <source>MB</source>
-<target></target>
+<target>MB</target>
 <source>Filter: All pairs</source>
 <target>Filtro: Tutte le coppie</target>
 <source>Filter: Single pair</source>
@@ -879,12 +901,16 @@ Trasferisci file e permessi sulle cartelle
 <pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
 </source>
 <target>
+<pluralform>Vuoi veramente spostare il seguente oggetto nel Cestino?</pluralform>
+<pluralform>Vuoi veramente spostare i seguenti %x oggetti nel Cestino?</pluralform>
 </target>
 <source>
 <pluralform>Do you really want to delete the following object?</pluralform>
 <pluralform>Do you really want to delete the following %x objects?</pluralform>
 </source>
 <target>
+<pluralform>Vuoi veramente cancellare il seguente oggetto?</pluralform>
+<pluralform>Vuoi veramente cancellare i seguenti %x oggetti?</pluralform>
 </target>
 <source>Leave as unresolved conflict</source>
 <target>Lascia come conflitti irrisolti</target>
@@ -942,28 +968,28 @@ Trasferisci file e permessi sulle cartelle
 <target>Generazione lista dei file...</target>
 <source>Multiple...</source>
 <target>Multiplo...</target>
-<source>Files that are equal on both sides</source>
-<target>Files identici su entrambi i lati</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Considera uguali file/cartelle che differiscono solo per gli attributi</target>
-<source>Copy from right to left</source>
-<target>Copia da destra a sinistra</target>
-<source>Copy from left to right</source>
-<target>Copia da sinistra a destra</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Elimina files/cartelle esistenti solo a sinistra</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Elimina files/cartelle esistenti solo a destra</target>
-<source>Copy from right to left overwriting</source>
-<target>Copia da destra a sinistra sovrascrivendo</target>
-<source>Copy from left to right overwriting</source>
-<target>Copia sinistra a destra sovrascrivendo</target>
+<source>Both sides are equal</source>
+<target>Entrambi i lati sono uguali</target>
+<source>Files/folders differ in attributes only</source>
+<target>File/cartelle differiscono solo negli attributi</target>
+<source>Copy new file/folder to left</source>
+<target>Copia nuovo file/cartella verso sinistra</target>
+<source>Copy new file/folder to right</source>
+<target>Copia nuovo file/cartella verso destra</target>
+<source>Delete left file/folder</source>
+<target>Cancella file/cartella di sinistra</target>
+<source>Delete right file/folder</source>
+<target>Cancella file/cartella di destra</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Sovrascrivi file/cartella di sinistra con quello di destra</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Sovrascrivi file/cartella di destra con quello di sinistra</target>
 <source>Do nothing</source>
 <target>Non fare nulla</target>
-<source>Copy attributes only from right to left</source>
-<target>Copia attributi solo da destra a sinistra</target>
-<source>Copy attributes only from left to right</source>
-<target>Copia attributi solo da sinistra a destra</target>
+<source>Copy file attributes only to left</source>
+<target>Copia i soli attributi file verso sinistra</target>
+<source>Copy file attributes only to right</source>
+<target>Copia i soli attributi file verso destra</target>
 <source>Deleting file %x</source>
 <target>Eliminazione file %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -994,10 +1020,12 @@ Trasferisci file e permessi sulle cartelle
 <target>Aggiornamento attributi di %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>La directory sorgente non è più esistente:</target>
+<source>Generating database...</source>
+<target>Generazione database...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Niente da sincronizzare in questa configurazione!</target>
 <source>Target directory name must not be empty!</source>
-<target></target>
+<target>Il nome della cartella di destinazione non può essere nullo!</target>
 <source>User-defined directory for deletion was not specified!</source>
 <target>Directory personalizzata per la cancellazione non specificata!</target>
 <source>Unresolved conflicts existing!</source>
@@ -1018,8 +1046,6 @@ Trasferisci file e permessi sulle cartelle
 <target>Una directory che fa parte di più coppie di cartelle sarà modificata! Ricontrolla le impostazioni di sincronizzazione!</target>
 <source>Processing folder pair:</source>
 <target>Elaborazione coppia di cartelle:</target>
-<source>Generating database...</source>
-<target>Generazione database...</target>
 <source>Error copying locked file %x!</source>
 <target>Errore durante la copia del file bloccato %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng
index 4a44248b..a5fd933c 100644
--- a/BUILD/Languages/japanese.lng
+++ b/BUILD/Languages/japanese.lng
@@ -17,8 +17,22 @@
 <target>リアルタイム同期 - 自動同期</target>
 <source>Browse</source>
 <target>参照</target>
+<source>Invalid commandline: "%x"</source>
+<target>無効なコマンドライン: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>シンボリックリンクの解決に失敗:</target>
+<source>Show popup</source>
+<target>ポップアップ表示</target>
+<source>Show popup 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 synchronization settings</source>
 <target>代替同期設定を選択</target>
 <source>No filter selected</source>
@@ -119,14 +133,12 @@
 <target>情報</target>
 <source>Fatal Error</source>
 <target>致命的なエラー</target>
+<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 writing file:</source>
-<target>ファイル書き込みエラー:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>無効な FreeFileSync 構成ファイルです!</target>
 <source>/sec</source>
 <target>/秒</target>
 <source>
@@ -212,8 +224,6 @@ The command line is executed each time:
 <target>監視を開始します...</target>
 <source>Waiting for missing directories...</source>
 <target>見失ったディレクトリの待機中</target>
-<source>Command line is empty!</source>
-<target>コマンドラインが空白です!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>監視するディレクトリを初期化できません:</target>
 <source>A directory input field is empty.</source>
@@ -254,12 +264,18 @@ The command line is executed each time:
 <target>ファイルのコピーに失敗:</target>
 <source>Error opening file:</source>
 <target>ファイルのオープンに失敗:</target>
+<source>Error writing file:</source>
+<target>ファイル書き込みエラー:</target>
 <source>Error reading file:</source>
 <target>ファイル読み込みエラー:</target>
 <source>Endless loop when traversing directory:</source>
 <target>ディレクトリ移動中に無限ループが発生:</target>
 <source>Error traversing directory:</source>
 <target>ディレクトリの移動エラー:</target>
+<source>Windows Error Code %x:</source>
+<target>Windows エラーコード %x:</target>
+<source>Linux Error Code %x:</source>
+<target>Linux エラーコード %x:</target>
 <source>Error setting privilege:</source>
 <target>特権の設定エラー:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -284,18 +300,6 @@ The command line is executed each time:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>以下の XMLノードの値を読み込むことが出来ません:</target>
-<source>Show popup</source>
-<target>ポップアップ表示</target>
-<source>Show popup 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>Logging</source>
 <target>ログ</target>
 <source>FreeFileSync batch file</source>
@@ -335,7 +339,7 @@ The command line is executed each time:
 <source>FreeFileSync is up to date!</source>
 <target>FreeFileSync は最新です!</target>
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
-<target>FreeFileSync のアップデートの有無の確認を自動的に毎週行いますか></target>
+<target>FreeFileSync の更新確認を毎週自動的に行いますか?</target>
 <source>(Requires an Internet connection!)</source>
 <target>(インターネット接続を必要とします!)</target>
 <source>1. &Compare</source>
@@ -400,12 +404,8 @@ The command line is executed each time:
 <target>右側</target>
 <source>Batch job</source>
 <target>一括処理</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>
-一括で同期処理を行うためのバッチファイルを作成します。 一括モードを開始するときは、ファイルのパス名を実行ファイル
-< FreeFileSync.exe> 
-にバッチファイルで渡すだけです。 また、この操作はOSのタスクスケジューラから実行することができます。
-</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>同期を一括で自動的に実行するためのバッチファイルを作成します。実行は.BAT ファイルをダブルクリック、または次のコマンドラインを実行します: FreeFileSync.exe<batchfile>.BAT ファイルは、OS のタスクスケジューラで実行することも可能です</target>
 <source>Help</source>
 <target>ヘルプ</target>
 <source>Configuration overview:</source>
@@ -472,18 +472,18 @@ The command line is executed each time:
 <target>カテゴリ</target>
 <source>Action</source>
 <target>操作</target>
-<source>Files/folders that exist on left side only</source>
+<source>File/folder exists on left side only</source>
 <target>左側のみに存在するファイル/フォルダ</target>
-<source>Files/folders that exist on right side only</source>
+<source>File/folder exists on right side only</source>
 <target>右側のみに存在するファイル/フォルダ</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>両側に存在するが、左側の方がより新しい</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>両側に存在するが、右側の方がより新しい</target>
-<source>Files that have different content</source>
-<target>内容が異なるファイル</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>分類のできない競合/ファイル</target>
+<source>Left file is newer</source>
+<target>左側の新しいファイル</target>
+<source>Right file is newer</source>
+<target>右側の新しいファイル</target>
+<source>Files have different content</source>
+<target>ファイル内容は異なります</target>
+<source>Conflict/file cannot be categorized</source>
+<target>競合があるため分類できません</target>
 <source>Compare by...</source>
 <target>比較対象...</target>
 <source>
@@ -538,8 +538,8 @@ is the same
 <target>- 左側にのみ存在</target>
 <source>- exists right only</source>
 <target>- 右側にのみ存在</target>
-<source>- conflict</source>
-<target>- 不一致</target>
+<source>- conflict (same date, different size)</source>
+<target>- 不一致 (同じ日付, 異なるサイズ)</target>
 <source>Compare by "File content"</source>
 <target>"ファイルの内容" を比較</target>
 <source>
@@ -555,7 +555,7 @@ With this option enabled the decision tree is smaller:
 <source>- different</source>
 <target>- 差異あり</target>
 <source>Source code written in C++ utilizing:</source>
-<target></target>
+<target>ソースコードは C++ で書かれています</target>
 <source>Big thanks for localizing FreeFileSync goes out to:</source>
 <target>FreeFileSync のローカライズへの協力に感謝します:</target>
 <source>Feedback and suggestions are welcome at:</source>
@@ -706,10 +706,8 @@ Transfer file and directory permissions
 <target><複数選択></target>
 <source>D-Click</source>
 <target>W-クリック</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>クリップボードにコピー	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>ファイルを削除	DEL</target>
+<source>Delete</source>
+<target>削除</target>
 <source>Customize...</source>
 <target>カスタマイズ...</target>
 <source>Auto-adjust columns</source>
@@ -848,14 +846,10 @@ Transfer file and directory permissions
 <target>両側に存在するファイル</target>
 <source>on one side only</source>
 <target>片側のみ</target>
-<source>- left</source>
-<target>- 左側</target>
-<source>- right</source>
-<target>- 右側</target>
-<source>different</source>
-<target>差異あり</target>
-<source>- conflict (same date, different size)</source>
-<target>- 不一致 (同じ日付, 異なるサイズ)</target>
+<source>same date</source>
+<target>日時が同一</target>
+<source>different date</source>
+<target>日時が異なる</target>
 <source>Inactive</source>
 <target>非アクティブ</target>
 <source>Second</source>
@@ -964,28 +958,28 @@ Transfer file and directory permissions
 <target>ファイル一覧を作成中...</target>
 <source>Multiple...</source>
 <target>複数処理...</target>
-<source>Files that are equal on both sides</source>
-<target>両側で同様のファイル</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>同様のファイル/フォルダで、属性のみ異なる</target>
-<source>Copy from right to left</source>
-<target>右から左にコピー</target>
-<source>Copy from left to right</source>
-<target>左から右にコピー</target>
-<source>Delete files/folders existing on left side only</source>
-<target>左側のみに存在するファイル/フォルダを削除</target>
-<source>Delete files/folders existing on right side only</source>
-<target>右側のみに存在するファイル/フォルダを削除</target>
-<source>Copy from right to left overwriting</source>
-<target>右から左に上書きコピー</target>
-<source>Copy from left to right overwriting</source>
-<target>左から右に上書きコピー</target>
+<source>Both sides are equal</source>
+<target>両側とも等しく</target>
+<source>Files/folders differ in attributes only</source>
+<target>属性の異なるファイル/フォルダのみ</target>
+<source>Copy new file/folder to left</source>
+<target>新しいファイル/フォルダを左側にコピー</target>
+<source>Copy new file/folder to right</source>
+<target>新しいファイル/フォルダを右側にコピー</target>
+<source>Delete left file/folder</source>
+<target>左側のファイル/フォルダを削除</target>
+<source>Delete right file/folder</source>
+<target>右側のファイル/フォルダを削除</target>
+<source>Overwrite left file/folder with right one</source>
+<target>右側のものを左側のファイル/フォルダに上書き</target>
+<source>Overwrite right file/folder with left one</source>
+<target>左側のものを右側のファイル/フォルダに上書き</target>
 <source>Do nothing</source>
 <target>何もしない</target>
-<source>Copy attributes only from right to left</source>
-<target>属性のみ右から左にコピー</target>
-<source>Copy attributes only from left to right</source>
-<target>属性のみ左から右にコピー</target>
+<source>Copy file attributes only to left</source>
+<target>ファイル属性のみ左側にコピー</target>
+<source>Copy file attributes only to right</source>
+<target>ファイル属性のみ右側にコピー</target>
 <source>Deleting file %x</source>
 <target>ファイル %x を削除中</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1016,6 +1010,8 @@ Transfer file and directory permissions
 <target>%x の属性を更新</target>
 <source>Source directory does not exist anymore:</source>
 <target>ソースディレクトリが存在しません:</target>
+<source>Generating database...</source>
+<target>データベースを作成中...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>構成設定に対応する同期がみつかりません!</target>
 <source>Target directory name must not be empty!</source>
@@ -1040,8 +1036,6 @@ Transfer file and directory permissions
 <target>複数ペアのディレクトリ設定部分に変更された箇所があります! 同期設定を再確認してみてください!</target>
 <source>Processing folder pair:</source>
 <target>フォルダペアを処理中:</target>
-<source>Generating database...</source>
-<target>データベースを作成中...</target>
 <source>Error copying locked file %x!</source>
 <target>コピーに失敗! ファイル%x はロックされています!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/korean.lng b/BUILD/Languages/korean.lng
index 30b2ef4f..a476f52c 100644
--- a/BUILD/Languages/korean.lng
+++ b/BUILD/Languages/korean.lng
@@ -17,8 +17,22 @@
 <target>실시간 동기화 - 자동 동기화</target>
 <source>Browse</source>
 <target>찾아보기</target>
+<source>Invalid commandline: "%x"</source>
+<target>잘못된 커맨드라인</target>
 <source>Error resolving symbolic link:</source>
 <target>심볼릭 링크를 해결하던 중 발생한 오류 :</target>
+<source>Show popup</source>
+<target>팝업 표시</target>
+<source>Show popup 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 synchronization settings</source>
 <target>대체 동기화 설정 선택</target>
 <source>No filter selected</source>
@@ -30,7 +44,7 @@
 <source>Remove alternate settings</source>
 <target>대체설정 제거</target>
 <source>Create a batch job</source>
-<target>일괄작업[Batch Job] 생성</target>
+<target>일괄작업 생성</target>
 <source>Synchronization settings</source>
 <target>동기화 설정</target>
 <source>Comparison settings</source>
@@ -48,7 +62,7 @@
 <source>Configure filter</source>
 <target>필터 설정</target>
 <source>Customize columns</source>
-<target>개인 설정 - 열 조정</target>
+<target>개인 설정 - 열(세로칸) 조정</target>
 <source>Global settings</source>
 <target>전체 설정</target>
 <source>Synchronization Preview</source>
@@ -119,14 +133,12 @@
 <target>정보</target>
 <source>Fatal Error</source>
 <target>치명적 오류</target>
+<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 writing file:</source>
-<target>파일을 쓰던 중 발생한 오류 :</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>유효하지 않은 FreeFileSync 설정 파일!</target>
 <source>/sec</source>
 <target>/초</target>
 <source>
@@ -169,7 +181,7 @@
 <source>1. Select directories to monitor.</source>
 <target>1. 모니터 대상이 될 디렉토리를 선택하세요.</target>
 <source>2. Enter a command line.</source>
-<target>2. 명령 줄(커맨드라인)을 입력하세요.</target>
+<target>2. 커맨드라인을 입력하세요.</target>
 <source>3. Press 'Start'.</source>
 <target>3. '시작'을 누르세요.</target>
 <source>
@@ -178,7 +190,7 @@ The command line is executed each time:
 - files within these directories or subdirectories are modified
 </source>
 <target>
-커멘드라인은 다음과 같은 경우에 매번 실행 됩니다:
+커맨드라인은 다음과 같은 경우에 매번 실행 됩니다:
 - 모든 디렉토리가 사용 가능할 경우 (예. USB 스틱 삽입시) 
 - 해당 디렉토리 또는 서브디렉토리 내의 파일이 변경될 경우
 </target>
@@ -191,11 +203,11 @@ The command line is executed each time:
 <source>Select a folder</source>
 <target>폴더 선택</target>
 <source>Command line</source>
-<target>명령 줄 (커맨드라인)</target>
+<target>커맨드라인</target>
 <source>Minimum Idle Time [seconds]</source>
-<target>최소 대기시간 [초]</target>
+<target>최소 대기시간 [초 단위]</target>
 <source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>마지막 변경내용 감지로부터 다음 커멘드라인 실행까지 대기시간 (초 단위)</target>
+<target>마지막 변경내용 감지로부터 다음 커맨드라인 실행까지 대기시간 [초 단위]</target>
 <source>Start</source>
 <target>시작</target>
 <source>(Build: %x)</source>
@@ -212,8 +224,6 @@ The command line is executed each time:
 <target>모니터링 활성화...</target>
 <source>Waiting for missing directories...</source>
 <target>누락 디렉토리 대기 중...</target>
-<source>Command line is empty!</source>
-<target>명령 줄 (커맨드라인)이 비어 있습니다!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>디렉토리 모니터링을 초기화 할 수 없습니다 :</target>
 <source>A directory input field is empty.</source>
@@ -227,7 +237,7 @@ The command line is executed each time:
 <source>Error moving file:</source>
 <target>파일 이동 중 발생한 오류 :</target>
 <source>Operation aborted!</source>
-<target>작업 중지!</target>
+<target>작업 중단!</target>
 <source>Target file already existing!</source>
 <target>대상 파일이 이미 존재합니다!</target>
 <source>Error moving directory:</source>
@@ -254,14 +264,20 @@ The command line is executed each time:
 <target>파일 복사 중 발생한 오류 :</target>
 <source>Error opening file:</source>
 <target>파일을 열던 중 발생한 오류 :</target>
+<source>Error writing file:</source>
+<target>파일을 쓰던 중 발생한 오류 :</target>
 <source>Error reading file:</source>
 <target>파일을 읽던 중 발생한 오류 :</target>
 <source>Endless loop when traversing directory:</source>
 <target>디렉토리 이동 중 무한 루프 발생 :</target>
 <source>Error traversing directory:</source>
 <target>디렉토리 이동 중 발생한 오류 :</target>
+<source>Windows Error Code %x:</source>
+<target>윈도우 에러 코드 %x:</target>
+<source>Linux Error Code %x:</source>
+<target>리눅스 에러 코드 %x:</target>
 <source>Error setting privilege:</source>
-<target>특권(프리빌리지) 설정 중 발생한 오류 :</target>
+<target>권한 설정 중 발생한 오류 :</target>
 <source>Error moving to Recycle Bin:</source>
 <target>휴지통으로 이동 중 발생한 오류 :</target>
 <source>Could not load a required DLL:</source>
@@ -284,30 +300,18 @@ The command line is executed each time:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>다음 XML 노드 값을 읽어 들일 수 없습니다 :</target>
-<source>Show popup</source>
-<target>팝업 표시</target>
-<source>Show popup 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>Logging</source>
 <target>로그 중</target>
 <source>FreeFileSync batch file</source>
-<target>FreeFileSync 일괄파일 [Batch File]</target>
+<target>FreeFileSync 일괄 파일</target>
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync 구성 설정</target>
 <source>FreeFileSync Batch Job</source>
-<target>FreeFileSync 일괄작업 [Batch Job]</target>
+<target>FreeFileSync 일괄 작업</target>
 <source>Unable to create logfile!</source>
 <target>로그파일 생성을 할 수 없습니다!</target>
 <source>Batch execution</source>
-<target>일괄작업 실행</target>
+<target>일괄 실행</target>
 <source>Log-messages:</source>
 <target>로그 메세지 :</target>
 <source>Stop</source>
@@ -353,7 +357,7 @@ The command line is executed each time:
 <source>&Global settings...</source>
 <target>전체 설정(&G)</target>
 <source>&Create batch job...</source>
-<target>일괄작업[Batch Job] 생성(&C)</target>
+<target>일괄작업 생성(&C)</target>
 <source>&Export file list...</source>
 <target>파일 리스트 내보내기(&E)</target>
 <source>&Advanced</source>
@@ -400,8 +404,8 @@ The command line is executed each time:
 <target>우측</target>
 <source>Batch job</source>
 <target>일괄 작업</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>자동 동기화 일괄작업을 위해 Batch File을 생성합니다. 일괄 모드를 시작하기 위해선, 실행 가능한 FreeFileSync 형식 : FreeFileSync.exe <batchfile>로 파일 이름을 지정해 주기만 하면 됩니다. 이 작업은 O/S(운영체제)의 작업관리자에서도 실행 가능합니다.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>자동 동기화를 위한 일괄파일 생성. 일괄모드 작업은 해당 파일을 더블클릭 하거나 커맨드라인: FreeFileSync.exe <일괄파일>을 통해 실행 가능합니다. 또한 운영체제(O/S)의 작업관리자에서도 예약할 수 있습니다.</target>
 <source>Help</source>
 <target>도움말</target>
 <source>Configuration overview:</source>
@@ -453,7 +457,7 @@ The command line is executed each time:
 <source>Update -></source>
 <target>업데이트 -></target>
 <source>Copy new or updated files to right folder.</source>
-<target>신규 또는 갱신 파일을 우측 폴더로 복사</target>
+<target>신규 또는 업데이트 된 파일을 우측 폴더로 복사</target>
 <source>Custom</source>
 <target>개인 설정</target>
 <source>Configure your own synchronization rules.</source>
@@ -468,18 +472,18 @@ The command line is executed each time:
 <target>카테고리</target>
 <source>Action</source>
 <target>실행</target>
-<source>Files/folders that exist on left side only</source>
-<target>좌측에만 존재하는 파일/폴더</target>
-<source>Files/folders that exist on right side only</source>
-<target>우측에만 존재하는 파일/폴더</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>파일이 양측 모두 존재하지만, 좌측이 더 신규인 파일.</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>파일이 양측 모두 존재하지만, 우측이 더 신규인 파일.</target>
-<source>Files that have different content</source>
-<target>내용이 다른 파일</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>분류할 수 없는 충돌/파일</target>
+<source>File/folder exists on left side only</source>
+<target>파일/폴더가 좌측에만 존재</target>
+<source>File/folder exists on right side only</source>
+<target>파일/폴더가 우측에만 존재</target>
+<source>Left file is newer</source>
+<target>좌측 파일이 더 최신</target>
+<source>Right file is newer</source>
+<target>우측 파일이 더 최신</target>
+<source>Files have different content</source>
+<target>파일 내용이 다름</target>
+<source>Conflict/file cannot be categorized</source>
+<target>충돌/파일 분류 불가능</target>
 <source>Compare by...</source>
 <target>대상 별 비교...</target>
 <source>
@@ -532,8 +536,8 @@ is the same
 <target>- 좌측에만 존재함</target>
 <source>- exists right only</source>
 <target>- 우측에만 존재함</target>
-<source>- conflict</source>
-<target>- 충돌/불일치</target>
+<source>- conflict (same date, different size)</source>
+<target>- 충돌/불일치 (날짜는 같으나, 크기가 다름)</target>
 <source>Compare by "File content"</source>
 <target>"파일 내용" 별 비교</target>
 <source>
@@ -551,7 +555,7 @@ With this option enabled the decision tree is smaller:
 <source>Source code written in C++ utilizing:</source>
 <target>소스코드는 C++ 언어로 아래 툴을 사용하여 작성되었습니다 :</target>
 <source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>FreeFileSync 현지화에 도움을 주신 분들께 깊은 감사 드립니다 :</target>
+<target>FreeFileSync 현지화에 도움을 주신 분들께 감사 드립니다 :</target>
 <source>Feedback and suggestions are welcome at:</source>
 <target>피드백 및 제안사항은 아래로 보내 주십시오 :</target>
 <source>FreeFileSync at Sourceforge</source>
@@ -569,7 +573,7 @@ With this option enabled the decision tree is smaller:
 <source>Published under the GNU General Public License:</source>
 <target>GNU 일반 공용 라이센스에 의한 출시 :</target>
 <source>Ignore subsequent errors</source>
-<target>이후 오류 무시</target>
+<target>이후 일어나는 오류 무시</target>
 <source>Hide further error messages during the current process</source>
 <target>현재 처리과정 동안 추가오류 메세지 숨기기</target>
 <source>&Ignore</source>
@@ -579,7 +583,7 @@ With this option enabled the decision tree is smaller:
 <source>Do not show this dialog again</source>
 <target>다음부터 표시하지 않음</target>
 <source>&Switch</source>
-<target>전환[Switch](&S)</target>
+<target>스위치[전환](&S)</target>
 <source>&Yes</source>
 <target>예(&Y)</target>
 <source>&No</source>
@@ -631,9 +635,9 @@ Exclude: \stuff\temp\*
 <source>&Default</source>
 <target>기본 설정/값(&D)</target>
 <source>Move column up</source>
-<target>열(컬럼) 위로 이동</target>
+<target>열 위로 이동</target>
 <source>Move column down</source>
-<target>열(컬럼) 아래로 이동</target>
+<target>열 아래로 이동</target>
 <source>Copy locked files</source>
 <target>락 걸린 파일 복사</target>
 <source>
@@ -677,7 +681,7 @@ Transfer file and directory permissions
 <source>You may try to synchronize remaining items again (WITHOUT having to re-compare)!</source>
 <target>잔여 아이템에 대한 동기화를 (다시 비교할 필요없이) 재시도할 수 있습니다!</target>
 <source>Batch file created successfully!</source>
-<target>일괄작업파일[Batch File]이 성공적으로 생성 됐습니다!</target>
+<target>일괄 파일이 성공적으로 생성 됐습니다!</target>
 <source>Main bar</source>
 <target>메인 바</target>
 <source>Folder pairs</source>
@@ -700,18 +704,16 @@ Transfer file and directory permissions
 <target><복수 선택></target>
 <source>D-Click</source>
 <target>D-클릭</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>클립보드에 복사 CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>파일 삭제	DEL</target>
+<source>Delete</source>
+<target>삭제</target>
 <source>Customize...</source>
 <target>개인 설정화...</target>
 <source>Auto-adjust columns</source>
 <target>열 자동정렬</target>
 <source>Include all rows</source>
-<target>모든 행(로우) 포함</target>
+<target>모든 행 포함</target>
 <source>Exclude all rows</source>
-<target>전체 행(로우) 제외</target>
+<target>전체 행 제외</target>
 <source>Reset view</source>
 <target>보기 리셋</target>
 <source>Show "%x"</source>
@@ -825,11 +827,11 @@ Transfer file and directory permissions
 <source>Paused</source>
 <target>일시정지 중</target>
 <source>Aborted</source>
-<target>중지됨</target>
+<target>중단됨</target>
 <source>Completed</source>
 <target>완료</target>
 <source>Abort requested: Waiting for current operation to finish...</source>
-<target>사용자에 의한 작업 중지 : 현재 작업 종료 대기 중...</target>
+<target>사용자에 의한 작업 중단 : 현재 작업 종료 대기 중...</target>
 <source>Continue</source>
 <target>계속</target>
 <source>Pause</source>
@@ -842,14 +844,10 @@ Transfer file and directory permissions
 <target>양측 모두에 파일이 존재</target>
 <source>on one side only</source>
 <target>한쪽에만 존재</target>
-<source>- left</source>
-<target>- 좌측</target>
-<source>- right</source>
-<target>- 우측</target>
-<source>different</source>
-<target>다름</target>
-<source>- conflict (same date, different size)</source>
-<target>- 충돌/불일치 (날짜는 같으나, 크기가 다름)</target>
+<source>same date</source>
+<target>같은 날짜</target>
+<source>different date</source>
+<target>다른 날짜</target>
 <source>Inactive</source>
 <target>비활성화</target>
 <source>Second</source>
@@ -913,7 +911,7 @@ Transfer file and directory permissions
 <source>Versioning</source>
 <target>버저닝</target>
 <source>Move files into a time-stamped subdirectory</source>
-<target>파일을 타임 스탬프 된 서브 폴더로 이동</target>
+<target>파일을 타임스탬프 된 서브 폴더로 이동</target>
 <source>Cannot determine sync-direction:</source>
 <target>동기화 방향을 결정할 수 없습니다 :</target>
 <source>Filter settings have changed!</source>
@@ -925,9 +923,9 @@ Transfer file and directory permissions
 <source>The file was not processed by last synchronization!</source>
 <target>이 파일은 마지막 동기화에서 처리되지 않았습니다!</target>
 <source>Planned directory deletion is in conflict with its subdirectories and -files!</source>
-<target>디렉토리를 삭제하면 서브디렉토리 및 파일과 충돌하게 됩니다!</target>
+<target>디렉토리를 삭제하면 서브 디렉토리 및 파일과 충돌하게 됩니다!</target>
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
-<target>기본값 동기화 방향 설정 : 이전 파일들은 신규 파일들로 덮어쓰여 집니다.</target>
+<target>기본값 동기화 방향 설정 : 이전 파일들은 신규 파일들로 덮어 쓰여집니다.</target>
 <source>The file does not contain a valid configuration:</source>
 <target>이 파일은 유효한 설정 값을 갖고 있지 않습니다 :</target>
 <source>Scanning:</source>
@@ -939,7 +937,7 @@ Transfer file and directory permissions
 <source>Directory does not exist:</source>
 <target>디렉토리가 존재하지 않습니다 :</target>
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
-<target>디렉토리가 의존 관계에 있습니다. 동기화 규칙설정시, 주의하십시오.</target>
+<target>디렉토리가 의존 관계에 있습니다. 동기화 규칙 설정시 주의하십시오.</target>
 <source>Comparing content of files %x</source>
 <target>파일 %x 내용 별 비교 중</target>
 <source>Memory allocation failed!</source>
@@ -958,28 +956,28 @@ Transfer file and directory permissions
 <target>파일 리스트 생성 중...</target>
 <source>Multiple...</source>
 <target>다중처리 (멀티플) 작업...</target>
-<source>Files that are equal on both sides</source>
-<target>양측 모두 동일한 파일</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>속성만 다른 동일 파일/폴더</target>
-<source>Copy from right to left</source>
-<target>우측에서 좌측으로 복사</target>
-<source>Copy from left to right</source>
-<target>좌측에서 우측으로 복사</target>
-<source>Delete files/folders existing on left side only</source>
-<target>좌측에만 존재하는 파일/폴더 삭제</target>
-<source>Delete files/folders existing on right side only</source>
-<target>우측에만 존재하는 파일/폴더 삭제</target>
-<source>Copy from right to left overwriting</source>
-<target>우측에서 좌측으로 덮어쓰기 복사</target>
-<source>Copy from left to right overwriting</source>
-<target>좌측에서 우측으로 덮어쓰기 복사</target>
+<source>Both sides are equal</source>
+<target>양측이 같음</target>
+<source>Files/folders differ in attributes only</source>
+<target>파일/폴더가 속성만 다름</target>
+<source>Copy new file/folder to left</source>
+<target>신규 파일/폴더를 좌측으로 복사</target>
+<source>Copy new file/folder to right</source>
+<target>신규 파일/폴더를 우측으로 복사</target>
+<source>Delete left file/folder</source>
+<target>남은 파일/폴더 삭제</target>
+<source>Delete right file/folder</source>
+<target>우측 파일/폴더 삭제</target>
+<source>Overwrite left file/folder with right one</source>
+<target>우측 파일/폴더로 좌측 파일/폴더 덮어쓰기</target>
+<source>Overwrite right file/folder with left one</source>
+<target>좌측 파일/폴더로 우측 파일/폴더 덮어쓰기</target>
 <source>Do nothing</source>
 <target>아무 것도 하지 않음</target>
-<source>Copy attributes only from right to left</source>
-<target>속성만 우측에서 좌측으로 복사</target>
-<source>Copy attributes only from left to right</source>
-<target>속성만 좌측에서 우측으로 복사</target>
+<source>Copy file attributes only to left</source>
+<target>파일 속성만 좌측으로 복사</target>
+<source>Copy file attributes only to right</source>
+<target>파일 속성만 우측으로 복사</target>
 <source>Deleting file %x</source>
 <target>파일 %x 삭제 중</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1010,18 +1008,20 @@ Transfer file and directory permissions
 <target>%x 속성 업데이트</target>
 <source>Source directory does not exist anymore:</source>
 <target>소스 디렉토리가 더 이상 존재하지 않습니다 :</target>
+<source>Generating database...</source>
+<target>데이터베이스 생성 중...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>구성 설정에 따라 동기화 할 내용이 없습니다!</target>
 <source>Target directory name must not be empty!</source>
 <target>대상 디렉토리 이름이 비어서는 안 됩니다!</target>
 <source>User-defined directory for deletion was not specified!</source>
-<target>삭제를 위한 사용자 지정 디렉토리가 정해지지 않았습니다!</target>
+<target>삭제하려는 사용자 지정 디렉토리가 정해지지 않았습니다!</target>
 <source>Unresolved conflicts existing!</source>
 <target>해결되지 않은 충돌이 있습니다!</target>
 <source>You can ignore conflicts and continue synchronization.</source>
 <target>충돌을 무시하고 동기화를 계속할 수 있습니다.</target>
 <source>Significant difference detected:</source>
-<target>중대한 차이가 감지 됐습니다 :</target>
+<target>상당한 차이가 감지됐습니다 :</target>
 <source>More than 50% of the total number of files will be copied or deleted!</source>
 <target>총 파일 개수의 50% 이상이 복사되거나 삭제 됩니다!</target>
 <source>Not enough free disk space available in:</source>
@@ -1034,8 +1034,6 @@ Transfer file and directory permissions
 <target>다중폴더 페어의 일부인 디렉토리가 변경됩니다. 동기화 설정을 재검토해 주세요.</target>
 <source>Processing folder pair:</source>
 <target>폴더 페어 처리 중 :</target>
-<source>Generating database...</source>
-<target>데이터베이스 생성 중...</target>
 <source>Error copying locked file %x!</source>
 <target>복사 실패! 파일 %x 에 락이 걸려 있습니다.</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng
index f4c059a6..a4fec878 100644
--- a/BUILD/Languages/polish.lng
+++ b/BUILD/Languages/polish.lng
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Automatyczna Synchronizacja</target>
 <source>Browse</source>
 <target>Przeglądaj</target>
+<source>Invalid commandline: "%x"</source>
+<target>Nieprawidłowa komenda: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Błąd odczytu dowiązania symbolicznego:</target>
+<source>Show popup</source>
+<target>Pokaż okno popup</target>
+<source>Show popup on errors or warnings</source>
+<target>Pokaż okno popup 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ź natychmiastowo</target>
+<source>Abort synchronization immediately</source>
+<target>Natychmiast zakończ synchronizację</target>
 <source>Select alternate synchronization settings</source>
 <target>Stwórz alternatywne reguły synchronizacji</target>
 <source>No filter selected</source>
@@ -129,8 +143,6 @@
 <target>Plik nie istnieje:</target>
 <source>Error parsing configuration file:</source>
 <target>Błąd parsowania pliku konfiguracyjnego:</target>
-<source>Error writing file:</source>
-<target>Błąd zapisu pliku:</target>
 <source>/sec</source>
 <target>/sekundę</target>
 <source>
@@ -222,8 +234,6 @@ Komenda jest wykonwywana za każdym razem gdy:
 <target>Monitorowanie aktywne...</target>
 <source>Waiting for missing directories...</source>
 <target>Oczekiwanie na brakujące katalogi...</target>
-<source>Command line is empty!</source>
-<target>Linia komend jest pusta!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Nie można uruchomić monitora katalogów:</target>
 <source>A directory input field is empty.</source>
@@ -264,12 +274,18 @@ Komenda jest wykonwywana za każdym razem gdy:
 <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>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>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 setting privilege:</source>
 <target>Błąd ustawiania uprawnień:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -294,18 +310,6 @@ Komenda jest wykonwywana za każdym razem gdy:
 <target>%x%</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>Show popup</source>
-<target>Pokaż okno popup</target>
-<source>Show popup on errors or warnings</source>
-<target>Pokaż okno popup 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ź natychmiastowo</target>
-<source>Abort synchronization immediately</source>
-<target>Natychmiast zakończ synchronizację</target>
 <source>Logging</source>
 <target>Tworzenie logów</target>
 <source>FreeFileSync batch file</source>
@@ -410,8 +414,8 @@ Komenda jest wykonwywana za każdym razem gdy:
 <target>Prawy</target>
 <source>Batch job</source>
 <target>Plik wsadowy</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Twórz plik wsadowy dla automatyzacji procesu. By rozpocząć prace w tym trybie zwyczajnie uruchom plik klikając dwa razy lub dodaj go do zadań zaplanowanych Twojego systemu. Plik wsadowy może być również przekazywany jako parametr do programu w postaci: FreeFileSync.exe <plikwsadowy>.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Utwórz plik wsadowy dla automatycznej synchronizacji. Aby uruchomić synchronizację w trybie wsadowym po prostu kliknij dwa razy na plik lub uruchom go z konsoli: FreeFileSync.exe <plikwsadowy>. Możesz to dodać do programu planującego zadania w Twoim systemie.</target>
 <source>Help</source>
 <target>Pomoc</target>
 <source>Configuration overview:</source>
@@ -478,18 +482,18 @@ Komenda jest wykonwywana za każdym razem gdy:
 <target>Kategoria</target>
 <source>Action</source>
 <target>Akcja</target>
-<source>Files/folders that exist on left side only</source>
-<target>Pliki/katalogi istniejące tylko po lewej stronie</target>
-<source>Files/folders that exist on right side only</source>
-<target>Pliki/katalogi istniejące tylko po prawej stronie</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Pliki, które istnieją po obu stronach, lewa strona jest nowsza</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Pliki, które istnieją po obu stronach, prawa strona jest nowsza</target>
-<source>Files that have different content</source>
-<target>Pliki, które mają różną zawartość</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Konflikty/pliki, które nie mogą być skategoryzowane</target>
+<source>File/folder exists on left side only</source>
+<target>Plik/folder istnieje tylko po lewej stronie</target>
+<source>File/folder exists on right side only</source>
+<target>Plik/folder istnieje tylko po prawej stronie</target>
+<source>Left file is newer</source>
+<target>Lewy plik jest nowszy</target>
+<source>Right file is newer</source>
+<target>Prawy plik jest nowszy</target>
+<source>Files have different content</source>
+<target>Pliki różnią się zawartością</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Konflikt/plik nie może zostać skategoryzowany</target>
 <source>Compare by...</source>
 <target>Porównaj przez...</target>
 <source>
@@ -712,10 +716,8 @@ Transfer uprawnień plików i katalogów
 <target><zaznaczone elementy></target>
 <source>D-Click</source>
 <target>Podw. kliknięcie</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Kopiuj do pamięci	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Usuń	DEL</target>
+<source>Delete</source>
+<target>Usuń</target>
 <source>Customize...</source>
 <target>Dostosuj...</target>
 <source>Auto-adjust columns</source>
@@ -806,7 +808,11 @@ Transfer uprawnień plików i katalogów
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
 </source>
-<target></target>
+<target>
+<pluralform>Obiekt pomyślnie usunięty!</pluralform>
+<pluralform>%x obiekty pomyślnie usunięte!</pluralform>
+<pluralform>%x pomyślnie usuniętych!</pluralform>
+</target>
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
@@ -859,9 +865,9 @@ Transfer uprawnień plików i katalogów
 <source>on one side only</source>
 <target>tylko po jednej stronie</target>
 <source>same date</source>
-<target></target>
+<target>ta sama data</target>
 <source>different date</source>
-<target></target>
+<target>różna data</target>
 <source>Inactive</source>
 <target>Nieaktywny</target>
 <source>Second</source>
@@ -974,28 +980,28 @@ Transfer uprawnień plików i katalogów
 <target>Generowanie listy plików...</target>
 <source>Multiple...</source>
 <target>Wiele...</target>
-<source>Files that are equal on both sides</source>
-<target>Pliki równe po obu stronach</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Pliki/foldery różniące się tylko atrybutami</target>
-<source>Copy from right to left</source>
-<target>Kopiuj z prawej do lewej</target>
-<source>Copy from left to right</source>
-<target>Kopiuj z lewej do prawej</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Usuń pliki/foldery istniejące tylko po lewej stronie</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Usuń pliki/foldery istniejące tylko po prawej stronie</target>
-<source>Copy from right to left overwriting</source>
-<target>Kopiuj z prawej do lewej nadpisując</target>
-<source>Copy from left to right overwriting</source>
-<target>Kopiuj z lewej do prawej nadpisując</target>
+<source>Both sides are equal</source>
+<target>Obie strony są równe</target>
+<source>Files/folders differ in attributes only</source>
+<target>Pliki/foldery różnią się tylko atrybutami</target>
+<source>Copy new file/folder to left</source>
+<target>Skopiuj nowy plik/katalog na lewą stroną</target>
+<source>Copy new file/folder to right</source>
+<target>Skopiuj nowy plik/katalog na prawą stroną</target>
+<source>Delete left file/folder</source>
+<target>Usuń plik/katalog po lewej stronie</target>
+<source>Delete right file/folder</source>
+<target>Usuń plik/katalog po prawej stronie</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Nadpisz plik/katalog po lewej stronie tym po prawej</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Nadpisz plik/katalog po prawej stronie tym po lewej</target>
 <source>Do nothing</source>
 <target>Nic nie rób</target>
-<source>Copy attributes only from right to left</source>
-<target>Kopiuj atrybuty tylko z prawej strony</target>
-<source>Copy attributes only from left to right</source>
-<target>Kopiuj atrybuty tylko z lewej strony</target>
+<source>Copy file attributes only to left</source>
+<target>Kopiuj atrybuty plików tylko na lewą stronę</target>
+<source>Copy file attributes only to right</source>
+<target>Kopiuj atrybuty plików tylko na prawą stronę</target>
 <source>Deleting file %x</source>
 <target>Usuwanie pliku %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1026,6 +1032,8 @@ Transfer uprawnień plików i katalogów
 <target>Aktualizowanie atrybutów %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>Katalog źródłowy nie istnieje:</target>
+<source>Generating database...</source>
+<target>Generowanie bazy danych...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Brak elementów do synchronizacji!</target>
 <source>Target directory name must not be empty!</source>
@@ -1050,8 +1058,6 @@ Transfer uprawnień plików i katalogów
 <target>Katalog zostanie zmodyfikowany w efekcie synchronizacji wielu par folderów! Zweryfikuj ustawienia synchronizacji!</target>
 <source>Processing folder pair:</source>
 <target>Przetwarzanie folderów:</target>
-<source>Generating database...</source>
-<target>Generowanie bazy danych...</target>
 <source>Error copying locked file %x!</source>
 <target>Błąd podczas kopiowania zablokowanego pliku %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index 7198044d..d64f02f5 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -8,7 +8,7 @@
 </header>
 
 <source>Show in Explorer</source>
-<target></target>
+<target>Mostrar no Explorer</target>
 <source>Open with default application</source>
 <target>Abrir com a aplicação associada</target>
 <source>Browse directory</source>
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Sincronização Automática</target>
 <source>Browse</source>
 <target>Procurar</target>
+<source>Invalid commandline: "%x"</source>
+<target>Comando inválido: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Erro na resolução do link simbólico:</target>
+<source>Show popup</source>
+<target>Mostrar popups</target>
+<source>Show popup on errors or warnings</source>
+<target>Mostrar popup c/ 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 synchronization settings</source>
 <target>Seleccionar opções alternativas de sincronização</target>
 <source>No filter selected</source>
@@ -58,7 +72,7 @@
 <source>%x MB</source>
 <target>%x MB</target>
 <source>%x KB</source>
-<target></target>
+<target>%x KB</target>
 <source>%x GB</source>
 <target>%x GB</target>
 <source>
@@ -66,6 +80,8 @@
 <pluralform>%x Bytes</pluralform>
 </source>
 <target>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
 </target>
 <source><Symlink></source>
 <target><Link Simbólico></target>
@@ -112,19 +128,19 @@
 <pluralform>%x sec</pluralform>
 </source>
 <target>
+<pluralform>1 seg</pluralform>
+<pluralform>%x segs</pluralform>
 </target>
 <source>Info</source>
 <target>Info</target>
 <source>Fatal Error</source>
 <target>Erro fatal</target>
+<source>Invalid FreeFileSync config file!</source>
+<target>Ficheiro de configuração do FreeFileSync 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 writing file:</source>
-<target>Erro de escrita no ficheiro:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>Ficheiro de configuração do FreeFileSync inválido!</target>
 <source>/sec</source>
 <target>/seg</target>
 <source>
@@ -132,33 +148,39 @@
 <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>S&ave configuration...</source>
 <target>G&uardar a configuração...</target>
 <source>&Load configuration...</source>
 <target>&Carregar configuração...</target>
 <source>&Quit</source>
-<target>&Sair</target>
+<target>S&air</target>
 <source>&File</source>
 <target>&Ficheiro</target>
 <source>&Content</source>
-<target>&Conteúdo</target>
+<target>C&onteúdo</target>
 <source>&About...</source>
 <target>&Sobre...</target>
 <source>&Help</source>
-<target>&Ajuda</target>
+<target>A&juda</target>
 <source>Usage:</source>
 <target>Uso:</target>
 <source>1. Select directories to monitor.</source>
@@ -204,11 +226,9 @@ A linha de comandos é executada cada vez que:
 <source>&Exit</source>
 <target>&Sair</target>
 <source>Monitoring active...</source>
-<target>Monitorizar activo...</target>
+<target>Monitorizar activado...</target>
 <source>Waiting for missing directories...</source>
 <target>Aguardar pelos directórios em falta...</target>
-<source>Command line is empty!</source>
-<target>Linha de comandos vazia!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Não é possível iniciar monitorização do directório:</target>
 <source>A directory input field is empty.</source>
@@ -216,7 +236,7 @@ A linha de comandos é executada cada vez que:
 <source>Error when monitoring directories.</source>
 <target>Erro ao monitorizar os directórios.</target>
 <source>Drag && drop</source>
-<target>Pegar && largar</target>
+<target>Arrastar && Largar</target>
 <source>Conversion error:</source>
 <target>Erro de conversão:</target>
 <source>Error moving file:</source>
@@ -249,12 +269,18 @@ A linha de comandos é executada cada vez que:
 <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>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>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 setting privilege:</source>
 <target>Erro ao estabelecer privilégios:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -279,18 +305,6 @@ A linha de comandos é executada cada vez que:
 <target>%x%</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>Show popup</source>
-<target>Mostrar popups</target>
-<source>Show popup on errors or warnings</source>
-<target>Mostrar popup c/ 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 ou aviso</target>
-<source>Exit instantly</source>
-<target>Sair imediatamente</target>
-<source>Abort synchronization immediately</source>
-<target>Abortar sincronização imediatamente</target>
 <source>Logging</source>
 <target>A escrever em log</target>
 <source>FreeFileSync batch file</source>
@@ -395,8 +409,8 @@ A linha de comandos é executada cada vez que:
 <target>Direita</target>
 <source>Batch job</source>
 <target>Ficheiro Batch</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Criar um batch para sincronização automática. Para iniciar o modo batch, passar o nome do ficheiro para o executável do FreeFileSync: FreeFileSync.exe <ficheiro batch>. Também pode ser calendarizado no programador de tarefas.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Criar um batch para sincronização automática. Para iniciar o batch, basta fazer duplo-clique no ficheiro ou executar via linha de comandos: FreeFileSync.exe <batch>. Também pode ser inserido no programador de tarefas do sistema operativo.</target>
 <source>Help</source>
 <target>Ajuda</target>
 <source>Configuration overview:</source>
@@ -463,18 +477,18 @@ A linha de comandos é executada cada vez que:
 <target>Categoria</target>
 <source>Action</source>
 <target>Acção</target>
-<source>Files/folders that exist on left side only</source>
-<target>Ficheiros/pastas existentes somente à esquerda</target>
-<source>Files/folders that exist on right side only</source>
-<target>Ficheiros/pastas existentes somente à direita</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Ficheiros existentes dos dois lados, à esquerda é mais recente</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Ficheiros existentes dos dois lados, à direita é mais recente</target>
-<source>Files that have different content</source>
-<target>Ficheiros com conteúdo diferente</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Conflitos/ficheiros que não podem ser categorizados</target>
+<source>File/folder exists on left side only</source>
+<target>Ficheiro/pasta existe apenas à esquerda</target>
+<source>File/folder exists on right side only</source>
+<target>Ficheiro/pasta existe apenas à direita</target>
+<source>Left file is newer</source>
+<target>Ficheiro mais recente à esquerda</target>
+<source>Right file is newer</source>
+<target>Ficheiro mais recente à direita</target>
+<source>Files have different content</source>
+<target>Ficheiros são diferentes</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Ficheiro/conflito não pode ser categorizado</target>
 <source>Compare by...</source>
 <target>Comparar por...</target>
 <source>
@@ -527,8 +541,8 @@ Os ficheiros são considerados iguais se
 <target>- existe apenas à esquerda</target>
 <source>- exists right only</source>
 <target>- existe apenas à direita</target>
-<source>- conflict</source>
-<target>- conflito</target>
+<source>- conflict (same date, different size)</source>
+<target>- conflito (mesma data, tamanho diferente)</target>
 <source>Compare by "File content"</source>
 <target>Comparar por "Conteúdo dos ficheiros"</target>
 <source>
@@ -544,7 +558,7 @@ Com esta opção, a arvoré de decisão é menor:
 <source>- different</source>
 <target>- ficheiros diferentes</target>
 <source>Source code written in C++ utilizing:</source>
-<target></target>
+<target>Código fonte escrito em C++ usando:</target>
 <source>Big thanks for localizing FreeFileSync goes out to:</source>
 <target>Pela tradução de FreeFileSync, um agradecimento a:</target>
 <source>Feedback and suggestions are welcome at:</source>
@@ -589,7 +603,10 @@ Com esta opção, a arvoré de decisão é menor:
 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></target>
+<target>
+Apenas ficheiros/directórios que coincidam com as opções de filtros vão ser seleccionados para sincronização.
+Nota: Os filtros devem ser especificados em relação aos directórios principais de sincronização.
+</target>
 <source>Hints:</source>
 <target>Dicas:</target>
 <source>1. Enter relative file or directory names separated by ';' or a new line.</source>
@@ -604,7 +621,10 @@ Note: The name filter must be specified relative(!) to main synchronization dire
 Include: *.doc;*.zip;*.exe
 Exclude: \stuff\temp\*
 </source>
-<target></target>
+<target>
+Incluir: *.doc;*.zip;*.exe
+Excluir: \stuff\temp\*
+</target>
 <source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
 <target>Sincronizar todos os ficheiros .doc, .zip e .exe excepto os da pasta "temp".</target>
 <source>Include</source>
@@ -612,11 +632,11 @@ Exclude: \stuff\temp\*
 <source>Exclude</source>
 <target>Excluir</target>
 <source>Select time span:</source>
-<target></target>
+<target>Selecionar intervalo de tempo:</target>
 <source>Minimum file size:</source>
-<target></target>
+<target>Tamanho mínimo de ficheiro:</target>
 <source>Maximum file size:</source>
-<target></target>
+<target>Tamanho máximo de ficheiro:</target>
 <source>&Default</source>
 <target>&Config. Iniciais</target>
 <source>Move column up</source>
@@ -686,13 +706,11 @@ Transferir ficheiro e permissões
 <source>Exclude via filter:</source>
 <target>Excluir por filtro:</target>
 <source><multiple selection></source>
-<target><Selecção Múltipla></target>
+<target><selecção múltipla></target>
 <source>D-Click</source>
 <target>Duplo Clique</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Copiar para a Área de transferência	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Eliminar ficheiros	DEL</target>
+<source>Delete</source>
+<target>Eliminar</target>
 <source>Customize...</source>
 <target>Personalizar...</target>
 <source>Auto-adjust columns</source>
@@ -784,24 +802,32 @@ Transferir ficheiro e permissões
 <pluralform>%x objects deleted successfully!</pluralform>
 </source>
 <target>
+<pluralform>Objecto eliminado com sucesso!</pluralform>
+<pluralform>%x objectos eliminados com sucesso!</pluralform>
 </target>
 <source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
 <target>
+<pluralform>1 directório</pluralform>
+<pluralform>%x directórios</pluralform>
 </target>
 <source>
 <pluralform>1 file</pluralform>
 <pluralform>%x files</pluralform>
 </source>
 <target>
+<pluralform>1 ficheiro</pluralform>
+<pluralform>%x ficheiros</pluralform>
 </target>
 <source>
 <pluralform>%x of 1 row in view</pluralform>
 <pluralform>%x of %y rows in view</pluralform>
 </source>
 <target>
+<pluralform>%x de 1 linha em vista</pluralform>
+<pluralform>%x de %y linhas em vista</pluralform>
 </target>
 <source>Scanning...</source>
 <target>A pesquisar...</target>
@@ -827,30 +853,26 @@ Transferir ficheiro e permissões
 <target>ficheiro existente em ambos os lados</target>
 <source>on one side only</source>
 <target>ficheiro existente apenas num lado</target>
-<source>- left</source>
-<target>- esquerda</target>
-<source>- right</source>
-<target>- direita</target>
-<source>different</source>
-<target>ficheiros diferentes</target>
-<source>- conflict (same date, different size)</source>
-<target>- conflito (mesma data, tamanho diferente)</target>
+<source>same date</source>
+<target>data igual</target>
+<source>different date</source>
+<target>data diferente</target>
 <source>Inactive</source>
-<target></target>
+<target>Inactivo</target>
 <source>Second</source>
-<target></target>
+<target>Segundo</target>
 <source>Minute</source>
-<target></target>
+<target>Minuto</target>
 <source>Hour</source>
-<target></target>
+<target>Hora</target>
 <source>Day</source>
-<target></target>
+<target>Dia</target>
 <source>Byte</source>
-<target></target>
+<target>Byte</target>
 <source>KB</source>
-<target></target>
+<target>KB</target>
 <source>MB</source>
-<target></target>
+<target>MB</target>
 <source>Filter: All pairs</source>
 <target>Filtro: Todos os pares</target>
 <source>Filter: Single pair</source>
@@ -878,12 +900,16 @@ Transferir ficheiro e permissões
 <pluralform>Do you really want to move the following %x objects to the Recycle Bin?</pluralform>
 </source>
 <target>
+<pluralform>Deseja mesmo mover o seguinte objecto para a Reciclagem?</pluralform>
+<pluralform>Deseja mesmo mover os seguintes %x objectos para a Reciclagem?</pluralform>
 </target>
 <source>
 <pluralform>Do you really want to delete the following object?</pluralform>
 <pluralform>Do you really want to delete the following %x objects?</pluralform>
 </source>
 <target>
+<pluralform>Deseja mesmo eliminar o seguinte objecto?</pluralform>
+<pluralform>Deseja mesmo eliminar os seguintes %x objectos?</pluralform>
 </target>
 <source>Leave as unresolved conflict</source>
 <target>Deixar como conflito</target>
@@ -894,7 +920,7 @@ Transferir ficheiro e permissões
 <source>Use Recycle Bin when deleting or overwriting files</source>
 <target>Utilizar Reciclagem ao apagar ou substituir ficheiros</target>
 <source>Versioning</source>
-<target></target>
+<target>Manter versões anteriores</target>
 <source>Move files into a time-stamped subdirectory</source>
 <target>Mover ficheiros para uma pasta com a data</target>
 <source>Cannot determine sync-direction:</source>
@@ -941,28 +967,28 @@ Transferir ficheiro e permissões
 <target>A gerar lista ficheiros...</target>
 <source>Multiple...</source>
 <target>Multiplo...</target>
-<source>Files that are equal on both sides</source>
-<target>Ficheiros iguais dos dois lados</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Ficheiros/Pastas iguais que diferem apenas nos atributos</target>
-<source>Copy from right to left</source>
-<target>Copiar da direita para a esquerda</target>
-<source>Copy from left to right</source>
-<target>Copiar da esquerda para a direita</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Eliminar itens existentes apenas no lado esquerdo</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Eliminar itens existentes apenas no lado direito</target>
-<source>Copy from right to left overwriting</source>
-<target>Copiar da direita para a esquerda com sobreposição</target>
-<source>Copy from left to right overwriting</source>
-<target>Copiar da esquerda para a direita com sobreposição</target>
+<source>Both sides are equal</source>
+<target>Ambos os lados iguais</target>
+<source>Files/folders differ in attributes only</source>
+<target>Ficheiros/pastas diferem apenas nos atributos</target>
+<source>Copy new file/folder to left</source>
+<target>Copiar novo ficheiro/pasta para a esquerda</target>
+<source>Copy new file/folder to right</source>
+<target>Copiar novo ficheiro/pasta para a direita</target>
+<source>Delete left file/folder</source>
+<target>Eliminar ficheiro/pasta à esquerda</target>
+<source>Delete right file/folder</source>
+<target>Eliminar ficheiro/pasta à direita</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Substituir ficheiro/pasta da esquerda (pelo da direita)</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Substituir ficheiro/pasta da direita (pelo da esquerda)</target>
 <source>Do nothing</source>
 <target>Não fazer nada</target>
-<source>Copy attributes only from right to left</source>
-<target>Copiar atributos apenas da direita para a esquerda</target>
-<source>Copy attributes only from left to right</source>
-<target>Copiar atributos apenas da esquerda para a direita</target>
+<source>Copy file attributes only to left</source>
+<target>Copiar apenas atributos de ficheiro para a esquerda</target>
+<source>Copy file attributes only to right</source>
+<target>Copiar apenas atributos de ficheiro para a direita</target>
 <source>Deleting file %x</source>
 <target>Apagar ficheiro %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -993,10 +1019,12 @@ Transferir ficheiro e permissões
 <target>Actualizar atributos de %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>A pasta de origem já não existe:</target>
+<source>Generating database...</source>
+<target>A gerar base de dados...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Nada a sincronizar de acordo com a configuração!</target>
 <source>Target directory name must not be empty!</source>
-<target></target>
+<target>Nome do directório de destino não pode estar vazio!</target>
 <source>User-defined directory for deletion was not specified!</source>
 <target>Directório para eliminação não foi especificado!</target>
 <source>Unresolved conflicts existing!</source>
@@ -1017,8 +1045,6 @@ Transferir ficheiro e permissões
 <target>Um directório que pertencente a conjunto de vários directórios vai ser alterado! Por favor, verifique as opções de sincronização!</target>
 <source>Processing folder pair:</source>
 <target>A processar o par do directorio:</target>
-<source>Generating database...</source>
-<target>A gerar base de dados...</target>
 <source>Error copying locked file %x!</source>
 <target>Erro ao copiar ficheiro bloqueado %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng
index a7827513..57a63970 100644
--- a/BUILD/Languages/portuguese_br.lng
+++ b/BUILD/Languages/portuguese_br.lng
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Sincronização Automatizada</target>
 <source>Browse</source>
 <target>Procurar</target>
+<source>Invalid commandline: "%x"</source>
+<target>Comando de linha inválido: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Erro na resolução de link simbólico:</target>
+<source>Show popup</source>
+<target>Mostrar popup</target>
+<source>Show popup on errors or warnings</source>
+<target>Mostrar popup com 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 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 synchronization settings</source>
 <target>Selecionar configuração de sincronização alternativa</target>
 <source>No filter selected</source>
@@ -94,9 +108,9 @@
 <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 bancos de dados do FreeFileSync ainda não existe:</target>
+<target>Um dos arquivos de banco de dados do FreeFileSync ainda não existe:</target>
 <source>One of the FreeFileSync database entries within the following file is not yet existing:</source>
-<target>Um das entradas do bancos de dados do FreeFileSync dentro do seguinte arquivo ainda não existe:</target>
+<target>Um das entradas do banco de dados do FreeFileSync dentro do seguinte arquivo 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>An exception occurred!</source>
@@ -121,14 +135,12 @@
 <target>Info</target>
 <source>Fatal Error</source>
 <target>Erro fatal</target>
+<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 writing file:</source>
-<target>Erro ao escrever arquivo:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>Arquivo de configuração do FreeFileSync inválido!</target>
 <source>/sec</source>
 <target>/seg</target>
 <source>
@@ -194,7 +206,7 @@ A linha de comando é executada cada vez que:
 <source>Remove folder</source>
 <target>Remover pasta</target>
 <source>Select a folder</source>
-<target>Selecione uma pasta</target>
+<target>Selecionar uma pasta</target>
 <source>Command line</source>
 <target>Linha de comando</target>
 <source>Minimum Idle Time [seconds]</source>
@@ -217,26 +229,24 @@ A linha de comando é executada cada vez que:
 <target>Monitoramento ativo...</target>
 <source>Waiting for missing directories...</source>
 <target>Esperando por diretórios faltantes...</target>
-<source>Command line is empty!</source>
-<target>Linha de comando está vazia!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Não foi possível inicializar o monitoramento de diretórios:</target>
 <source>A directory input field is empty.</source>
 <target>Um campo de entrada de diretório está vazio.</target>
 <source>Error when monitoring directories.</source>
-<target>Erro monitorando diretórios.</target>
+<target>Erro ao monitorar os diretórios.</target>
 <source>Drag && drop</source>
 <target>Arrastar && Soltar</target>
 <source>Conversion error:</source>
 <target>Erro de conversão:</target>
 <source>Error moving file:</source>
-<target>Erro movendo arquivo:</target>
+<target>Erro ao mover arquivo:</target>
 <source>Operation aborted!</source>
 <target>Operação cancelada!</target>
 <source>Target file already existing!</source>
 <target>Arquivo de destino já existe!</target>
 <source>Error moving directory:</source>
-<target>Erro movendo diretório:</target>
+<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>
@@ -259,12 +269,18 @@ A linha de comando é executada cada vez que:
 <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>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>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 setting privilege:</source>
 <target>Erro ao definir privilégio:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -289,28 +305,16 @@ A linha de comando é executada cada vez que:
 <target>%x%</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>Show popup</source>
-<target>Mostrar popup</target>
-<source>Show popup on errors or warnings</source>
-<target>Mostrar popup com 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 ou aviso</target>
-<source>Exit instantly</source>
-<target>Sair instantaneamente</target>
-<source>Abort synchronization immediately</source>
-<target>Cancelar a sincronização imediatamente</target>
 <source>Logging</source>
 <target>Gravando log</target>
 <source>FreeFileSync batch file</source>
-<target>FreeFileSync Arquivo batch</target>
+<target>FreeFileSync arquivo batch</target>
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync configuração</target>
 <source>FreeFileSync Batch Job</source>
 <target>FreeFileSync Arquivo batch</target>
 <source>Unable to create logfile!</source>
-<target>Não foi possível criar arquivo log!</target>
+<target>Não foi possível criar arquivo de log!</target>
 <source>Batch execution</source>
 <target>Execução do batch</target>
 <source>Log-messages:</source>
@@ -332,7 +336,7 @@ A linha de comando é executada cada vez que:
 <source>Unable to connect to sourceforge.net!</source>
 <target>Não foi possível conectar a sourceforge.net!</target>
 <source>A newer version of FreeFileSync is available:</source>
-<target>Uma nova versão do FreeFileSync foi encontrada:</target>
+<target>Uma nova versão do FreeFileSync está disponível:</target>
 <source>Download now?</source>
 <target>Baixar agora?</target>
 <source>Information</source>
@@ -398,15 +402,15 @@ A linha de comando é executada cada vez que:
 <source>Number of files and directories that will be deleted</source>
 <target>Número de arquivos e diretórios que serão apagados</target>
 <source>Total amount of data that will be transferred</source>
-<target>Volume de dados que será transferido</target>
+<target>Volume total de dados que será transferido</target>
 <source>Left</source>
 <target>Esquerda</target>
 <source>Right</source>
 <target>Direita</target>
 <source>Batch job</source>
 <target>Arquivo Batch</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Monta um arquivo batch para sincronização automatizada. Para iniciar o modo batch, passar o nome do arquivo para o executável do FreeFileSync: FreeFileSync.exe <arquivo batch>. Também pode ser programado no Agendador de Tarefas do sistema operacional.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Cria um arquivo batch para sincronização automática. Para iniciar o modo batch, simplesmente dê um duplo click no arquivo ou execute via linha de comando: FreeFileSync.exe <arquivo batch>. Também pode ser agendado pelo agendador de tarefas do sistema operacional.</target>
 <source>Help</source>
 <target>Ajuda</target>
 <source>Configuration overview:</source>
@@ -424,7 +428,7 @@ A linha de comando é executada cada vez que:
 <source>Overview</source>
 <target>Parâmetros</target>
 <source>Select logfile directory:</source>
-<target>Escolha um diretório para salvar o arquivo log:</target>
+<target>Escolha um diretório para salvar o arquivo de log:</target>
 <source>Maximum number of logfiles:</source>
 <target>Número máximo de arquivos de log:</target>
 <source>&Save</source>
@@ -450,7 +454,7 @@ A linha de comando é executada cada vez que:
 <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 mudanças em ambos os lados utilizando um banco de dados. Exclusões e conflitos serão detectados automaticamente.</target>
+<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>Mirror ->></source>
 <target>Espelhar ->></target>
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
@@ -458,7 +462,7 @@ A linha de comando é executada cada vez que:
 <source>Update -></source>
 <target>Atualizar -></target>
 <source>Copy new or updated files to right folder.</source>
-<target>Copiar arquivos novos ou atualizados para a pasta da direita</target>
+<target>Copia arquivos novos ou atualizados para a pasta da direita</target>
 <source>Custom</source>
 <target>Personalizado</target>
 <source>Configure your own synchronization rules.</source>
@@ -473,18 +477,18 @@ A linha de comando é executada cada vez que:
 <target>Categoria</target>
 <source>Action</source>
 <target>Ação</target>
-<source>Files/folders that exist on left side only</source>
-<target>Arquivos/pastas que existem somente à esquerda</target>
-<source>Files/folders that exist on right side only</source>
-<target>Arquivos/pastas que existem somente à direita</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Arquivos que existem nos dois lados, sendo à esquerda mais recentes</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Arquivos que existem nos dois lados, sendo à direita mais recentes</target>
-<source>Files that have different content</source>
-<target>Arquivos que possuem conteúdo diferente</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Conflitos/arquivos que não podem ser categorizados</target>
+<source>File/folder exists on left side only</source>
+<target>Arquivo/pasta existente somente no lado esquerdo</target>
+<source>File/folder exists on right side only</source>
+<target>Arquivo/pasta existente somente no lado direito</target>
+<source>Left file is newer</source>
+<target>Arquivo à esquerda é mais novo</target>
+<source>Right file is newer</source>
+<target>Arquivo à direita é mais novo</target>
+<source>Files have different content</source>
+<target>Arquivos possuem diferentes conteúdos</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Conflito/arquivo não pode ser categorizado</target>
 <source>Compare by...</source>
 <target>Comparar por...</target>
 <source>
@@ -560,17 +564,17 @@ Com esta opção habilitada, a árvore de decisão é menor:
 <source>Big thanks for localizing FreeFileSync goes out to:</source>
 <target>Pela tradução do FreeFileSync, um agradecimento a:</target>
 <source>Feedback and suggestions are welcome at:</source>
-<target>Comentários e sugestões são bem-vindos em:</target>
+<target>Comentários e sugestões são bem-vindos:</target>
 <source>FreeFileSync at Sourceforge</source>
 <target>FreeFileSync na Sourceforge</target>
 <source>Homepage</source>
 <target>Homepage</target>
 <source>If you like FFS</source>
-<target>Se gosta do FFS</target>
+<target>Se você gosta do FFS</target>
 <source>Donate with PayPal</source>
 <target>Doar usando PayPal</target>
 <source>Email</source>
-<target>Email</target>
+<target>E-mail</target>
 <source>Report translation error</source>
 <target>Reportar erro de tradução</target>
 <source>Published under the GNU General Public License:</source>
@@ -610,9 +614,9 @@ Nota: O nome do filtro deve ser especificado relativo(!) ao diretório principal
 <source>1. Enter relative file or directory names separated by ';' or a new line.</source>
 <target>1. Entre os nomes dos arquivos ou diretórios relativos separados por ';' ou uma nova linha.</target>
 <source>2. Use wildcard characters '*' and '?'.</source>
-<target>2. Usar '*' e '?' como caracteres coringa.</target>
+<target>2. Use '*' e '?' como caracteres coringa.</target>
 <source>3. Exclude files directly on main grid via context menu.</source>
-<target>3. Excluir arquivos diretamente do grid principal através do menu de contexto.</target>
+<target>3. Exclua arquivos diretamente do grid principal através do menu de contexto.</target>
 <source>Example</source>
 <target>Exemplo</target>
 <source>
@@ -630,7 +634,7 @@ Excluir: \stuff\temp\*
 <source>Exclude</source>
 <target>Excluir</target>
 <source>Select time span:</source>
-<target>Selecione o período de tempo:</target>
+<target>Selecionar o período de tempo:</target>
 <source>Minimum file size:</source>
 <target>Tamanho mínimo do arquivo:</target>
 <source>Maximum file size:</source>
@@ -702,15 +706,13 @@ Transferir permissões de arquivos e diretórios
 <source>Include temporarily</source>
 <target>Incluir temporariamente</target>
 <source>Exclude via filter:</source>
-<target>Excluir por filtro:</target>
+<target>Excluir via filtro:</target>
 <source><multiple selection></source>
 <target><seleção múltipla></target>
 <source>D-Click</source>
 <target>Duplo Click</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Copiar para a Área de transferência	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Apagar arquivos	DEL</target>
+<source>Delete</source>
+<target>Apagar</target>
 <source>Customize...</source>
 <target>Personalizar...</target>
 <source>Auto-adjust columns</source>
@@ -818,8 +820,8 @@ Transferir permissões de arquivos e diretórios
 <pluralform>%x files</pluralform>
 </source>
 <target>
-<pluralform>1 Arquivo</pluralform>
-<pluralform>%x Arquivos</pluralform>
+<pluralform>1 arquivo</pluralform>
+<pluralform>%x arquivos</pluralform>
 </target>
 <source>
 <pluralform>%x of 1 row in view</pluralform>
@@ -853,8 +855,10 @@ Transferir permissões de arquivos e diretórios
 <target>arquivo existe em ambos os lados</target>
 <source>on one side only</source>
 <target>existente apenas em um lado</target>
-<source>different</source>
-<target>diferente</target>
+<source>same date</source>
+<target>mesma data</target>
+<source>different date</source>
+<target>data diferente</target>
 <source>Inactive</source>
 <target>Inativo</target>
 <source>Second</source>
@@ -878,7 +882,7 @@ Transferir permissões de arquivos e diretórios
 <source>Ignore</source>
 <target>Ignorar</target>
 <source>Direct</source>
-<target>Direto</target>
+<target>Direcionar</target>
 <source>Follow</source>
 <target>Seguir</target>
 <source>Integrate external applications into context menu. The following macros are available:</source>
@@ -965,28 +969,28 @@ Transferir permissões de arquivos e diretórios
 <target>Gerando lista de arquivos...</target>
 <source>Multiple...</source>
 <target>Múltiplos...</target>
-<source>Files that are equal on both sides</source>
-<target>Arquivos que são iguais em ambos os lados</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Arquivos/pastas iguais que diferem apenas nos atributos</target>
-<source>Copy from right to left</source>
-<target>Copiar da direita para a esquerda</target>
-<source>Copy from left to right</source>
-<target>Copiar da esquerda para a direita</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Apagar arquivos/pastas existentes apenas no lado esquerdo</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Apagar arquivos/pastas existentes apenas no lado direito</target>
-<source>Copy from right to left overwriting</source>
-<target>Copiar da direita para a esquerda substituindo</target>
-<source>Copy from left to right overwriting</source>
-<target>Copiar da esquerda para a direita substituindo</target>
+<source>Both sides are equal</source>
+<target>Ambos os lados são iguais</target>
+<source>Files/folders differ in attributes only</source>
+<target>Arquivos/pastas se diferenciam apenas nos atributos</target>
+<source>Copy new file/folder to left</source>
+<target>Copiar arquivos/pastas novos para a esquerda</target>
+<source>Copy new file/folder to right</source>
+<target>Copiar arquivos/pastas novos para a direita</target>
+<source>Delete left file/folder</source>
+<target>Apagar arquivos/pastas da esquerda</target>
+<source>Delete right file/folder</source>
+<target>Apagar arquivos/pastas da direita</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Substituir arquivos/pastas da esquerda pelos da direita</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Substituir arquivos/pastas da direita pelos da esquerda</target>
 <source>Do nothing</source>
 <target>Não fazer nada</target>
-<source>Copy attributes only from right to left</source>
-<target>Copiar atributos somente da direita para a esquerda</target>
-<source>Copy attributes only from left to right</source>
-<target>Copiar atributos somente da esquerda para a direita</target>
+<source>Copy file attributes only to left</source>
+<target>Copiar apenas os atributos do arquivo para a esquerda</target>
+<source>Copy file attributes only to right</source>
+<target>Copiar apenas os atributos do arquivo para a direita</target>
 <source>Deleting file %x</source>
 <target>Apagando arquivo %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1006,9 +1010,9 @@ Transferir permissões de arquivos e diretórios
 <source>Copying new Symbolic Link %x to %y</source>
 <target>Copiando novo Link Simbólico %x para %y</target>
 <source>Overwriting file %x in %y</source>
-<target>Substituíndo arquivo %x em %y</target>
+<target>Substituindo arquivo %x em %y</target>
 <source>Overwriting Symbolic Link %x in %y</source>
-<target>Substituíndo Link Simbólico %x em %y</target>
+<target>Substituindo Link Simbólico %x em %y</target>
 <source>Creating folder %x</source>
 <target>Criando pasta %x</target>
 <source>Verifying file %x</source>
@@ -1017,6 +1021,8 @@ Transferir permissões de arquivos e diretórios
 <target>Atualizando atributos de %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>Diretório de origem não existe mais:</target>
+<source>Generating database...</source>
+<target>Gerando banco de dados...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Nada para sincronizar de acordo com a configuração!</target>
 <source>Target directory name must not be empty!</source>
@@ -1038,11 +1044,9 @@ Transferir permissões de arquivos e diretórios
 <source>Free disk space available:</source>
 <target>Espaço livre em disco:</target>
 <source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Um diretório será modificado o qual é parte de múltiplos pares de pastas! Por favor revise suas configurações de sincronização!</target>
+<target>Um diretório que faz parte de múltiplos pares de pastas será modificado! Por favor revise suas configurações de sincronização!</target>
 <source>Processing folder pair:</source>
 <target>Processando par de pastas:</target>
-<source>Generating database...</source>
-<target>Gerando banco de dados...</target>
 <source>Error copying locked file %x!</source>
 <target>Erro ao copiar arquivo bloqueado %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/romanian.lng b/BUILD/Languages/romanian.lng
index 19db6f3b..2c7da055 100644
--- a/BUILD/Languages/romanian.lng
+++ b/BUILD/Languages/romanian.lng
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Sincronizare Inteligentă</target>
 <source>Browse</source>
 <target>Explorează</target>
+<source>Invalid commandline: "%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 popup</source>
+<target>Arată casete de dialog</target>
+<source>Show popup on errors or warnings</source>
+<target>Este arătată o casetă de dialog pentru fiecare eroare sau avertisment</target>
+<source>Ignore errors</source>
+<target>Ignoră erorile</target>
+<source>Hide all error and warning messages</source>
+<target>Sînt ascunse toate mesajele de eroare și de avertizare</target>
+<source>Exit instantly</source>
+<target>Ieși imediat</target>
+<source>Abort synchronization immediately</source>
+<target>Abandonează imediat sincronizarea</target>
 <source>Select alternate synchronization settings</source>
 <target>Selectează o altă configurație a sincronizării</target>
 <source>No filter selected</source>
@@ -30,7 +44,7 @@
 <source>Remove alternate settings</source>
 <target>Înlătură setările alternative</target>
 <source>Create a batch job</source>
-<target>Creează o Sarcină Lot</target>
+<target>Creează o Sarcină Set</target>
 <source>Synchronization settings</source>
 <target>Setările Sincronizării</target>
 <source>Comparison settings</source>
@@ -81,7 +95,7 @@
 <source>Full path</source>
 <target>Cale completă</target>
 <source>Filename</source>
-<target>Numele Filei</target>
+<target>Numele Elementului</target>
 <source>Relative path</source>
 <target>Calea Relativă</target>
 <source>Directory</source>
@@ -123,14 +137,12 @@
 <target>Informații</target>
 <source>Fatal Error</source>
 <target>Eroare Fatală</target>
+<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 writing file:</source>
-<target>Eroare la scrierea filei:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>Filă de configurare FreeFileSync nevalidă!</target>
 <source>/sec</source>
 <target>/sec</target>
 <source>
@@ -222,8 +234,6 @@ Linia de comandă este executată de fiecare dată cînd:
 <target>Monitorizare activă...</target>
 <source>Waiting for missing directories...</source>
 <target>Aștept ca dosarele lipsă să devină disponibile...</target>
-<source>Command line is empty!</source>
-<target>Linia de comandă este goală!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Nu pot inițializa monitorizarea dosarelor:</target>
 <source>A directory input field is empty.</source>
@@ -231,7 +241,7 @@ Linia de comandă este executată de fiecare dată cînd:
 <source>Error when monitoring directories.</source>
 <target>Eroare la monitorizarea dosarelor.</target>
 <source>Drag && drop</source>
-<target>Trage un dosar peste compartiment sau folosește butonul Explorează</target>
+<target>Trage un dosar peste compartimentul de mai jos sau folosește butonul Explorează</target>
 <source>Conversion error:</source>
 <target>Eroare de convertire:</target>
 <source>Error moving file:</source>
@@ -264,12 +274,18 @@ Linia de comandă este executată de fiecare dată cînd:
 <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>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>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 setting privilege:</source>
 <target>Eroare la setarea privilegiului:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -294,30 +310,18 @@ Linia de comandă este executată de fiecare dată cînd:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>Nu pot citi valorile pentru următoarele noduri XML:</target>
-<source>Show popup</source>
-<target>Arată casete de dialog</target>
-<source>Show popup on errors or warnings</source>
-<target>Este arătată o casetă de dialog pentru fiecare eroare sau avertisment</target>
-<source>Ignore errors</source>
-<target>Ignoră erorile</target>
-<source>Hide all error and warning messages</source>
-<target>Sînt ascunse toate mesajele de eroare și de avertizare</target>
-<source>Exit instantly</source>
-<target>Ieși imediat</target>
-<source>Abort synchronization immediately</source>
-<target>Abandonează imediat sincronizarea</target>
 <source>Logging</source>
 <target>Jurnalizez</target>
 <source>FreeFileSync batch file</source>
-<target>Filă cu lot de comenzi FreeFileSync</target>
+<target>Filă cu set de comenzi FreeFileSync</target>
 <source>FreeFileSync configuration</source>
 <target>Configurație FreeFileSync</target>
 <source>FreeFileSync Batch Job</source>
-<target>Sarcină cu lot de comenzi FreeFileSync</target>
+<target>Sarcină cu set de comenzi FreeFileSync</target>
 <source>Unable to create logfile!</source>
 <target>Fila jurnal nu poate fi creată!</target>
 <source>Batch execution</source>
-<target>Execută Fila Lot</target>
+<target>Execută Fila Set</target>
 <source>Log-messages:</source>
 <target>Mesaje de jurnalizare:</target>
 <source>Stop</source>
@@ -363,7 +367,7 @@ Linia de comandă este executată de fiecare dată cînd:
 <source>&Global settings...</source>
 <target>&Setări Globale...</target>
 <source>&Create batch job...</source>
-<target>&Creează o Sarcină Lot...</target>
+<target>&Creează o Sarcină Set...</target>
 <source>&Export file list...</source>
 <target>&Exportă Lista de File...</target>
 <source>&Advanced</source>
@@ -395,7 +399,7 @@ Linia de comandă este executată de fiecare dată cînd:
 <source>Hide excluded items</source>
 <target>Ascunde itemurile excluse</target>
 <source>Hide filtered or temporarily excluded files</source>
-<target>Ascunde filele filtrate sau excluse temporar</target>
+<target>Ascunde elementele (file/dosare) filtrate sau excluse temporar</target>
 <source>Number of files and directories that will be created</source>
 <target>Numărul de file și dosare care vor fi create</target>
 <source>Number of files that will be overwritten</source>
@@ -409,9 +413,9 @@ Linia de comandă este executată de fiecare dată cînd:
 <source>Right</source>
 <target>Dreapta</target>
 <source>Batch job</source>
-<target>Sarcină Lot</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Se poate crea o filă cu un lot de comenzi [batch file] pentru sincronizarea inteligentă. Pentru a porni în modul lot, precizează astfel numele filei lot pentru prelucrarea sa de către executabilul FreeFileSync: freefilesync.exe <filă lot>. Această operație poate fi programată în planificatorul de sarcini al sistemului de operare [task scheduler].</target>
+<target>Sarcină Set</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Poți crea o filă ce include un set de comenzi [batch file], în scopul folosirii ei la sincronizarea inteligentă. Pentru a porni în modul set, dublu-clichează fila sau execut-o folosind linia de comandă: FreeFileSync.exe <filaset>. Această operație poate fi programată în planificatorul de sarcini al sistemului de operare [task scheduler].</target>
 <source>Help</source>
 <target>Ajutor</target>
 <source>Configuration overview:</source>
@@ -478,18 +482,18 @@ Linia de comandă este executată de fiecare dată cînd:
 <target>Categorie</target>
 <source>Action</source>
 <target>Acțiune</target>
-<source>Files/folders that exist on left side only</source>
-<target>File sau dosare care există doar în partea stîngă</target>
-<source>Files/folders that exist on right side only</source>
-<target>File sau dosare care există doar în partea dreaptă</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>File care există în ambele părți, cea din stînga fiind mai nouă</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>File care există în ambele părți, cea din dreapta fiind mai nouă</target>
-<source>Files that have different content</source>
-<target>File care au conținut diferit</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Situații care nu pot fi incluse într-o anumită categorie</target>
+<source>File/folder exists on left side only</source>
+<target>Fila/Dosarul există doar în partea stîngă</target>
+<source>File/folder exists on right side only</source>
+<target>Fila/Dosarul există doar în partea dreaptă</target>
+<source>Left file is newer</source>
+<target>Fila stîngă e mai nouă</target>
+<source>Right file is newer</source>
+<target>Fila dreaptă e mai nouă</target>
+<source>Files have different content</source>
+<target>Filele au conținut diferit</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Conflictul/Fila nu pot fi incluse într-o anumită categorie</target>
 <source>Compare by...</source>
 <target>Compară după:</target>
 <source>
@@ -544,8 +548,8 @@ este identic
 <target>- există doar în stînga</target>
 <source>- exists right only</source>
 <target>- există doar în dreapta</target>
-<source>- conflict</source>
-<target>- conflict</target>
+<source>- conflict (same date, different size)</source>
+<target>- conflict (dată identică, mărime diferită)</target>
 <source>Compare by "File content"</source>
 <target>Compară după "Conținutul Filelor"</target>
 <source>
@@ -712,10 +716,8 @@ Transferă permisiunile filelor și dosarelor
 <target><selectare multiplă></target>
 <source>D-Click</source>
 <target>Clic-Dreapta</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Copiază în Cliplanșetă	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Șterge Filele	DEL</target>
+<source>Delete</source>
+<target>Șterge</target>
 <source>Customize...</source>
 <target>Personalizează...</target>
 <source>Auto-adjust columns</source>
@@ -753,45 +755,45 @@ Transferă permisiunile filelor și dosarelor
 <source>Show files that are newer on right</source>
 <target>Arată filele din dreapta mai noi decît cele din stînga</target>
 <source>Hide files that are equal</source>
-<target>Ascunde filele care sînt identice</target>
+<target>Ascunde elementele (file/dosare) identice</target>
 <source>Show files that are equal</source>
-<target>Arată filele identice</target>
+<target>Arată elementele (file/dosare) identice</target>
 <source>Hide files that are different</source>
-<target>Ascunde filele care sînt diferite</target>
+<target>Ascunde elementele (file/dosare) care sînt diferite</target>
 <source>Show files that are different</source>
-<target>Arată filele diferite</target>
+<target>Arată elementele (file/dosare) diferite</target>
 <source>Hide conflicts</source>
 <target>Ascunde conflictele</target>
 <source>Show conflicts</source>
 <target>Arată conflictele</target>
 <source>Hide files that will be created on the left side</source>
-<target>Ascunde filele care vor fi create în stînga</target>
+<target>Ascunde elementele (file/dosare) care vor fi create în stînga</target>
 <source>Show files that will be created on the left side</source>
-<target>Arată filele care vor fi create în stînga</target>
+<target>Arată elementele (file/dosare) care vor fi create în stînga</target>
 <source>Hide files that will be created on the right side</source>
-<target>Ascunde filele care vor fi create în dreapta</target>
+<target>Ascunde elementele (file/dosare) care vor fi create în dreapta</target>
 <source>Show files that will be created on the right side</source>
-<target>Arată filele care vor fi create în dreapta</target>
+<target>Arată elementele (file/dosare) care vor fi create în dreapta</target>
 <source>Hide files that will be deleted on the left side</source>
-<target>Ascunde filele care vor fi șterse în stînga</target>
+<target>Ascunde elementele (file/dosare) care vor fi șterse în stînga</target>
 <source>Show files that will be deleted on the left side</source>
-<target>Arată filele care vor fi șterse în stînga</target>
+<target>Arată elementele (file/dosare) care vor fi șterse în stînga</target>
 <source>Hide files that will be deleted on the right side</source>
-<target>Ascunde filele care vor fi șterse în dreapta</target>
+<target>Ascunde elementele (file/dosare) care vor fi șterse în dreapta</target>
 <source>Show files that will be deleted on the right side</source>
-<target>Arată filele care vor fi șterse în dreapta</target>
+<target>Arată elementele (file/dosare) care vor fi șterse în dreapta</target>
 <source>Hide files that will be overwritten on left side</source>
-<target>Ascunde filele care vor fi suprascrise în stînga</target>
+<target>Ascunde elementele (file/dosare) care vor fi suprascrise în stînga</target>
 <source>Show files that will be overwritten on left side</source>
-<target>Arată filele care vor fi suprascrise în stînga</target>
+<target>Arată elementele (file/dosare) care vor fi suprascrise în stînga</target>
 <source>Hide files that will be overwritten on right side</source>
-<target>Ascunde filele care vor fi suprascrise în dreapta</target>
+<target>Ascunde elementele (file/dosare) care vor fi suprascrise în dreapta</target>
 <source>Show files that will be overwritten on right side</source>
-<target>Arată filele care vor fi suprascrise în dreapta</target>
+<target>Arată elementele (file/dosare) care vor fi suprascrise în dreapta</target>
 <source>Hide files that won't be copied</source>
-<target>Ascunde filele care nu vor fi copiate</target>
+<target>Ascunde elementele (file/dosare) care nu vor fi copiate</target>
 <source>Show files that won't be copied</source>
-<target>Arată filele care nu vor fi copiate</target>
+<target>Arată elementele (file/dosare) care nu vor fi copiate</target>
 <source>All directories in sync!</source>
 <target>Toate dosarele au fost sincronizate!</target>
 <source>Please run a Compare first before synchronizing!</source>
@@ -808,8 +810,8 @@ Transferă permisiunile filelor și dosarelor
 </source>
 <target>
 <pluralform>Item șters cu succes!</pluralform>
-<pluralform>%x itemuri șterse cu succes!</pluralform>
-<pluralform>%x de itemuri șterse cu succes!</pluralform>
+<pluralform>%x elemente șterse cu succes!</pluralform>
+<pluralform>%x de elemente șterse cu succes!</pluralform>
 </target>
 <source>
 <pluralform>1 directory</pluralform>
@@ -862,14 +864,10 @@ Transferă permisiunile filelor și dosarelor
 <target>fila există în ambele părți</target>
 <source>on one side only</source>
 <target>fila există doar într-o parte</target>
-<source>- left</source>
-<target>- stînga</target>
-<source>- right</source>
-<target>- dreapta</target>
-<source>different</source>
-<target>file diferite</target>
-<source>- conflict (same date, different size)</source>
-<target>- conflict (aceeași dată, mărime diferită)</target>
+<source>same date</source>
+<target>dată identică</target>
+<source>different date</source>
+<target>dată diferită</target>
 <source>Inactive</source>
 <target>Dezactivat</target>
 <source>Second</source>
@@ -973,37 +971,37 @@ Transferă permisiunile filelor și dosarelor
 <source>Conflict detected:</source>
 <target>Conflict detectat:</target>
 <source>Files %x have the same date but a different size!</source>
-<target>Filele %x au aceeași dată, dar mărime diferită!</target>
+<target>Filele %x au dată identică, dar mărime diferită!</target>
 <source>Symlinks %x have the same date but a different target!</source>
-<target>Simlegăturile %x au aceeași dată, dar ținte diferite!</target>
+<target>Simlegăturile %x au dată identică, dar ținte diferite!</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>Files that are equal on both sides</source>
-<target>File identice în ambele părți</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>File/Dosare identice care diferă doar prin atributele lor</target>
-<source>Copy from right to left</source>
-<target>Copiază de la Dreapta la Stînga</target>
-<source>Copy from left to right</source>
-<target>Copiază de la Stînga la Dreapta</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Șterge Itemul din Stînga</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Șterge Itemul din Dreapta</target>
-<source>Copy from right to left overwriting</source>
-<target>Copiază de la Dreapta la Stînga cu Suprascriere</target>
-<source>Copy from left to right overwriting</source>
-<target>Copiază de la Stînga la Dreapta cu Suprascriere</target>
+<source>Both sides are equal</source>
+<target>Amblee părți sînt identice</target>
+<source>Files/folders differ in attributes only</source>
+<target>File/Dosarele diferă doar prin atributele lor</target>
+<source>Copy new file/folder to left</source>
+<target>Copiază fila/dosarul nou în stînga</target>
+<source>Copy new file/folder to right</source>
+<target>Copiază fila/dosarul nou în dreapta</target>
+<source>Delete left file/folder</source>
+<target>Șterge fila/dosarul stîng</target>
+<source>Delete right file/folder</source>
+<target>Șterge fila/dosarul drept</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Suprascrie elementul stîng (fila/dosarul) cu cel drept</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Suprascrie elementul drept (fila/dosarul) cu cel stîng</target>
 <source>Do nothing</source>
 <target>Nici o Acțiune</target>
-<source>Copy attributes only from right to left</source>
-<target>Copiază doar atributele de la dreapta la stînga</target>
-<source>Copy attributes only from left to right</source>
-<target>Copiază doar atributele de la stînga la dreapta</target>
+<source>Copy file attributes only to left</source>
+<target>Copiază atributele filelor doar înspre stînga</target>
+<source>Copy file attributes only to right</source>
+<target>Copiază atributele filelor doar înspre dreapta</target>
 <source>Deleting file %x</source>
 <target>Șterg fila %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1034,6 +1032,8 @@ Transferă permisiunile filelor și dosarelor
 <target>Actualizez atributele lui %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>Dosarul sursă nu mai există:</target>
+<source>Generating database...</source>
+<target>Generez baza de date...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Nu este nimic de sincronizat conform configurației!</target>
 <source>Target directory name must not be empty!</source>
@@ -1058,8 +1058,6 @@ Transferă permisiunile filelor și dosarelor
 <target>Va fi modificat un dosar care face parte din mai multe perechi de dosare! Reverifică setările de sincronizare!</target>
 <source>Processing folder pair:</source>
 <target>Procesez perechea de dosare:</target>
-<source>Generating database...</source>
-<target>Generez baza de date...</target>
 <source>Error copying locked file %x!</source>
 <target>Eroare la copierea filei zăvorîte %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng
index 391fc9ff..bd2a5e26 100644
--- a/BUILD/Languages/russian.lng
+++ b/BUILD/Languages/russian.lng
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Автоматическая синхронизация</target>
 <source>Browse</source>
 <target>Обзор</target>
+<source>Invalid commandline: "%x"</source>
+<target>Неверная командная строка: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Ошибка при решении символической ссылки:</target>
+<source>Show popup</source>
+<target>Показывать всплывающие окна</target>
+<source>Show popup 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 synchronization settings</source>
 <target>Выбрать альтернативные настройки синхронизации</target>
 <source>No filter selected</source>
@@ -129,8 +143,6 @@
 <target>Файл не существует:</target>
 <source>Error parsing configuration file:</source>
 <target>Ошибка при анализе файла настроек синхронизации:</target>
-<source>Error writing file:</source>
-<target>Ошибка при записи файла:</target>
 <source>/sec</source>
 <target>/с</target>
 <source>
@@ -222,8 +234,6 @@ The command line is executed each time:
 <target>Мониторинг включен...</target>
 <source>Waiting for missing directories...</source>
 <target>Ожидание пропущенных папок...</target>
-<source>Command line is empty!</source>
-<target>Командная строка пуста!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Не удалось инициализировать папку для мониторинга:</target>
 <source>A directory input field is empty.</source>
@@ -264,12 +274,18 @@ The command line is executed each time:
 <target>Ошибка при копировании файла:</target>
 <source>Error opening file:</source>
 <target>Ошибка при открытии файла:</target>
+<source>Error writing file:</source>
+<target>Ошибка при записи файла:</target>
 <source>Error reading file:</source>
 <target>Ошибка при чтении файла:</target>
 <source>Endless loop when traversing directory:</source>
 <target>Зацикливание при встрече пересекающихся путей:</target>
 <source>Error traversing directory:</source>
 <target>Ошибка при пересечении папок:</target>
+<source>Windows Error Code %x:</source>
+<target>Код ошибки Windows %x:</target>
+<source>Linux Error Code %x:</source>
+<target>Код ошибки Linux %x:</target>
 <source>Error setting privilege:</source>
 <target>Ошибка установки привилегий:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -294,22 +310,10 @@ The command line is executed each time:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>Не удалось прочитать значения для следующих XML записей:</target>
-<source>Show popup</source>
-<target>Показывать всплывающие окна</target>
-<source>Show popup 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>Logging</source>
 <target>Лог-файлы</target>
 <source>FreeFileSync batch file</source>
-<target>Файл задания FreeFileSync</target>
+<target>Файл пакетного задания FreeFileSync</target>
 <source>FreeFileSync configuration</source>
 <target>Настройка FreeFileSync</target>
 <source>FreeFileSync Batch Job</source>
@@ -363,7 +367,7 @@ The command line is executed each time:
 <source>&Global settings...</source>
 <target>&Глобальные настройки...</target>
 <source>&Create batch job...</source>
-<target>&Создать задание...</target>
+<target>&Создать пакетное задание...</target>
 <source>&Export file list...</source>
 <target>&Экспортировать список файлов...</target>
 <source>&Advanced</source>
@@ -413,8 +417,8 @@ The command line is executed each time:
 <target>Справа</target>
 <source>Batch job</source>
 <target>Пакетное задание</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Создайте файл задания для автоматизированной синхронизации. Чтобы запустить программу в этом режиме просто передайте название файла на выполнение FreeFileSync: FreeFileSync.exe <batchfile>. Это также может быть записано в планировщике задач Вашей операционной системы.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Создайте файл пакетного задания для автоматической синхронизации. Для запуска в пакетном режиме просто дважды щелкните по файлу или выполните командную строку: FreeFileSync.exe <batchfile>. Также это может быть запланировано в планировщике задач операционной системы.</target>
 <source>Help</source>
 <target>Помощь</target>
 <source>Configuration overview:</source>
@@ -481,18 +485,18 @@ The command line is executed each time:
 <target>Категория</target>
 <source>Action</source>
 <target>Действие</target>
-<source>Files/folders that exist on left side only</source>
-<target>Файлы/папки, существующие только на левой стороне</target>
-<source>Files/folders that exist on right side only</source>
-<target>Файлы/папки, существующие только на правой стороне</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Файлы, существующие на обоих сторонах, левый новее</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Файлы, существующие на обоих сторонах, правый новее</target>
-<source>Files that have different content</source>
-<target>Файлы, имеющие различное содержание</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Конфликты/файлы, которые не могут быть отнесены к какой-либо категории</target>
+<source>File/folder exists on left side only</source>
+<target>Файл/папка существует только на левой стороне</target>
+<source>File/folder exists on right side only</source>
+<target>Файл/папка существует только на правой стороне</target>
+<source>Left file is newer</source>
+<target>Файл на левой стороне новее</target>
+<source>Right file is newer</source>
+<target>Файл на правой стороне новее</target>
+<source>Files have different content</source>
+<target>Файлы имеют различное содержание</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Конфликт/файл не может быть отнесен к какой-либо категории</target>
 <source>Compare by...</source>
 <target>Критерии сравнения</target>
 <source>
@@ -688,7 +692,7 @@ Transfer file and directory permissions
 <source>You may try to synchronize remaining items again (WITHOUT having to re-compare)!</source>
 <target>Вы можете попытаться синхронизировать оставшиеся пункты снова (без повторного сравнения)!</target>
 <source>Batch file created successfully!</source>
-<target>Файл задания создан успешно!</target>
+<target>Файл пакетного задания создан успешно!</target>
 <source>Main bar</source>
 <target>Главная панель</target>
 <source>Folder pairs</source>
@@ -711,10 +715,8 @@ Transfer file and directory permissions
 <target><групповое выделение></target>
 <source>D-Click</source>
 <target>Двойной клик</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Копировать в буфер обмена	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Удалить файл(ы)...	DEL</target>
+<source>Delete</source>
+<target>Удалить</target>
 <source>Customize...</source>
 <target>Выбрать колонки...</target>
 <source>Auto-adjust columns</source>
@@ -861,8 +863,10 @@ Transfer file and directory permissions
 <target>файлы существуют на обоих сторонах</target>
 <source>on one side only</source>
 <target>файлы существуют только на одной стороне</target>
-<source>different</source>
-<target>разные</target>
+<source>same date</source>
+<target>одинаковые даты</target>
+<source>different date</source>
+<target>разные даты</target>
 <source>Inactive</source>
 <target>---</target>
 <source>Second</source>
@@ -981,28 +985,28 @@ Transfer file and directory permissions
 <target>Создание списка файлов...</target>
 <source>Multiple...</source>
 <target>Различные варианты синхронизации</target>
-<source>Files that are equal on both sides</source>
-<target>Файлы, одинаковые с обеих сторон</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Одинаковые файлы/папки, которые отличаются только атрибутами</target>
-<source>Copy from right to left</source>
-<target>Копировать справа налево</target>
-<source>Copy from left to right</source>
-<target>Копировать слева направо</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Удалять файлы/папки, существующие только на левой стороне</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Удалять файлы/папки, существующие только на правой стороне</target>
-<source>Copy from right to left overwriting</source>
-<target>Копировать справа налево с перезаписью</target>
-<source>Copy from left to right overwriting</source>
-<target>Копировать слева направо с перезаписью</target>
+<source>Both sides are equal</source>
+<target>Обе стороны равны</target>
+<source>Files/folders differ in attributes only</source>
+<target>Файлы/папки разнятся только атрибутами</target>
+<source>Copy new file/folder to left</source>
+<target>Скопировать новый файл/папку налево</target>
+<source>Copy new file/folder to right</source>
+<target>Скопировать новый файл/папку направо</target>
+<source>Delete left file/folder</source>
+<target>Удалить файл/папку слева</target>
+<source>Delete right file/folder</source>
+<target>Удалить файл/папку справа</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Перезаписать файл/папку слева на аналогичную справа</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Перезаписать файл/папку справа на аналогичную слева</target>
 <source>Do nothing</source>
 <target>Ничего не делать</target>
-<source>Copy attributes only from right to left</source>
-<target>Копировать только атрибуты справа налево</target>
-<source>Copy attributes only from left to right</source>
-<target>Копировать только атрибуты слева направо</target>
+<source>Copy file attributes only to left</source>
+<target>Скопировать только атрибуты файла налево</target>
+<source>Copy file attributes only to right</source>
+<target>Скопировать только атрибуты файла направо</target>
 <source>Deleting file %x</source>
 <target>Удаление файла %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1033,6 +1037,8 @@ Transfer file and directory permissions
 <target>Обновление атрибутов %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>Исходная папка больше не существует:</target>
+<source>Generating database...</source>
+<target>Создание базы данных...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Ничего нет для синхронизации в соответствии с настройками синхронизации!</target>
 <source>Target directory name must not be empty!</source>
@@ -1057,8 +1063,6 @@ Transfer file and directory permissions
 <target>Папка, входящая в несколько пар папок, будет изменена. Пожалуйста, проверьте настройки синхронизации!</target>
 <source>Processing folder pair:</source>
 <target>Обработка пары папок:</target>
-<source>Generating database...</source>
-<target>Создание базы данных...</target>
 <source>Error copying locked file %x!</source>
 <target>Ошибка при копировании заблокированного файла %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index 22870a5a..63b482b1 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -17,14 +17,28 @@
 <target>RealtimeSync - Avtomatizirana sinhronizacija</target>
 <source>Browse</source>
 <target>Brskaj</target>
+<source>Invalid commandline: "%x"</source>
+<target>Napačen ukaz v vrstici: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Napaka pri razreševanju simbolične povezave:</target>
+<source>Show popup</source>
+<target>Prikaži pojavno okno</target>
+<source>Show popup on errors or warnings</source>
+<target>Prikaži pojavno okno pri napakah in opozorilih</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 synchronization settings</source>
 <target>Izberite nadomestne nastavitve sinhronizacije</target>
 <source>No filter selected</source>
 <target>Noben filter ni izbran</target>
 <source>Filter is active</source>
-<target>Filterj je aktiven</target>
+<target>Filter je aktiven</target>
 <source>Clear filter settings</source>
 <target>Počisti nastavitve filtra</target>
 <source>Remove alternate settings</source>
@@ -125,14 +139,12 @@
 <target>Info</target>
 <source>Fatal Error</source>
 <target>Usodna napaka</target>
+<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 writing file:</source>
-<target>Napaka pri pisanju datoteke:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>Neveljavna FreeFileSync nastavitvena datoteka!</target>
 <source>/sec</source>
 <target>/sek</target>
 <source>
@@ -227,8 +239,6 @@ Ukazna vrstica se izvrši vsakič ko:
 <target>Nadziranje aktivno...</target>
 <source>Waiting for missing directories...</source>
 <target>Čakam na manjkajoče imenike...</target>
-<source>Command line is empty!</source>
-<target>Ukazna vrstica je prazna!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Ne morem začeti nadzorovanja imenikov:</target>
 <source>A directory input field is empty.</source>
@@ -269,12 +279,18 @@ Ukazna vrstica se izvrši vsakič ko:
 <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>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>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 setting privilege:</source>
 <target>Napaka pri nastavljanju privilegija:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -299,18 +315,6 @@ Ukazna vrstica se izvrši vsakič ko:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>Ne morem brati vrednosti za naslednja XML vozlišča:</target>
-<source>Show popup</source>
-<target>Prikaži pojavno okno</target>
-<source>Show popup on errors or warnings</source>
-<target>Prikaži pojavno okno pri napakah in opozorilih</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>Logging</source>
 <target>Beležim</target>
 <source>FreeFileSync batch file</source>
@@ -415,8 +419,8 @@ Ukazna vrstica se izvrši vsakič ko:
 <target>Desno</target>
 <source>Batch job</source>
 <target>Batch opravilo</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Sestavi batch datoteko za samodejno sinhronizacijo. Da začnete v batch načinu, preprosto podajte ime batch datoteke k FreeFileSync izvršilni datoteki: FreeFileSync.exe <imedatotekebatch>. To se lahko nastavi tudi v urniku opravil vašega operacijskega sistema.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Ustvari batch datoteko za avtomatizirano sinhronizacijo. Da začnete v batch načinu preprosto dvokliknite datoteko ali jo izvršite preko ukazne vrstice: FreeFileSync.exe <batchfile>. To se lahko nastavi v razpored opravil vašega operacijskega sistema.</target>
 <source>Help</source>
 <target>Pomoč</target>
 <source>Configuration overview:</source>
@@ -483,18 +487,18 @@ Ukazna vrstica se izvrši vsakič ko:
 <target>Kategorija</target>
 <source>Action</source>
 <target>Ukrep</target>
-<source>Files/folders that exist on left side only</source>
-<target>Datoteke/mape, ki obstajajo samo na levi strani</target>
-<source>Files/folders that exist on right side only</source>
-<target>Datoteke/mape, ki obstajajo samo na desni strani</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Datoteke, ki obstajajo na obeh straneh, leva je novejša</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Datoteke, ki obstajajo na obeh straneh, desna je novejša</target>
-<source>Files that have different content</source>
-<target>Datoteke, ki imajo različno vsebino</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Prisotni so spori/datoteke, ki ne morejo biti kategorizirani</target>
+<source>File/folder exists on left side only</source>
+<target>Datoteka/mapa obstaja samo na levi strani</target>
+<source>File/folder exists on right side only</source>
+<target>Datoteka/mapa obstaja samo na desni strani</target>
+<source>Left file is newer</source>
+<target>Leva datoteka je novejša</target>
+<source>Right file is newer</source>
+<target>Desna datoteka je novejša</target>
+<source>Files have different content</source>
+<target>Datoteki imata različno vsebino</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Spor/datoteka ne more biti kategorizirana</target>
 <source>Compare by...</source>
 <target>Primerjaj po...</target>
 <source>
@@ -717,10 +721,8 @@ Prenesi dovoljenja datotek in imenikov
 <target><mnogokratna izbira></target>
 <source>D-Click</source>
 <target>D-Klik</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Kopiraj v odložišče	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Izbriši datoteke	DEL</target>
+<source>Delete</source>
+<target>Izbriši</target>
 <source>Customize...</source>
 <target>Prilagodi...</target>
 <source>Auto-adjust columns</source>
@@ -871,8 +873,10 @@ Prenesi dovoljenja datotek in imenikov
 <target>datoteka obstaja na obeh straneh</target>
 <source>on one side only</source>
 <target>samo na eni strani</target>
-<source>different</source>
-<target>različni</target>
+<source>same date</source>
+<target>enak datum</target>
+<source>different date</source>
+<target>različen datum</target>
 <source>Inactive</source>
 <target>Neaktivno</target>
 <source>Second</source>
@@ -987,28 +991,28 @@ Prenesi dovoljenja datotek in imenikov
 <target>Ustvarjam seznam datotek...</target>
 <source>Multiple...</source>
 <target>Večkratno...</target>
-<source>Files that are equal on both sides</source>
-<target>Datoteki, ki sta enaki na obeh straneh</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Enake datoteke/mape, ki se razlikujejo samo v atributih</target>
-<source>Copy from right to left</source>
-<target>Kopiraj iz desne na levo</target>
-<source>Copy from left to right</source>
-<target>Kopiraj iz leve na desno</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Izbriši datoteke/mape, ki obstajajo samo na levi strani</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Izbriši datoteke/mape, ki obstajajo samo na desni strani</target>
-<source>Copy from right to left overwriting</source>
-<target>Kopiraj iz desne na levo s prepisovanjem</target>
-<source>Copy from left to right overwriting</source>
-<target>Kopiraj iz leve na desno s prepisovanjem</target>
+<source>Both sides are equal</source>
+<target>Obe strani sta enaki</target>
+<source>Files/folders differ in attributes only</source>
+<target>Datoteke/mape se razlikujejo samo v atributih</target>
+<source>Copy new file/folder to left</source>
+<target>Kopiraj novo datoteko/mapo na levo</target>
+<source>Copy new file/folder to right</source>
+<target>Kopiraj novo datoteko/mapo na desno</target>
+<source>Delete left file/folder</source>
+<target>Izbriši levo datoteko/mapo</target>
+<source>Delete right file/folder</source>
+<target>Izbriši desno datoteko/mapo</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Prepiši levo datoteko/mapo s tisto na desni</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Prepiši desno datoteko/mapo s tisto na levi</target>
 <source>Do nothing</source>
 <target>Ne naredi ničesar</target>
-<source>Copy attributes only from right to left</source>
-<target>Kopiraj atribute samo iz desne na levo</target>
-<source>Copy attributes only from left to right</source>
-<target>Kopiraj atribute samo iz leve na desno</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>Deleting file %x</source>
 <target>Brisanje datoteke %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1039,6 +1043,8 @@ Prenesi dovoljenja datotek in imenikov
 <target>Posodabljam atribute od %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>Izvorni imenik ne obstaja več:</target>
+<source>Generating database...</source>
+<target>Ustvarjam podatkovno bazo...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Po trenutni konfiguraciji ni nič za sinhronizirati!</target>
 <source>Target directory name must not be empty!</source>
@@ -1063,8 +1069,6 @@ Prenesi dovoljenja datotek in imenikov
 <target>Imenik bo spremenjen, kar je del večkratnih parov map! Prosimo preglejte nastavitve sinhronizacije!</target>
 <source>Processing folder pair:</source>
 <target>Obdelujem par map:</target>
-<source>Generating database...</source>
-<target>Ustvarjam podatkovno bazo...</target>
 <source>Error copying locked file %x!</source>
 <target>Napaka pri kopiranju zaklenjene datoteke %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/spanish.lng b/BUILD/Languages/spanish.lng
index 99c1a5fd..e5b0be8b 100644
--- a/BUILD/Languages/spanish.lng
+++ b/BUILD/Languages/spanish.lng
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Sincronización Automática</target>
 <source>Browse</source>
 <target>Examinar</target>
+<source>Invalid commandline: "%x"</source>
+<target>Línea de comandos inválida: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Error al resolver enlace simbólico:</target>
+<source>Show popup</source>
+<target>Mostrar ventanas emergentes</target>
+<source>Show popup on errors or warnings</source>
+<target>Mostrar ventanas emergentes 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 synchronization settings</source>
 <target>Seleccione opciones alternativas de sincronización</target>
 <source>No filter selected</source>
@@ -121,14 +135,12 @@
 <target>Info</target>
 <source>Fatal Error</source>
 <target>Error fatal</target>
+<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 writing file:</source>
-<target>Error al escribir archivo:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>¡Archivo de configuración de FreeFileSync inválido!</target>
 <source>/sec</source>
 <target>/seg</target>
 <source>
@@ -217,8 +229,6 @@ La línea de comandos se ejecuta cada vez:
 <target>Visualización activa...</target>
 <source>Waiting for missing directories...</source>
 <target>Esperando directorios faltantes...</target>
-<source>Command line is empty!</source>
-<target>¡La línea de comandos está vacía!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>No se ha podido inicializar la visualización de directorios:</target>
 <source>A directory input field is empty.</source>
@@ -259,12 +269,18 @@ La línea de comandos se ejecuta cada vez:
 <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>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>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 setting privilege:</source>
 <target>Error al establecer privilegios:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -289,18 +305,6 @@ La línea de comandos se ejecuta cada vez:
 <target>%x%</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>Show popup</source>
-<target>Mostrar ventanas emergentes</target>
-<source>Show popup on errors or warnings</source>
-<target>Mostrar ventanas emergentes 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>Logging</source>
 <target>Iniciando sesión</target>
 <source>FreeFileSync batch file</source>
@@ -405,8 +409,8 @@ La línea de comandos se ejecuta cada vez:
 <target>Derecha</target>
 <source>Batch job</source>
 <target>Tarea batch</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Crear un archivo batch para una sincronización automática. Para empezar en modo batch simplemente pasar el nombre del archivo por el ejecutable FreeFileSync en la ventana de comandos (CMD): FreeFileSync.exe <archivo batch>. También se puede planificar en el administrador de tareas de su sistema operativo.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Crear un archivo batch para la sincronización automática. Para iniciar el modo batch, simplemente hacer doble clic sobre el archivo o ejectuar mediante la línea de comandos: FreeFileSync.exe <archivo_batch>. También se puede programar en el planificador del tareas del sistema operativo.</target>
 <source>Help</source>
 <target>Ayuda</target>
 <source>Configuration overview:</source>
@@ -473,18 +477,18 @@ La línea de comandos se ejecuta cada vez:
 <target>Categoría</target>
 <source>Action</source>
 <target>Acción</target>
-<source>Files/folders that exist on left side only</source>
-<target>Archivos/carpetas que existen sólo en el lado izquierdo</target>
-<source>Files/folders that exist on right side only</source>
-<target>Archivos/carpetas que existen sólo en el lado derecho</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Archivos que existen en ambos lados, el de la izquierda es más reciente</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Archivos que existen en ambos lados, el de la derecha es más reciente</target>
-<source>Files that have different content</source>
-<target>Archivos que tienen un contenido diferente</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Conflictos/archivos que no pueden ser clasificados</target>
+<source>File/folder exists on left side only</source>
+<target>Archivo/carpeta existe sólo en el lado izquierdo</target>
+<source>File/folder exists on right side only</source>
+<target>Archivo/carpeta existe sólo en el lado derecho</target>
+<source>Left file is newer</source>
+<target>El archivo de la izquierda es más reciente</target>
+<source>Right file is newer</source>
+<target>El archivo de la derecha es más reciente</target>
+<source>Files have different content</source>
+<target>Los archivos tienen contenido diferentes</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Conflicto/el achivo no puede ser categorizado</target>
 <source>Compare by...</source>
 <target>Comparar por...</target>
 <source>
@@ -707,10 +711,8 @@ Transferir permisos de archivo y directorio
 <target><selección múltiple></target>
 <source>D-Click</source>
 <target>Doble click</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Copiar al Portapapeles	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Borrar archivos	DEL</target>
+<source>Delete</source>
+<target>Eliminar</target>
 <source>Customize...</source>
 <target>Personalizar...</target>
 <source>Auto-adjust columns</source>
@@ -853,8 +855,10 @@ Transferir permisos de archivo y directorio
 <target>el archivo existe en ambos lados</target>
 <source>on one side only</source>
 <target>sólo en un lado</target>
-<source>different</source>
-<target>diferentes</target>
+<source>same date</source>
+<target>misma fecha</target>
+<source>different date</source>
+<target>fecha diferente</target>
 <source>Inactive</source>
 <target>Inactivo</target>
 <source>Second</source>
@@ -965,28 +969,28 @@ Transferir permisos de archivo y directorio
 <target>Generando lista de archivos...</target>
 <source>Multiple...</source>
 <target>Múltiple...</target>
-<source>Files that are equal on both sides</source>
-<target>Archivos que son iguales en ambos lados</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Archivos/Carpetas iguales que sólo difieren en los atributos</target>
-<source>Copy from right to left</source>
-<target>Copiar de derecha a izquierda</target>
-<source>Copy from left to right</source>
-<target>Copiar de izquierda a derecha</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Borrar sólo archivos/carpetas existentes en el lado izquierdo</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Borrar sólo archivos/carpetas existentes en el lado derecho</target>
-<source>Copy from right to left overwriting</source>
-<target>Copiar de derecha a izquierda con sobreescritura</target>
-<source>Copy from left to right overwriting</source>
-<target>Copiar de izquierda a derecha con sobreescritura</target>
+<source>Both sides are equal</source>
+<target>Ambos lados son iguales</target>
+<source>Files/folders differ in attributes only</source>
+<target>Archivos/carpetas se diferencia sólo en los atributos</target>
+<source>Copy new file/folder to left</source>
+<target>Copiar nuevo archivo/carpeta a la izquierda</target>
+<source>Copy new file/folder to right</source>
+<target>Copiar nuevo archivo/carpeta a la derecha</target>
+<source>Delete left file/folder</source>
+<target>Eliminar archivo/carpeta de la izquierda</target>
+<source>Delete right file/folder</source>
+<target>Eliinar archivo/carpeta de 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>
+<source>Overwrite right file/folder with left one</source>
+<target>Sobreescribir archivo/carpeta de la derecha por el de la izquierda</target>
 <source>Do nothing</source>
 <target>No hacer nada</target>
-<source>Copy attributes only from right to left</source>
-<target>Copiar sólo atributos de izquierda a derecha</target>
-<source>Copy attributes only from left to right</source>
-<target>Copiar sólo atributos de izquierda a derecha</target>
+<source>Copy file attributes only to left</source>
+<target>Copiar sólo atributos del archivo a la izquierda</target>
+<source>Copy file attributes only to right</source>
+<target>Copiar sólo atributos del archivo a la derecha</target>
 <source>Deleting file %x</source>
 <target>Borrar archivo %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1017,6 +1021,8 @@ Transferir permisos de archivo y directorio
 <target>Actualizar atributos de %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>El directorio origen ya no existe:</target>
+<source>Generating database...</source>
+<target>Generando base de datos...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>¡Nada que sincronizar de acuerdo con la configuración!</target>
 <source>Target directory name must not be empty!</source>
@@ -1041,8 +1047,6 @@ Transferir permisos de archivo y directorio
 <target>Un directorio será modificado, el cual es parte de mútiples pares de carpetas. ¡Por favor, revise la configuración de la sincronización!</target>
 <source>Processing folder pair:</source>
 <target>Procesar un par de carpetas:</target>
-<source>Generating database...</source>
-<target>Generando base de datos...</target>
 <source>Error copying locked file %x!</source>
 <target>¡Error al copiar archivo bloqueado %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/swedish.lng b/BUILD/Languages/swedish.lng
index af909742..12a4784f 100644
--- a/BUILD/Languages/swedish.lng
+++ b/BUILD/Languages/swedish.lng
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Automatiserad synkronisering</target>
 <source>Browse</source>
 <target>Bläddra</target>
+<source>Invalid commandline: "%x"</source>
+<target>Ogiltig kommandorad: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Kan inte tyda symbolisk länk:</target>
+<source>Show popup</source>
+<target>Visa popup</target>
+<source>Show popup on errors or warnings</source>
+<target>Visa popup vid fel eller 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 synchronization settings</source>
 <target>Välj alternativa synkroniseringsinställningar</target>
 <source>No filter selected</source>
@@ -121,14 +135,12 @@
 <target>Info</target>
 <source>Fatal Error</source>
 <target>Allvarligt fel</target>
+<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 writing file:</source>
-<target>Kan inte skriva fil:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>Felaktig FreeFileSync konfigurationsfil!</target>
 <source>/sec</source>
 <target>/s</target>
 <source>
@@ -217,8 +229,6 @@ Kommandot verkställes när:
 <target>Övervakning aktiverad...</target>
 <source>Waiting for missing directories...</source>
 <target>Väntar på saknade destinationer...</target>
-<source>Command line is empty!</source>
-<target>Kommandofältet är tomt</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Kan inte initiera katalogskanner:</target>
 <source>A directory input field is empty.</source>
@@ -259,12 +269,18 @@ Kommandot verkställes när:
 <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>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>Windows Error Code %x:</source>
+<target>Windows Felkod %x:</target>
+<source>Linux Error Code %x:</source>
+<target>Linux Felkod %x:</target>
 <source>Error setting privilege:</source>
 <target>Kan inte ange privilegie:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -289,18 +305,6 @@ Kommandot verkställes när:
 <target>%x%</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>Show popup</source>
-<target>Visa popups</target>
-<source>Show popup on errors or warnings</source>
-<target>Visa popup vid fel eller 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>Logging</source>
 <target>Loggar</target>
 <source>FreeFileSync batch file</source>
@@ -314,7 +318,7 @@ Kommandot verkställes när:
 <source>Batch execution</source>
 <target>Batch-körning</target>
 <source>Log-messages:</source>
-<target>Log-meddelanden:</target>
+<target>Logg-meddelanden:</target>
 <source>Stop</source>
 <target>Stopp</target>
 <source>Total time:</source>
@@ -405,8 +409,8 @@ Kommandot verkställes när:
 <target>Höger</target>
 <source>Batch job</source>
 <target>Batch-jobb</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Montera en batch-fil för automatisk synkronisering. För att starta i batch-läge, lägg till filnamnet i startkommandot: FreeFileSync.exe <batch-fil>. Det kan också schemaläggas i Windows Schemaläggaren.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Skapa en batch-fil för automatiserad synkronisering. För att starta i batch-läge, Dubbelklicka på filen eller starta den med kommandoraden: FreeFileSync.exe <batch-fil>. Batch-filen kan också schemaläggas i Windows Schemaläggare.</target>
 <source>Help</source>
 <target>Hjälp</target>
 <source>Configuration overview:</source>
@@ -473,18 +477,18 @@ Kommandot verkställes när:
 <target>Kategori</target>
 <source>Action</source>
 <target>Aktivitet</target>
-<source>Files/folders that exist on left side only</source>
-<target>Filer/kataloger som finns på vänster sida enbart</target>
-<source>Files/folders that exist on right side only</source>
-<target>Filer/kataloger som finns på höger sida enbart</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Filer som finns på båda sidor, vänster är nyare</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Filer som finns på båda sidor, höger är nyare</target>
-<source>Files that have different content</source>
-<target>Filer som har olika innehåll</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Konflikter/filer som inte kan kategoriseras</target>
+<source>File/folder exists on left side only</source>
+<target>Fil/katalog finns bara på vänster sida</target>
+<source>File/folder exists on right side only</source>
+<target>Fil/katalog finns bara på höger sida</target>
+<source>Left file is newer</source>
+<target>Vänster fil är nyare</target>
+<source>Right file is newer</source>
+<target>Höger fil är nyare</target>
+<source>Files have different content</source>
+<target>Filerna har olika innehåll</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Konflikt/Fil kan inte kategoriseras</target>
 <source>Compare by...</source>
 <target>Jämför...</target>
 <source>
@@ -539,8 +543,8 @@ Filerna betecknas som lika om,
 <target>- finns endast till vänster</target>
 <source>- exists right only</source>
 <target>- finns endast till höger</target>
-<source>- conflict</source>
-<target>- konflikt</target>
+<source>- conflict (same date, different size)</source>
+<target>- konflikt (samma datum, olika storlek)</target>
 <source>Compare by "File content"</source>
 <target>Jämför: "Filinnehåll"</target>
 <source>
@@ -570,7 +574,7 @@ Med det här alternativet aktiverat, blir beslutsträdet mindre:
 <source>Donate with PayPal</source>
 <target>Donera via PayPal</target>
 <source>Email</source>
-<target>e-post</target>
+<target>E-post</target>
 <source>Report translation error</source>
 <target>Rapportera översättningsfel</target>
 <source>Published under the GNU General Public License:</source>
@@ -707,10 +711,8 @@ Transfer file and directory permissions
 <target><flerval></target>
 <source>D-Click</source>
 <target>Håll ner D</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Kopiera till urklipp	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Ta bort filer	DEL</target>
+<source>Delete</source>
+<target>Ta bort</target>
 <source>Customize...</source>
 <target>Anpassar...</target>
 <source>Auto-adjust columns</source>
@@ -853,14 +855,10 @@ Transfer file and directory permissions
 <target>Filen finns på båda sidor</target>
 <source>on one side only</source>
 <target>endast på en sida</target>
-<source>- left</source>
-<target>- vänster</target>
-<source>- right</source>
-<target>- höger</target>
-<source>different</source>
-<target>olika</target>
-<source>- conflict (same date, different size)</source>
-<target>- konflikt (samma datum, olika storlek)</target>
+<source>same date</source>
+<target>samma datum</target>
+<source>different date</source>
+<target>olika datum</target>
 <source>Inactive</source>
 <target>Inaktiv</target>
 <source>Second</source>
@@ -971,28 +969,28 @@ Transfer file and directory permissions
 <target>Skapar fillista...</target>
 <source>Multiple...</source>
 <target>Multipla...</target>
-<source>Files that are equal on both sides</source>
-<target>Filer som är lika på båda sidor</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Lika filer/kataloger som endast skiljer sig i attribut</target>
-<source>Copy from right to left</source>
-<target>Kopiera från höger till vänster</target>
-<source>Copy from left to right</source>
-<target>Kopiera från vänster till höger</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Ta bort filer/kataloger som endast finns på vänster sida</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Ta bort filer/kataloger som endast finns på höger sida</target>
-<source>Copy from right to left overwriting</source>
-<target>Kopiera från höger till vänster och skriv över målet</target>
-<source>Copy from left to right overwriting</source>
-<target>Kopiera från vänster till höger och skriv över målet</target>
+<source>Both sides are equal</source>
+<target>Bägge sidor är lika</target>
+<source>Files/folders differ in attributes only</source>
+<target>Endast attributskillnader i filer/kataloger</target>
+<source>Copy new file/folder to left</source>
+<target>Kopiera ny fil/katalog åt vänster</target>
+<source>Copy new file/folder to right</source>
+<target>Kopiera ny fil/katalog åt höger</target>
+<source>Delete left file/folder</source>
+<target>Ta bort vänster fil/katalog</target>
+<source>Delete right file/folder</source>
+<target>Ta bort höger fil/katalog</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Skriv över vänster fil/katalog med den högra</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Skriv över höger fil/katalog med den vänstra</target>
 <source>Do nothing</source>
 <target>Gör ingenting</target>
-<source>Copy attributes only from right to left</source>
-<target>Kopiera attribut endast från höger till vänster</target>
-<source>Copy attributes only from left to right</source>
-<target>Kopiera attribut endast från vänster till höger</target>
+<source>Copy file attributes only to left</source>
+<target>Kopiera endast filattribut åt vänster</target>
+<source>Copy file attributes only to right</source>
+<target>Kopiera endast filattribut åt höger</target>
 <source>Deleting file %x</source>
 <target>Tar bort filen %x</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1023,6 +1021,8 @@ Transfer file and directory permissions
 <target>Uppdaterar attribut för %x</target>
 <source>Source directory does not exist anymore:</source>
 <target>Källkatalogen finns inte längre:</target>
+<source>Generating database...</source>
+<target>Skapar databas...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Inget att synkronisera enligt aktuella inställningar!</target>
 <source>Target directory name must not be empty!</source>
@@ -1047,8 +1047,6 @@ Transfer file and directory permissions
 <target>En katalog som är en del av flera katalogpar kommer att ändras! Kontrollera synkroniseringsinställningarna</target>
 <source>Processing folder pair:</source>
 <target>Processar katalogpar:</target>
-<source>Generating database...</source>
-<target>Skapar databas...</target>
 <source>Error copying locked file %x!</source>
 <target>Kan inte kopiera låst fil %x!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/turkish.lng b/BUILD/Languages/turkish.lng
index 1c520618..4e0e6a33 100644
--- a/BUILD/Languages/turkish.lng
+++ b/BUILD/Languages/turkish.lng
@@ -17,8 +17,22 @@
 <target>RealtimeSync - Kendiliğinden Eşleştirme</target>
 <source>Browse</source>
 <target>Gözat</target>
+<source>Invalid commandline: "%x"</source>
+<target>Geçersiz komut satırı: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Sembolik bağlantı çözümlenirken hata:</target>
+<source>Show popup</source>
+<target>Açılır pencerede göster</target>
+<source>Show popup on errors or warnings</source>
+<target>Hata ve uyarıları açılır bir pencerede gösterir</target>
+<source>Ignore errors</source>
+<target>Hataları yoksay</target>
+<source>Hide all error and warning messages</source>
+<target>Tüm hata ve uyarı iletilerini gizler</target>
+<source>Exit instantly</source>
+<target>Hemen çık</target>
+<source>Abort synchronization immediately</source>
+<target>Eşleştirmeyi hemen bırak</target>
 <source>Select alternate synchronization settings</source>
 <target>Alternatif eşleştirme ayarlarını seçin</target>
 <source>No filter selected</source>
@@ -121,14 +135,12 @@
 <target>Bilgi</target>
 <source>Fatal Error</source>
 <target>Ölümcül Hata</target>
+<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>
-<source>Error writing file:</source>
-<target>Dosya yazılırken hata:</target>
-<source>Invalid FreeFileSync config file!</source>
-<target>Geçersiz FreeFileSync yapılandırma dosyası!</target>
 <source>/sec</source>
 <target>/san</target>
 <source>
@@ -217,8 +229,6 @@ Her seferinde çalıştırılacak komut satırı:
 <target>İzleme etkin...</target>
 <source>Waiting for missing directories...</source>
 <target>Kayıp klasörler için bekleniyor...</target>
-<source>Command line is empty!</source>
-<target>Komut satırı boş!</target>
 <source>Could not initialize directory monitoring:</source>
 <target>Klasör izlemesi başlatılamadı:</target>
 <source>A directory input field is empty.</source>
@@ -259,12 +269,18 @@ Her seferinde çalıştırılacak komut satırı:
 <target>Dosya kopyalanırken hata:</target>
 <source>Error opening file:</source>
 <target>Dosya açılırken hata:</target>
+<source>Error writing file:</source>
+<target>Dosya yazılırken hata:</target>
 <source>Error reading file:</source>
 <target>Dosya okunurken 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>Windows Error Code %x:</source>
+<target>Windows Hata Kodu %x:</target>
+<source>Linux Error Code %x:</source>
+<target>Linux Hata Kodu %x:</target>
 <source>Error setting privilege:</source>
 <target>İzinler ayarlanırken hata:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -289,18 +305,6 @@ Her seferinde çalıştırılacak komut satırı:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>Şu XML düğümlerindeki değerler okunamadı:</target>
-<source>Show popup</source>
-<target>Açılır pencerede göster</target>
-<source>Show popup on errors or warnings</source>
-<target>Hata ve uyarıları açılır bir pencerede gösterir</target>
-<source>Ignore errors</source>
-<target>Hataları yoksay</target>
-<source>Hide all error and warning messages</source>
-<target>Tüm hata ve uyarı iletilerini gizler</target>
-<source>Exit instantly</source>
-<target>Hemen çık</target>
-<source>Abort synchronization immediately</source>
-<target>Eşleştirmeyi hemen bırak</target>
 <source>Logging</source>
 <target>Günlükleme</target>
 <source>FreeFileSync batch file</source>
@@ -405,8 +409,8 @@ Her seferinde çalıştırılacak komut satırı:
 <target>Sağ</target>
 <source>Batch job</source>
 <target>Toplu komut işi</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Kendiliğinden eşleştirme için bir toplu komut dosyası oluşturabilirsiniz. Programı toplu komut kipinde başlatmak için, komut dosyasını FreeFileSync çalışan dosyasına parametre olarak şu şekilde ekleyerek çalıştırın: FreeFileSync.exe <Komut Dosyası Adı>. Ayrıca bu komut dosyasını işletim sistemindeki görev zamanlayıcı ile istediğiniz zamanlarda da çalıştırabilirsiniz.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Kendiliğinden eşleştirme için bir komut dosyası oluşturun. Komut dosyasını işlemek için dosyanın üzerinde çift tıklayabilir ya da FreeFileSync.exe <komutdosyası> şeklinde bir komut satırı yazabilirsiniz. Bu işi işletim sisteminizin görev yöneticisi ile istediğiniz zaman çalışacak şekilde ayarlayabilirsiniz.</target>
 <source>Help</source>
 <target>Yardım</target>
 <source>Configuration overview:</source>
@@ -473,18 +477,18 @@ Her seferinde çalıştırılacak komut satırı:
 <target>Kategori</target>
 <source>Action</source>
 <target>İşlem</target>
-<source>Files/folders that exist on left side only</source>
-<target>Yalnız sol yanda bulunan dosya ve klasörler</target>
-<source>Files/folders that exist on right side only</source>
-<target>Yalnız sağ yanda bulunan dosya ve klasörler</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Her iki yanda da bulunup, solda daha yeni olan dosyalar</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Her iki yanda da bulunup, sağda daha yeni olan dosyalar</target>
-<source>Files that have different content</source>
+<source>File/folder exists on left side only</source>
+<target>Dosya/Klasör yalnız sol tarafta var</target>
+<source>File/folder exists on right side only</source>
+<target>Dosya/Klasör yalnız sağ tarafta var</target>
+<source>Left file is newer</source>
+<target>Soldaki dosya daha yeni</target>
+<source>Right file is newer</source>
+<target>Sağdaki dosya daha yeni</target>
+<source>Files have different content</source>
 <target>Farklı içeriğe sahip dosyalar</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Kategorize edilemeyen tutarsızlıklar/dosyalar</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Çatışma/dosya kategorize edilemedi</target>
 <source>Compare by...</source>
 <target>Karşılaştırma ölçütünü seçin:</target>
 <source>
@@ -539,8 +543,8 @@ aynı olanlara bakılır
 <target>- yalnız solda olan</target>
 <source>- exists right only</source>
 <target>- yalnız sağda olan</target>
-<source>- conflict</source>
-<target>- tutarsızlık</target>
+<source>- conflict (same date, different size)</source>
+<target>- tutarsızlık (aynı tarih, farklı boyut)</target>
 <source>Compare by "File content"</source>
 <target>"Dosya içeriği"ne göre karşılaştırma</target>
 <source>
@@ -707,10 +711,8 @@ Dosya ve klasör izinlerini de aktar
 <target><çoklu seçim></target>
 <source>D-Click</source>
 <target>D-Tuşu</target>
-<source>Copy to clipboard	CTRL+C</source>
-<target>Panoya kopyala	CTRL+C</target>
-<source>Delete files	DEL</source>
-<target>Dosyaları sil	DEL</target>
+<source>Delete</source>
+<target>Sil</target>
 <source>Customize...</source>
 <target>Özelleştir...</target>
 <source>Auto-adjust columns</source>
@@ -802,6 +804,8 @@ Dosya ve klasör izinlerini de aktar
 <pluralform>%x objects deleted successfully!</pluralform>
 </source>
 <target>
+<pluralform>Nesne silindi!</pluralform>
+<pluralform>%x nesne silindi!</pluralform>
 </target>
 <source>
 <pluralform>1 directory</pluralform>
@@ -851,14 +855,10 @@ Dosya ve klasör izinlerini de aktar
 <target>Dosya her iki yanda da var</target>
 <source>on one side only</source>
 <target>yalnız tek yanda</target>
-<source>- left</source>
-<target>- sol</target>
-<source>- right</source>
-<target>- sağ</target>
-<source>different</source>
-<target>farklı</target>
-<source>- conflict (same date, different size)</source>
-<target>- tutarsızlık (aynı tarih, farklı boyut)</target>
+<source>same date</source>
+<target>aynı tarihli</target>
+<source>different date</source>
+<target>farklı tarihli</target>
 <source>Inactive</source>
 <target>Devre dışı</target>
 <source>Second</source>
@@ -969,28 +969,28 @@ Dosya ve klasör izinlerini de aktar
 <target>Dosya listesi oluşturuluyor...</target>
 <source>Multiple...</source>
 <target>Çoklu...</target>
-<source>Files that are equal on both sides</source>
-<target>Her iki yanda da eşit olan dosyalar</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Yalnızca öznitelikleri farklı olan dosya ya da klasörleri eşitle</target>
-<source>Copy from right to left</source>
-<target>Sağdan sola kopyala</target>
-<source>Copy from left to right</source>
-<target>Soldan sağa kopyala</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Yalnız sol tarafta olan dosyaları/klasörleri sil</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Yalnız sağ tarafta olan dosyaları/klasörleri sil</target>
-<source>Copy from right to left overwriting</source>
-<target>Sağdan sola üzerine yazarak kopyala</target>
-<source>Copy from left to right overwriting</source>
-<target>Soldan sağa üzerine yazarak kopyala</target>
+<source>Both sides are equal</source>
+<target>İki tarafta aynı</target>
+<source>Files/folders differ in attributes only</source>
+<target>Yalnız dosya/klasör öznitelikleri farklı olanlar</target>
+<source>Copy new file/folder to left</source>
+<target>Yeni dosya/klasörleri sola kopyala</target>
+<source>Copy new file/folder to right</source>
+<target>Yeni dosya/klasörleri sağa kopyala</target>
+<source>Delete left file/folder</source>
+<target>Soldaki dosya/klasörleri sil</target>
+<source>Delete right file/folder</source>
+<target>Sağdaki dosya/klasörleri sil</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Soldaki dosya/klasörlerin üzerine sağdakileri yaz</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Sağdaki dosya/klasörlerin üzerine soldakileri yaz</target>
 <source>Do nothing</source>
 <target>Hiçbir şey yapma</target>
-<source>Copy attributes only from right to left</source>
-<target>Öznitelikleri yalnızca sağdan sola kopyala</target>
-<source>Copy attributes only from left to right</source>
-<target>Öznitelikleri yalnızca soldan sağa kopyala</target>
+<source>Copy file attributes only to left</source>
+<target>Dosya özniteliklerini yalnız sola kopyalaya</target>
+<source>Copy file attributes only to right</source>
+<target>Dosya özniteliklerini yalnız sağa kopyalaya</target>
 <source>Deleting file %x</source>
 <target>%x dosyası siliniyor</target>
 <source>Deleting Symbolic Link %x</source>
@@ -1021,6 +1021,8 @@ Dosya ve klasör izinlerini de aktar
 <target>%x öznitelikleri güncelleniyor</target>
 <source>Source directory does not exist anymore:</source>
 <target>Kaynak klasör artık yok:</target>
+<source>Generating database...</source>
+<target>Veri tabanı oluşturuluyor...</target>
 <source>Nothing to synchronize according to configuration!</source>
 <target>Yapılandırmaya göre eşleştirilecek bir şey yok!</target>
 <source>Target directory name must not be empty!</source>
@@ -1045,8 +1047,6 @@ Dosya ve klasör izinlerini de aktar
 <target>Çoklu klasör çiftlerinin bir parçası olduğan bir klasör düzenlenecek! Lütfen eşleştirme ayarlarınızı gözden geçirin!</target>
 <source>Processing folder pair:</source>
 <target>İşlenen klasör çifti:</target>
-<source>Generating database...</source>
-<target>Veri tabanı oluşturuluyor...</target>
 <source>Error copying locked file %x!</source>
 <target>Kilitli dosya %x kopyalanırken hata!</target>
 <source>Data verification error: Source and target file have different content!</source>
diff --git a/BUILD/Languages/ukrainian.lng b/BUILD/Languages/ukrainian.lng
index 33ca37c0..ee2b3cc6 100644
--- a/BUILD/Languages/ukrainian.lng
+++ b/BUILD/Languages/ukrainian.lng
@@ -18,9 +18,21 @@
 <source>Browse</source>
 <target>Переглянути</target>
 <source>Invalid commandline: "%x"</source>
-<target></target>
+<target>Неправильний командний рядок: "%x"</target>
 <source>Error resolving symbolic link:</source>
 <target>Помилка при вирішені символічного посилання:</target>
+<source>Show popup</source>
+<target>Показувати виринаючі вікна</target>
+<source>Show popup 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 synchronization settings</source>
 <target>Вибрати альтернативні налаштування синхронізації</target>
 <source>No filter selected</source>
@@ -101,7 +113,7 @@
 <source>One of the FreeFileSync database entries within the following file is not yet existing:</source>
 <target>Записів, які стосуються таких файлів, в базі даних FreeFileSync ще не існує:</target>
 <source>Error reading from synchronization database:</source>
-<target>Помилка при читанні з базы даних синхронізації:</target>
+<target>Помилка при читанні з бази даних синхронізації:</target>
 <source>An exception occurred!</source>
 <target>Відбулось виключення!</target>
 <source>Error deleting file:</source>
@@ -131,8 +143,6 @@
 <target>Файл не існує:</target>
 <source>Error parsing configuration file:</source>
 <target>Помилка при анализі файла налаштувань синхронізації:</target>
-<source>Error writing file:</source>
-<target>Помилка при записі файла:</target>
 <source>/sec</source>
 <target>/сек</target>
 <source>
@@ -264,12 +274,18 @@ The command line is executed each time:
 <target>Помилка при копіюванні файла:</target>
 <source>Error opening file:</source>
 <target>Помилка при відкриванні файла:</target>
+<source>Error writing file:</source>
+<target>Помилка при записі файла:</target>
 <source>Error reading file:</source>
 <target>Помилка при читанні файла:</target>
 <source>Endless loop when traversing directory:</source>
 <target>Зациклюванння при обході каталогу:</target>
 <source>Error traversing directory:</source>
 <target>Помилка обходу каталогу:</target>
+<source>Windows Error Code %x:</source>
+<target>Код помилки Windows %x:</target>
+<source>Linux Error Code %x:</source>
+<target>Код помилки Linux %x:</target>
 <source>Error setting privilege:</source>
 <target>Помилка встановлення привилеїв:</target>
 <source>Error moving to Recycle Bin:</source>
@@ -294,18 +310,6 @@ The command line is executed each time:
 <target>%x%</target>
 <source>Could not read values for the following XML nodes:</source>
 <target>Не вдалося прочитати значення таких XML записів:</target>
-<source>Show popup</source>
-<target>Показувати виринаючі вікна</target>
-<source>Show popup 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>Logging</source>
 <target>Лог-файли</target>
 <source>FreeFileSync batch file</source>
@@ -413,8 +417,8 @@ The command line is executed each time:
 <target>Праворуч</target>
 <source>Batch job</source>
 <target>Пакетне завдання</target>
-<source>Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.</source>
-<target>Створіть файл завдання для автоматизованної синхронізації. Щоб запустити програму в цьому режимі просто передайте назву файла на виконання FreeFileSync: FreeFileSync.exe <файл завдання>. Це також може бути заплановано у планувальнику завдань операційної системи.</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 <batchfile>. This can also be scheduled in your operating system's task planner.</source>
+<target>Створити пакетний файл для автоматичної синхронізації. Щоб запустити пакетний режим просто двічі клацніть файл або виконайте командний рядок: FreeFileSync.exe <batchfile>. Це можна також запланувати в менеджері ОС</target>
 <source>Help</source>
 <target>Допомога</target>
 <source>Configuration overview:</source>
@@ -481,18 +485,18 @@ The command line is executed each time:
 <target>Категорія</target>
 <source>Action</source>
 <target>Дія</target>
-<source>Files/folders that exist on left side only</source>
-<target>Файли/папки, які є тільки ліворуч</target>
-<source>Files/folders that exist on right side only</source>
-<target>Файли/папки, які є тільки праворуч</target>
-<source>Files that exist on both sides, left one is newer</source>
-<target>Файли є по обох сторонах, лівий новіший</target>
-<source>Files that exist on both sides, right one is newer</source>
-<target>Файли є по обох сторонах, правий новіший</target>
-<source>Files that have different content</source>
-<target>Файли, які мають різний вміст</target>
-<source>Conflicts/files that cannot be categorized</source>
-<target>Конфлікти/файли, які не можуть бути віднесені до якоїсь категорії</target>
+<source>File/folder exists on left side only</source>
+<target>Файл/папка існує тільки ліворуч</target>
+<source>File/folder exists on right side only</source>
+<target>Файл/папка існує тільки праворуч</target>
+<source>Left file is newer</source>
+<target>Файл ліворуч є новішим</target>
+<source>Right file is newer</source>
+<target>Файл праворуч є новішим</target>
+<source>Files have different content</source>
+<target>Файли відрізняються вмістом</target>
+<source>Conflict/file cannot be categorized</source>
+<target>Не можна категоризувати конфлікт/файл</target>
 <source>Compare by...</source>
 <target>Критерії порівнювання</target>
 <source>
@@ -711,8 +715,8 @@ Transfer file and directory permissions
 <target><груповий вибір></target>
 <source>D-Click</source>
 <target>Клацніть двічі</target>
-<source>Delete files	DEL</source>
-<target>Вилучити файл(и)	DEL</target>
+<source>Delete</source>
+<target>Видалити</target>
 <source>Customize...</source>
 <target>Вибрати колонки...</target>
 <source>Auto-adjust columns</source>
@@ -978,28 +982,28 @@ Transfer file and directory permissions
 <target>Створення списку файлів...</target>
 <source>Multiple...</source>
 <target>Різні варіанти...</target>
-<source>Files that are equal on both sides</source>
-<target>Файли, однакові з обох сторін</target>
-<source>Equal files/folders that differ in attributes only</source>
-<target>Однакові файли/папки, що відрізняються тільки атрибутами</target>
-<source>Copy from right to left</source>
-<target>Копіювати справа наліво</target>
-<source>Copy from left to right</source>
-<target>Копіювати зліва направо</target>
-<source>Delete files/folders existing on left side only</source>
-<target>Вилучати файли/папки, які існують тільки ліворуч</target>
-<source>Delete files/folders existing on right side only</source>
-<target>Вилучати файли/папки, які існують тільки праворуч</target>
-<source>Copy from right to left overwriting</source>
-<target>Копіювати справа наліво перезаписуючи</target>
-<source>Copy from left to right overwriting</source>
-<target>Копіювати зліва направо перезаписуючи</target>
+<source>Both sides are equal</source>
+<target>Сторони ідентичні</target>
+<source>Files/folders differ in attributes only</source>
+<target>Файли/папки відрізняються лише атрибутами</target>
+<source>Copy new file/folder to left</source>
+<target>Зкопіювати новий файл/папку ліворуч</target>
+<source>Copy new file/folder to right</source>
+<target>Зкопіювати новий файл/папку праворуч</target>
+<source>Delete left file/folder</source>
+<target>Вилучити файл/папку ліворуч</target>
+<source>Delete right file/folder</source>
+<target>Вилучити файл/папку праворуч</target>
+<source>Overwrite left file/folder with right one</source>
+<target>Перезаписати файл/папку ліворуч відповідником зправа</target>
+<source>Overwrite right file/folder with left one</source>
+<target>Перезаписати файл/папку праворуч відповідником зліва</target>
 <source>Do nothing</source>
 <target>Нічого не робити</target>
-<source>Copy attributes only from right to left</source>
-<target>Копіювати тільки атрибути справа наліво</target>
-<source>Copy attributes only from left to right</source>
-<target>Копіювати тільки атрибути зліва направо</target>
+<source>Copy file attributes only to left</source>
+<target>Зкопіювати ліворуч лише атрибути файла</target>
+<source>Copy file attributes only to right</source>
+<target>Зкопіювати праворуч лише атрибути файла</target>
 <source>Deleting file %x</source>
 <target>Вилучення файла %x</target>
 <source>Deleting Symbolic Link %x</source>
diff --git a/BUILD/Resources.dat b/BUILD/Resources.dat
index 23f84129..6af47f50 100644
--- a/BUILD/Resources.dat
+++ b/BUILD/Resources.dat